[patch] files/libratbag-systemd.patch

libratbag-systemd.patch (text/plain), 5.00 KB, created by Alex Barker on 2020-04-11 19:13:53 UTC

--- a/meson.build	2020-04-11 10:32:43.223918856 -0700
+++ b/meson.build	2020-04-11 10:39:31.282002551 -0700
@@ -76,15 +76,15 @@
 dep_lm = cc.find_library('m')
 dep_unistring = cc.find_library('unistring')
 
-if get_option('logind-provider') == 'elogind'
-	dep_logind = dependency('libelogind', version : '>=227')
-else
-	dep_logind = dependency('libsystemd', version : '>=227')
-endif
-
 enable_systemd = get_option('systemd')
 if enable_systemd
 	dep_systemd = dependency('systemd')
+
+	if get_option('logind-provider') == 'elogind'
+		dep_logind = dependency('libelogind', version : '>=227')
+	else
+		dep_logind = dependency('libsystemd', version : '>=227')
+	endif
 endif
 
 #### libutil.a ####
@@ -393,74 +393,75 @@
 		       timeout_multiplier: 5)
 endif
 
-#### ratbagd ####
-#
-# The main item of this repo, a DBus server that uses libratbag to talk to
-# the mice. The DBus API is the public-facing API.
-#
-src_ratbagd = [
-	'src/shared-macro.h',
-	'src/shared-rbtree.h',
-	'src/shared-rbtree.c',
-	'ratbagd/ratbagd.h',
-	'ratbagd/ratbagd.c',
-	'ratbagd/ratbagd-led.c',
-	'ratbagd/ratbagd-button.c',
-	'ratbagd/ratbagd-device.c',
-	'ratbagd/ratbagd-profile.c',
-	'ratbagd/ratbagd-resolution.c',
-	'ratbagd/ratbagd-test.c',
-	'ratbagd/ratbagd-json.c',
-	'ratbagd/ratbagd-json.h',
-	'src/libratbag-util.h',
-	'src/libratbag-util.c',
-]
-
-deps_ratbagd = [
-	dep_udev,
-	dep_logind,
-	dep_libratbag,
-	dep_unistring,
-]
-
-executable('ratbagd',
-	   src_ratbagd,
-	   dependencies : deps_ratbagd,
-	   include_directories : include_directories('src'),
-	   install : true,
-)
-
-install_man('ratbagd/ratbagd.8')
-
-#### ratbagd_devel ####
-#
-# A development ratbagd server that owns a different name on the bus
-# (org.freedesktop.ratbag_devel1). This server is used by ratbagdctl.devel.
-#
-
-config_ratbagd_devel = configuration_data()
-dbus_devel_policy = configure_file(input : 'dbus/org.freedesktop.ratbag_devel1.conf.in',
-				   output : 'org.freedesktop.ratbag_devel1.conf',
-				   configuration : config_ratbagd_devel)
-
-# This is a hack. We always install the devel policy file into
-# /etc/dbus-1/system.d, independent of any prefixes we use otherwise.
-# This should never be used outside of developer machines anyway, but
-# installations on those may use different prefixes for building.
-# This is not set in stone, suggest something better if you can.
-dbussystemdir = join_paths('/', get_option('sysconfdir'), 'dbus-1', 'system.d')
-
-executable('ratbagd.devel',
-	   src_ratbagd,
-	   dependencies : deps_ratbagd,
-	   include_directories : include_directories('src'),
-	   install : false,
-	   c_args : ['-DRATBAG_DBUS_INTERFACE="ratbag_devel1"',
-		     '-DDBUS_POLICY_SRC="@0@/@1@"'.format(meson.build_root(), dbus_devel_policy),
-		     '-DDBUS_POLICY_DST="@0@/@1@"'.format(dbussystemdir, dbus_devel_policy),
-		     '-DDISABLE_COREDUMP=1'],
-)
-
+if enable_systemd
+	#### ratbagd ####
+	#
+	# The main item of this repo, a DBus server that uses libratbag to talk to
+	# the mice. The DBus API is the public-facing API.
+	#
+	src_ratbagd = [
+		'src/shared-macro.h',
+		'src/shared-rbtree.h',
+		'src/shared-rbtree.c',
+		'ratbagd/ratbagd.h',
+		'ratbagd/ratbagd.c',
+		'ratbagd/ratbagd-led.c',
+		'ratbagd/ratbagd-button.c',
+		'ratbagd/ratbagd-device.c',
+		'ratbagd/ratbagd-profile.c',
+		'ratbagd/ratbagd-resolution.c',
+		'ratbagd/ratbagd-test.c',
+		'ratbagd/ratbagd-json.c',
+		'ratbagd/ratbagd-json.h',
+		'src/libratbag-util.h',
+		'src/libratbag-util.c',
+	]
+
+	deps_ratbagd = [
+		dep_udev,
+		dep_logind,
+		dep_libratbag,
+		dep_unistring,
+	]
+
+	executable('ratbagd',
+		   src_ratbagd,
+		   dependencies : deps_ratbagd,
+		   include_directories : include_directories('src'),
+		   install : true,
+	)
+
+	install_man('ratbagd/ratbagd.8')
+
+	#### ratbagd_devel ####
+	#
+	# A development ratbagd server that owns a different name on the bus
+	# (org.freedesktop.ratbag_devel1). This server is used by ratbagdctl.devel.
+	#
+
+	config_ratbagd_devel = configuration_data()
+	dbus_devel_policy = configure_file(input : 'dbus/org.freedesktop.ratbag_devel1.conf.in',
+					   output : 'org.freedesktop.ratbag_devel1.conf',
+					   configuration : config_ratbagd_devel)
+
+	# This is a hack. We always install the devel policy file into
+	# /etc/dbus-1/system.d, independent of any prefixes we use otherwise.
+	# This should never be used outside of developer machines anyway, but
+	# installations on those may use different prefixes for building.
+	# This is not set in stone, suggest something better if you can.
+	dbussystemdir = join_paths('/', get_option('sysconfdir'), 'dbus-1', 'system.d')
+
+	executable('ratbagd.devel',
+		   src_ratbagd,
+		   dependencies : deps_ratbagd,
+		   include_directories : include_directories('src'),
+		   install : false,
+		   c_args : ['-DRATBAG_DBUS_INTERFACE="ratbag_devel1"',
+			     '-DDBUS_POLICY_SRC="@0@/@1@"'.format(meson.build_root(), dbus_devel_policy),
+			     '-DDBUS_POLICY_DST="@0@/@1@"'.format(dbussystemdir, dbus_devel_policy),
+			     '-DDISABLE_COREDUMP=1'],
+	)
+endif
 
 #### unit file ####
 if enable_systemd