Merge pull request #660 from bobby285271/meson-fixes

meson: Allow custom prefixes for third-party packages

Author: fossfreedom

meson.build

@@ -97,6 +97,7 @@ add_global_arguments('-DGETTEXT_PACKAGE="budgie-desktop"', language: 'c')
 
 # Globals that we need
 prefix = get_option('prefix')
+bindir = join_paths(prefix, get_option('bindir'))
 libdir = join_paths(prefix, get_option('libdir'))
 libexecdir = join_paths(prefix, get_option('libexecdir'), meson.project_name())
 confdir = join_paths(prefix, get_option('sysconfdir'))

meson_options.txt

@@ -1,4 +1,7 @@
 option('ci', type: 'boolean', value: false, description: 'Continuous Integration flag (internal use only)')
+option('gsd-libexecdir', type: 'string', description: 'Directory containing the gsd-* executables')
+option('labwc-bindir', type: 'string', description: 'Directory containing the labwc executable')
+#option('magpie-bindir', type: 'string', description: 'Directory containing the magpie-wm executable')
 option('use-old-zenity', type: 'boolean', value: false, description: 'Use old zenity CLI API for out-of-process dialog handling')
 option('with-bluetooth', type: 'boolean', value: true, description: 'Enable Bluetooth (Vala option)')
 option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation')

src/session/budgie-desktop-magpie.desktop.in.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Budgie Desktop (magpie)
 _Comment=This session logs you into the Budgie Desktop using magpie as the window manager
-Exec=@prefix@/bin/magpie-wm -s /usr/bin/budgie-desktop
-TryExec=@prefix@/bin/magpie-wm
+Exec=@magpie_bindir@/magpie-wm -s @bindir@/budgie-desktop
+TryExec=@magpie_bindir@/magpie-wm
 Icon=
 Type=Application
 DesktopNames=Budgie

src/session/budgie-desktop.desktop.in.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Budgie Desktop
 _Comment=This session logs you into the Budgie Desktop using labwc as the window manager
-Exec=@prefix@/bin/labwc -S /usr/bin/budgie-desktop
-TryExec=@prefix@/bin/labwc
+Exec=@labwc_bindir@/labwc -S @bindir@/budgie-desktop
+TryExec=@labwc_bindir@/labwc
 Icon=
 Type=Application
 DesktopNames=Budgie

src/session/meson.build

@@ -37,6 +37,30 @@ session_components = budgie_components + budgie_session_324_components
 session_data.set('SESSION_COMPONENTS', ';'.join(session_components))
 # Set the prefix
 session_data.set('prefix', join_paths(get_option('prefix')))
+# Set bindir to budgie-desktop
+session_data.set('bindir', bindir)
+
+# Set bindir to labwc
+labwc_bindir = get_option('labwc-bindir')
+if labwc_bindir == ''
+    labwc_bindir = bindir
+endif
+session_data.set('labwc_bindir', labwc_bindir)
+
+# Set bindir to magpie-wm
+#magpie_bindir = get_option('magpie-bindir')
+#if magpie_bindir == ''
+#    magpie_bindir = bindir
+#endif
+#session_data.set('magpie_bindir', magpie_bindir)
+
+# Set libexecdir to gnome-settings-daemon
+# Unfortunately this info is not provided by its pkgconfig file
+gsd_libexecdir = get_option('gsd-libexecdir')
+if gsd_libexecdir == ''
+    gsd_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
+endif
+session_data.set('gsd_libexecdir', gsd_libexecdir)
 
 # Write the budgie-desktop.session.in file from the .in.in
 session_conf = configure_file(
@@ -120,8 +144,17 @@ custom_target('desktop-file-powerdialog',
 
 # install gnome-settings-daemon desktop files to ensure they autostart
 
-install_subdir(
-    'settingsdaemon',
-    install_dir: xdg_appdir,
-    strip_directory: true
-)
+settings_daemon_components = budgie_session_324_components + [
+    'org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify',
+    'org.buddiesofbudgie.SettingsDaemon.UsbProtection',
+    'org.buddiesofbudgie.SettingsDaemon.Wwan',
+]
+
+foreach component: settings_daemon_components
+    configure_file(
+        input: join_paths('settingsdaemon', component + '.desktop.in'),
+        output: '@BASENAME@',
+        configuration: session_data,
+        install_dir: xdg_appdir,
+    )
+endforeach

src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop renamed to src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie Desktop accessibility
-Exec=/usr/libexec/gsd-a11y-settings
+Exec=@gsd_libexecdir@/gsd-a11y-settings
 OnlyShowIn=Budgie;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization

src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Datetime.desktop renamed to src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Datetime.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie date & time
-Exec=/usr/libexec/gsd-datetime
+Exec=@gsd_libexecdir@/gsd-datetime
 OnlyShowIn=Budgie;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization

src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop renamed to src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=gnome-disk-utility notification plugin for GNOME Settings Daemon (Budgie)
-Exec=/usr/libexec/gsd-disk-utility-notify
+Exec=@gsd_libexecdir@/gsd-disk-utility-notify
 OnlyShowIn=Budgie;
 NoDisplay=true
 X-GNOME-AutoRestart=true

src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Housekeeping.desktop renamed to src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Housekeeping.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie Desktop maintenance of expirable data
-Exec=/usr/libexec/gsd-housekeeping
+Exec=@gsd_libexecdir@/gsd-housekeeping
 OnlyShowIn=Budgie;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization

src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Power.desktop renamed to src/session/settingsdaemon/org.buddiesofbudgie.SettingsDaemon.Power.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie power management
-Exec=/usr/libexec/gsd-power
+Exec=@gsd_libexecdir@/gsd-power
 OnlyShowIn=Budgie;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Initialization