[patch] additional patches for ebuild (2)

1.90.5-elogind.patch (text/plain), 2.60 KB, created by Ulf Dambacher on 2020-12-06 13:09:23 UTC

diff --git a/fprintd-1.90.5/data/meson.build b/fprintd-1.90.5/data/meson.build
index bada139..8199502 100644
--- fprintd-v1.90.5/data/meson.build.orig
+++ fprintd-v1.90.5/data/meson.build
@@ -11,15 +11,15 @@ configure_file(
     install_dir: dbus_service_dir,
 )
 
-configure_file(
-    configuration: configuration_data({
-        'libexecdir': fprintd_installdir,
-    }),
-    input: 'fprintd.service.in',
-    output: 'fprintd.service',
-    install: true,
-    install_dir: systemd_unit_dir,
-)
+#configure_file(
+#    configuration: configuration_data({
+#        'libexecdir': fprintd_installdir,
+#    }),
+#    input: 'fprintd.service.in',
+#    output: 'fprintd.service',
+#    install: true,
+#    install_dir: systemd_unit_dir,
+#)
 
 polkit_policy = 'net.reactivated.fprint.device.policy'
 polkit_policy_target = i18n.merge_file(polkit_policy,
diff --git a/fprintd-1.90.1/meson.build b/fprintd-1.90.1/meson.build
--- fprintd-v1.90.5/meson.build.orig	2020-12-06 13:39:10.583805766 +0100
+++ fprintd-v1.90.5/meson.build	2020-12-06 13:42:25.354217830 +0100
@@ -83,7 +83,7 @@
 libfprint_dep = dependency('libfprint-2', version: '>=' + libfprint_min_version)
 polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.91')
 dbus_dep = dependency('dbus-1', required: false)
-libsystemd_dep = dependency('libsystemd', required: get_option('pam'))
+libsystemd_dep = dependency('libelogind', required: get_option('pam'))
 pam_dep = cc.find_library('pam',
     required: get_option('pam'),
     has_headers: 'security/pam_modules.h',
@@ -93,12 +93,12 @@
 xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))
 
 # StateDirectory was introduced in systemd 235
-systemd_dep = dependency('systemd', version: '>= 235')
-systemd_unit_dir = get_option('systemd_system_unit_dir')
+#systemd_dep = dependency('systemd', version: '>= 235')
+#systemd_unit_dir = get_option('systemd_system_unit_dir')
 
-if systemd_unit_dir == ''
-    systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-endif
+#if systemd_unit_dir == ''
+#    systemd_unit_dir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
+#endif
 
 dbus_service_dir = get_option('dbus_service_dir')
 dbus_data_dir = datadir
@@ -179,7 +179,7 @@
 output += '  DBus service directory: ' + dbus_service_dir
 output += '  DBus interfaces directory: ' + dbus_interfaces_dir
 output += '  Polkit policy directory: ' + polkit_policy_directory
-output += '  Systemd service directory: ' + systemd_unit_dir
+#output += '  Systemd service directory: ' + systemd_unit_dir
 if get_option('pam')
     output += '  PAM module directory: ' + pam_modules_dir
 endif