From de5b43e06cf51bad22ff3419e0b0f1f1bb94f661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 20 Jul 2023 22:19:35 +0700 Subject: [PATCH 1/2] libfprint: update to 1.94.5. --- .../libfprint/patches/fix-stderr-redefinition.patch | 12 ------------ srcpkgs/libfprint/template | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/libfprint/patches/fix-stderr-redefinition.patch diff --git a/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch deleted file mode 100644 index 0f90c77091cf..000000000000 --- a/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:26.878344708 +0200 -+++ b/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 -@@ -218,7 +218,9 @@ struct xytq_struct { - /* Globals supporting command line options */ - extern int verbose_threshold; - /* Global supporting error reporting */ -+#ifdef __GLIBC__ - extern FILE *stderr; -+#endif - - /**************************************************************************/ - /* In: BZ_GBLS.C */ diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index 2f69d1e0a1c0..9e87c2457ba8 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -1,6 +1,6 @@ # Template file for 'libfprint' pkgname=libfprint -version=1.94.0 +version=1.94.5 revision=1 build_style=meson build_helper="gir qemu" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/" changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2" -checksum=7abd57e6da353c657cfbf51f71954a119290c20745491cbdcc34e8728a7e7819 +checksum=707309cc58012c4c22a318fdb0c6b43b2c96c8e70349ca5edb1feabb65afb63a libfprint-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From d6ed5ba000644230438a9948585ed4f4708f6ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 20 Jul 2023 22:19:39 +0700 Subject: [PATCH 2/2] fprintd: update to 1.94.2. --- srcpkgs/fprintd/patches/meson-0.61.patch | 146 ----------------------- srcpkgs/fprintd/template | 4 +- 2 files changed, 2 insertions(+), 148 deletions(-) delete mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch deleted file mode 100644 index 836c7e036054..000000000000 --- a/srcpkgs/fprintd/patches/meson-0.61.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Wed, 27 Oct 2021 15:44:31 +0200 -Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file - -This was never really used and it's breaking meson 60. -While this may just become a warning in 60.1, it's just better to avoid -using it. - -See: https://github.com/mesonbuild/meson/issues/9441 ---- - data/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 92bfa2e..ece5fc6 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -24,7 +24,7 @@ if get_option('systemd') - endif - - polkit_policy = 'net.reactivated.fprint.device.policy' --polkit_policy_target = i18n.merge_file(polkit_policy, -+polkit_policy_target = i18n.merge_file( - input: '@0@.in'.format(polkit_policy), - output: polkit_policy, - po_dir: meson.source_root() / 'po', --- -GitLab - -From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 11 Jan 2022 21:06:35 -0500 -Subject: [PATCH] use more idiomatic/correct embedded shell scripting - -Formatting arguments into code is fragile, and meson natively knows how -to pass files as arguments via argv. So pass them as arguments to the -shell. ---- - doc/dbus/meson.build | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 802938e..861da64 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files - capture: true, - command: [ - bash, '-c', -- 'cat @INPUT@;' + -- xsltproc.path() + ' @0@/@1@ '.format( -- meson.source_root(), -- files('spec-to-docbook.xsl')[0]) + -- interface_file.full_path() + '| tail -n +2;', -+ 'cat "$1"; "$2" "$3" "$4" | tail -n +2', -+ '_', # argv0 ignored -+ '@INPUT@', -+ xsltproc, files('spec-to-docbook.xsl')[0], interface_file - ], - ) - endforeach --- -GitLab - -From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Tue, 11 Jan 2022 20:46:29 -0500 -Subject: [PATCH] remove pointless copying of files into build directory - -I'm not entirely sure what this did, but it seems to be obsoleted by -commit 93bad825406d13ed5eb2cf27541dc58194bef8f3. ---- - doc/dbus/meson.build | 6 +++--- - src/meson.build | 20 ++++++------------- - ....xml => net.reactivated.Fprint.Device.xml} | 0 - ...xml => net.reactivated.Fprint.Manager.xml} | 0 - 4 files changed, 9 insertions(+), 17 deletions(-) - rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%) - rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%) - -diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build -index 861da64..431127d 100644 ---- a/doc/dbus/meson.build -+++ b/doc/dbus/meson.build -@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', - ) - - dbus_interfaces_refs = [] --foreach interface_file: dbus_interfaces_files -- basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() -+foreach interface_file: dbus_interfaces -+ basename = run_command('basename', interface_file, '.xml').stdout().strip() - dbus_interfaces_refs += custom_target(basename + '_ref', - input: docbook_xml_header, - output: basename + '.ref.xml', - build_by_default: true, -- depends: interface_file, -+ depend_files: interface_file, - capture: true, - command: [ - bash, '-c', -diff --git a/src/meson.build b/src/meson.build -index 1df6216..a7ce3fe 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -1,22 +1,14 @@ - bash = find_program('bash') --dbus_interfaces = ['Manager', 'Device'] --dbus_interfaces_files = [] -+dbus_interfaces = files( -+ 'net.reactivated.Fprint.Manager.xml', -+ 'net.reactivated.Fprint.Device.xml', -+) - --foreach interface_name: dbus_interfaces -- interface = interface_name.to_lower() -- interface_file = interface + '.xml' -- dbus_interfaces_files += custom_target('dbus_interface_' + interface, -- input: interface_file, -- output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), -- command: ['cp', '@INPUT@', '@OUTPUT@'], -- install: true, -- install_dir: dbus_interfaces_dir, -- ) --endforeach -+install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) - - # NOTE: We should pass "--glib-min-required 2.64" but cannot - fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', -- sources: dbus_interfaces_files, -+ sources: dbus_interfaces, - autocleanup: 'all', - interface_prefix: 'net.reactivated.Fprint.', - namespace: 'FprintDBus', -diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml -similarity index 100% -rename from src/device.xml -rename to src/net.reactivated.Fprint.Device.xml -diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml -similarity index 100% -rename from src/manager.xml -rename to src/net.reactivated.Fprint.Manager.xml --- -GitLab - diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template index 47ad05844c90..4b3a61daf423 100644 --- a/srcpkgs/fprintd/template +++ b/srcpkgs/fprintd/template @@ -1,6 +1,6 @@ # Template file for 'fprintd' pkgname=fprintd -version=1.94.0 +version=1.94.2 revision=1 build_style=meson configure_args="--sysconfdir=/etc/fprintd -Dman=true -Dgtk_doc=false @@ -16,5 +16,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/fprint/" distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v$version/fprintd-v$version.tar.bz2" -checksum=380d8c8c29a49eee0063801b4fe0ab1bcbe6080404e8d4120040ae745c3c0ead +checksum=e388694c60322359c632386fa71c8e1e2cf2abe34363028f1046b0203d3fc640 lib32disabled=yes