Merge pull request #114 from alunux/fix-gsd-changed

session: Handle RequiredComponents based on GSD version
BlankOn · Sep 1, 2018 · f542632 · f542632
2 parents f22b500 + 1ef9815
commit f542632
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 6 deletions.
diff --git a/files/sessions/blankon.session b/files/sessions/blankon.session
diff --git a/files/sessions/blankon.session.in b/files/sessions/blankon.session.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=Manokwari
+RequiredComponents=@SESSION_COMPONENTS@;
diff --git a/files/sessions/meson.build b/files/sessions/meson.build
@@ -1,4 +1,57 @@
-install_data(
-    'blankon.session',
+gnome_session_components = [
+    'gnome-settings-daemon',
+]
+
+gnome_session_324_components = [
+    'org.gnome.SettingsDaemon.A11ySettings',
+    'org.gnome.SettingsDaemon.Clipboard',
+    'org.gnome.SettingsDaemon.Color',
+    'org.gnome.SettingsDaemon.Datetime',
+    'org.gnome.SettingsDaemon.Housekeeping',
+    'org.gnome.SettingsDaemon.Keyboard',
+    'org.gnome.SettingsDaemon.MediaKeys',
+    'org.gnome.SettingsDaemon.Mouse',
+    'org.gnome.SettingsDaemon.Power',
+    'org.gnome.SettingsDaemon.PrintNotifications',
+    'org.gnome.SettingsDaemon.Rfkill',
+    'org.gnome.SettingsDaemon.ScreensaverProxy',
+    'org.gnome.SettingsDaemon.Sharing',
+    'org.gnome.SettingsDaemon.Smartcard',
+    'org.gnome.SettingsDaemon.Sound',
+    'org.gnome.SettingsDaemon.Wacom',
+    'org.gnome.SettingsDaemon.XSettings',
+]
+
+gsd_324_key = [
+    'org.gnome.SettingsDaemon.A11yKeyboard'
+]
+
+gsd_324_max = [
+    'org.gnome.SettingsDaemon.Orientation',
+    'org.gnome.SettingsDaemon.XRANDR',
+]
+
+manokwari_components = [
+    'mutter',
+    'manokwari',
+]
+
+if dep_gsd.version().version_compare('>=3.27.90')
+    session_components = manokwari_components + gnome_session_324_components
+elif dep_gsd.version().version_compare('>=3.25.4')
+    session_components = manokwari_components + gnome_session_324_components + gsd_324_key
+elif dep_gsd.version().version_compare('>=3.23.3')
+    session_components = manokwari_components + gnome_session_324_components + gsd_324_key + gsd_324_max
+else
+    session_components = gnome_session_components + manokwari_components
+endif
+
+session_data = configuration_data()
+session_data.set('SESSION_COMPONENTS', ';'.join(session_components))
+
+configure_file(
+    input: 'blankon.session.in',
+    output: 'blankon.session',
+    configuration: session_data,
     install_dir: join_paths(get_option('datadir'), 'gnome-session', 'sessions'),
-)
+)
diff --git a/meson.build b/meson.build
@@ -44,6 +44,7 @@ dep_unique = dependency('unique-3.0', version: '>= 3.0.0')
 dep_webkit = dependency('webkitgtk-3.0', version: '>= 1.3.0')
 dep_x11 = dependency('x11', version: '>= 1.6.0')
 dep_libnotify = dependency('libnotify', version: '>= 0.7.6')
+dep_gsd = dependency('gnome-settings-daemon', version: gnome_minimum_version)
 
 # Create config.h
 cdata = configuration_data()