Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GSD autostarts: Changes suggestion #827

Merged
merged 3 commits into from
Oct 7, 2024
Merged

GSD autostarts: Changes suggestion #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f27bb1
meson: Set prefix to /usr
ryonakano Oct 5, 2024
5f580c2
meson: Correct vendor prefix
ryonakano Oct 5, 2024
7edb37e
Use variable for future edit
ryonakano Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
env:
DESTDIR: out
run: |
meson setup build
meson setup build --prefix=/usr
ninja -C build install

lint:
Expand Down
5 changes: 3 additions & 2 deletions session/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ install_data(
install_dir: schemadir
)

vendor_prefix = 'pantheon'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to use a different prefix here or this package will conflict with our other session package

foreach component : gsd_components
original_filename = component + '.desktop'
original_autostart_file = autostartdir / original_filename

patched_filename = 'installer-' + component + '.desktop'
patched_filename = vendor_prefix + '-' + component + '.desktop'

custom_target('create-gsd-autostart' + patched_filename,
input: original_autostart_file,
Expand All @@ -65,7 +66,7 @@ foreach component : gsd_components
desktop_file_install,
'--set-key=OnlyShowIn',
'--set-value=X-Installer',
'--vendor=pantheon',
'--vendor=' + vendor_prefix,
'--dir=@OUTDIR@',
'@INPUT@',
],
Expand Down
Loading