gentoo resync : 29.12.2022

3 files changed, 86 insertions, 0 deletions

diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 8a6ce38b630a..77863289800e 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,7 +1,10 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 AUX libfprint-1.94.1-test-timeout.patch 537 BLAKE2B 5010eac973ade5c5cf48e50355da33f83042c8f7a7d9bc2d88533cc0aa746aec33f0977442e79ff11a58682104d73c5d0dedb0c31564cf9def9af2c73abc2fd6 SHA512 a9d87b681e92be2a81a42d2a68642d4be8479da11b22b5dfd145b21a08ea863f3bc73557259f3c4592128f7000ccb26c6530aa84aebc49303ee0cd3d4aa81147
+AUX libfprint-1.94.4-stderr-redefinition.patch 928 BLAKE2B e23caf122c169f93307cd5137402470fa6bbb29719fb703e971daf742d3866c9403972adec3e678d4f6aa9eeabc2a07a565235843b3cf7921c54f7a912b73041 SHA512 e7d4914005867365c67d9e8d9a3ce1528e7471feb6ad34e2e0e98d44420a2359a5e39b5fdd1613ed937d0425ba61e666bf98b9e9a3b0462b1ddf2ae28fabe322
 DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
+DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
 EBUILD libfprint-1.0.ebuild 1063 BLAKE2B a486982077da190caacf146bd9831146087cdc4da4ccf8debb5bbeef1641b72fc21bc16de6ce8b69dd82262e6911ece105840f78991eeed34e6c300099564e42 SHA512 bf1e942f98ffa922bbb3e5110ee87106ca56a2f646be2afc9441ed0d15cea0bbc04daddd92bb9169c02619c8571fd02705be7229ea09716d8298ca0b5904f021
 EBUILD libfprint-1.94.3.ebuild 1388 BLAKE2B 548dbde6c835bcbeff3b31daf812a9cd926f2df1b052bad503bbdbf4aaa32a3ad20723701105deaae14e2c1775994335fe748fe37becc92ebb81d11e48529d98 SHA512 aa9e8f5570e8daa2c4881d5eedb5b45c8879a42b32da79c7f274488c4a28e4662f7648ab59c6ec474ce0b7fec78e377e353e096d79fe1bd001ada43111b5ce9e
+EBUILD libfprint-1.94.4.ebuild 1358 BLAKE2B cc1c872a121f73a58565bbbf52dd67f78c0cbbf0636c1c164cf205f00f7ec99046ff25775b9afca5aa81f61a1580afcbbe5691886aa97c5fce98676d9a0084eb SHA512 f690d23fef1afe5eeee917e79cab6d658755b2653c14f42025e074800dd01ec7a2206adb3955e167cb157bdfd195406f5aeacdfa76c4421b5c578eabe5d75f74
 MISC metadata.xml 275 BLAKE2B 20edfbe69300bfaf17dcd8e55ed6576d69e44c4e41a27a6211eb613b1bef6e97b0ccca036d9a55ff318faa6ff0679fa387d115109935a4e144fa3dc9c0aaf847 SHA512 9d3975cfeeb4e4e3101c291081d5da73124002d03f016f8ac79931cbba20d3c28d7a08769b4c845cd8d8a2d9be537b68f429fe3691136f851b01bb8b5233f406
diff --git a/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
new file mode 100644
index 000000000000..fa7f4aac0986
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
@@ -0,0 +1,24 @@
+https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/366
+
+From 2584d440afc87d463cb8dc809d48c660e091c2c4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 23 Jun 2022 05:57:46 +0100
+Subject: [PATCH] nbis: fix build on musl
+
+Drop re-definition of stderr. There's no need for this anywhere
+(including glibc). This breaks in particular on musl because
+stderr (and stdin) are both const, and macros unlike in glibc.
+
+Bug: https://bugs.gentoo.org/853811
+--- a/libfprint/nbis/include/bozorth.h
++++ b/libfprint/nbis/include/bozorth.h
+@@ -217,8 +217,6 @@ struct xytq_struct {
+ /**************************************************************************/
+ /* Globals supporting command line options */
+ extern int verbose_threshold;
+-/* Global supporting error reporting */
+-extern FILE *stderr;
+ 
+ /**************************************************************************/
+ /* In: BZ_GBLS.C */
+GitLab
diff --git a/sys-auth/libfprint/libfprint-1.94.4.ebuild b/sys-auth/libfprint/libfprint-1.94.4.ebuild
new file mode 100644
index 000000000000..5a5defa19e28
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.94.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson udev
+
+DESCRIPTION="Library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples gtk-doc +introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev
+	dev-libs/libgusb
+	dev-libs/nss
+	virtual/libusb:1=
+	x11-libs/pixman
+	!>=sys-auth/libfprint-1.90:0
+	examples? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? (
+		dev-libs/gobject-introspection
+		dev-libs/libgusb[introspection]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
+	"${FILESDIR}"/${PN}-1.94.4-stderr-redefinition.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples gtk-examples)
+		$(meson_use gtk-doc doc)
+		$(meson_use introspection)
+		-Ddrivers=all
+		-Dudev_rules=enabled
+		-Dudev_rules_dir=$(get_udevdir)/rules.d
+		--libdir=/usr/$(get_libdir)
+	)
+
+	meson_src_configure
+}