diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sys-auth/fprintd | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'sys-auth/fprintd')
-rw-r--r-- | sys-auth/fprintd/Manifest | 3 | ||||
-rw-r--r-- | sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch | 121 | ||||
-rw-r--r-- | sys-auth/fprintd/fprintd-1.94.1.ebuild | 1 |
3 files changed, 124 insertions, 1 deletions
diff --git a/sys-auth/fprintd/Manifest b/sys-auth/fprintd/Manifest index 2a239d7b7b89..bf6747e6cda7 100644 --- a/sys-auth/fprintd/Manifest +++ b/sys-auth/fprintd/Manifest @@ -1,6 +1,7 @@ AUX fprintd-0.8.1-fno-common.patch 1053 BLAKE2B a1cec2d6317ac0bffd131bf305c5ad0b2d69f8bf84e2de78dd5c2b04e2ae7f939243009cb38dc2c618568f1aa33eea0a53dc0ef93a96e998a90e4b6c5fdf3150 SHA512 4a762befbceda0bc35b576a1af42c7d49c7add5eb4f76eb0ec31d7ddb0f96e0a70591e64437d2a61fff8e9d903839340d31719c354753e7af01dbb3e585081bc AUX fprintd-1.90.7_0001-add-test-feature-and-make-tests-optional.patch 2426 BLAKE2B 838b56e110fdf670816fb59e7ad30b908c54b8ee1cbbe4fda0334ac068265c8cdcb7e48200796b0872718099dea918554641dc02670e32e5f9369f7cc05fb95b SHA512 553e6baa7d1a90971627e3e1303488734596f83fea4413d2a4ce2688f003cded95182b652622f758f4e347b54a1294837a2014a9e36badc25e8b254947a54736 AUX fprintd-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch 1144 BLAKE2B f417baf7a6d686a753381501ef2e6df6bc867c4a938d47b70def205b92a3ea20adb2ab55a1ff26d921ef433d846c150bb24d9a4102a39e61c2e424b53effe66e SHA512 4a234200e9a03ba3acb710857a64d35d84a4b954d9289a8fc400355dd27cc8cdf5da6d2dc11e60add57aae04e93e4c890b8a75e4984516fad14f9236acf0f699 +AUX fprintd-1.94.1-fix-meson-0.61-build.patch 4544 BLAKE2B 321971f95833db2d6957ccee1f67907e8590d91da24d684bda7ca95b50028e721b28e887a90b101c311813df0d7ca4870f12801ae91e280f00b2567c7fddc874 SHA512 73836daf2366f47bd2c69d6d50a70150778cedf04d946123be72c73f976fcd674173b0f349d9df197d06afec5190c742e8b0726380215e3dc95dcba1a49f33bf DIST fprintd-0.8.1.tar.bz2 75254 BLAKE2B bf59c47c3d0186677bfd180e472e13773afebd4c3438e0e8e8cce34156df1c64c142b73d541fa876b96d4881e6967745a8c29be310dd33a509cb1863c836634e SHA512 438098fb677b742fdb279f3df85a1f2c800fce7498130c09b7408f21656ff256323b3bce4c22a2499e52c2ca7cddbc7f26033be7869939d23f9b5c436aa1f252 DIST fprintd-v1.90.8.tar.bz2 635139 BLAKE2B 4f9e5c395c32dd5de3f5ed4d17e81c28a55de0f411deb3ccbc5d1330129be2bc8263c63c61a5e4910f74e49ebbbf508e858f5ee131eb4552e2ea8ab167bc6021 SHA512 0f38e0ce9f7c1459ba5359d0834569fe5d3f5ec3c9499d008dc39b9c869bbfa1cb293b1d96d22f9f36708f26984a1b3f0776685d628df69f1ed6db14de04a489 DIST fprintd-v1.90.9.tar.bz2 636538 BLAKE2B 8a2150887282aae722d143ec96a9c0c3b5dd066e4cba30c41d49b6f6afe95c26c585aec2d9b074d65dd1a3efd462dae294a98965a020c4e55a8cda7c00a827bb SHA512 2b0f3e5812dd29df2b78ff6082c75981c28af71fc07e19e7eb4743842562e7d5bfc0655d5fbb66bfb167bc3087100bd0f154257ad936eab03e9e8ccc2410481f @@ -12,5 +13,5 @@ EBUILD fprintd-1.90.8.ebuild 1616 BLAKE2B 6c34b97ff30d9d1b1e249779e74f403b78692b EBUILD fprintd-1.90.9.ebuild 1646 BLAKE2B ebdbca6dd9bef2a51b60cb24d9ae8e614081ace89ae84b4007c88d8a6853ac20a0b1667aacd5ac5373aa7fe0fac46c5eadc2bd3f1aaf3a5d23b770c2e311eb50 SHA512 3a68129c63d411d1b2bb8343bbdc150229f88e0124b705e1716c5b6b0cf1f9f6a0cd6f1dac04a3349a2d6b9896c2ebcb5eacd830bb8aaa77843199ef611e2dcd EBUILD fprintd-1.92.0.ebuild 2137 BLAKE2B 9e388fa3f8fad59afad75d144f17b78af50468fa187f76a2efe2450cda17407e46e1bc25a4ee32cbc536ada07a8614f6c13d0cdbe56a153c5cf0932d397c9d51 SHA512 b0dcd1b6a071a9418d27a9e73b02b94b348ef82f09bd6874d431dc9feb8dcd564a507ee4000b3cc4b0035483fb5309352d5b32f860477e0569087d18f703671e EBUILD fprintd-1.94.0.ebuild 2176 BLAKE2B 163b4f798e313366bbf6cd1a0959e494dac1f28c034dddbd74cb402d9d21569df2962169a88bde70346a3c9e153a0f1fe5aba35fa28edaca1030d5d4cc4a53a8 SHA512 98c0f365a171b4e617868ff72b1f3b9e2eb0927447f6cfa7cafbc0e71be1e7805296fb1d3503135be6fb0befacc872254dc26cf380e0f4c7bfcbdc3ddb368172 -EBUILD fprintd-1.94.1.ebuild 2178 BLAKE2B 07a858460e4cd745cb7dba43c61596753cc2f352886fe5eb1b702c35d2e89e51c20f0995f023a93d6eb2b76b377b349ee1495bdba0285a57bf9b9ac1e52bfd40 SHA512 3cac10117dbd61feb71f7e98bfe2651b1a3acfb289529baf1a8cebb30221f809f68bc68a57bd6f09d34d26abe8050a5d76ed4f1fbd02bc44a951120aa4190f91 +EBUILD fprintd-1.94.1.ebuild 2225 BLAKE2B 4d5055e72734e236b8874dd11dcd26eddce270ea0d6f1300f6d0058427d140d9b48aacea0c626e05c5962615c98ad381de390dd5f02eda8f5aebe9088f4ed15c SHA512 5956894a079d8473c3c7cf142de81b5980265199ae4a285ddbe0fe636a527960456b41a31c701227989cd16e71fef1fed34ccb2ddff03baa0e601ae49d9300be MISC metadata.xml 270 BLAKE2B 0f6d61908167c717898b4ba7602bf3b429736afea65a4367231066bb481a2923d25760b31741774b37727f3dcf41ea748340899e7b4a865901036d9bdf52cf0e SHA512 f93613d657594e747e743541df6df87ef7152ccf381f343bc30ac55966bc7ea212697e350d454ddc2f7c91d9485aace053084a668a69a20d6ee74340cbfe1f25 diff --git a/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch new file mode 100644 index 000000000000..e7f78320d1b9 --- /dev/null +++ b/sys-auth/fprintd/files/fprintd-1.94.1-fix-meson-0.61-build.patch @@ -0,0 +1,121 @@ +https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch +https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch +https://bugs.gentoo.org/831753 + +From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz@archlinux.org> +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 <eschwartz@archlinux.org> +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/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild index 8a0c86a78391..1cf6326d13f2 100644 --- a/sys-auth/fprintd/fprintd-1.94.1.ebuild +++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild @@ -53,6 +53,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.90.7_0001-add-test-feature-and-make-tests-optional.patch" "${FILESDIR}/${PN}-1.90.8_0002-add-configure-option-for-libsystemd-provider.patch" + "${FILESDIR}/${P}-fix-meson-0.61-build.patch" ) S="${WORKDIR}/${MY_P}" |