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.

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

Conversation

ryonakano
Copy link
Contributor

@ryonakano ryonakano commented Oct 5, 2024

Changes Summary

1. Set prefix to /usr for CI

The following error message in the CI means the sysconfdir variable is set to etc:

session/meson.build:61:4: ERROR: File etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop does not exist.

It points to /etc only when the prefix is set to /usr according to https://mesonbuild.com/Builtin-options.html:

When the prefix is /usr: sysconfdir defaults to /etc, localstatedir defaults to /var, and sharedstatedir defaults to /var/lib

2. Fix vendor prefix

According to the man of desktop-file-install, the value passed to the --vendor option is used for the output file:

       --vendor=VENDOR
              Add  a vendor prefix to the desktop files. If a file already has this prefix, nothing happens; else, the file will be named VENDOR-FILE. For example: if VENDOR is freedesktop.org and FILE is specification.desktop, the
              result file will be freedesktop.org-specification.desktop.

The following error message in the CI means the sysconfdir variable is set to `etc`:

    session/meson.build:61:4: ERROR: File etc/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop does not exist.

It points to `/etc` only when the prefix is set to `/usr` according to https://mesonbuild.com/Builtin-options.html:

    When the prefix is /usr: sysconfdir defaults to /etc, localstatedir defaults to /var, and sharedstatedir defaults to /var/lib
@ryonakano ryonakano changed the title meson: Set prefix to /usr ci: Set meson prefix to /usr Oct 5, 2024
@ryonakano ryonakano changed the title ci: Set meson prefix to /usr GSD autostarts: Changes suggestion Oct 5, 2024
@ryonakano ryonakano requested a review from danirabbit October 5, 2024 07:28
@@ -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

@danirabbit danirabbit merged commit ee0a3be into danirabbit/gsd-buildsystem Oct 7, 2024
4 of 5 checks passed
@danirabbit danirabbit deleted the ryonakano/suggestion-gsd-buildsystem branch October 7, 2024 20:32
danirabbit pushed a commit that referenced this pull request Oct 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants