Bump to 1.90.8+3+gc6647ba

Patches are now unneeded thanks to
https://gitlab.freedesktop.org/libfprint/fprintd/-/issues/82. The tests
now work now as well.

4 files changed, 5 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6172a4f62597..a54b4b85b6b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fprintd-libfprint2
 	pkgdesc = D-Bus service to access fingerprint readers
-	pkgver = 1.90.1+97+gc42e627
+	pkgver = 1.90.8+3+gc6647ba
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freedesktop.org/wiki/Software/fprint/fprintd
@@ -26,11 +26,7 @@ pkgbase = fprintd-libfprint2
 	provides = fprintd
 	conflicts = fprintd
 	source = git+https://gitlab.freedesktop.org/libfprint/fprintd.git
-	source = 0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch
-	source = 0002-data-Remove-TasksMax.patch
 	sha256sums = SKIP
-	sha256sums = 66f5f73676bcdc36b92c23923180c0a96f70f57b643e2b5d158494f1d0fb7ce5
-	sha256sums = a1d4577633e931d58fb9b3421558b58391218abee0d93ec4c4778d29d5ccfd87
 
 pkgname = fprintd-libfprint2
 	depends = dbus
diff --git a/0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch b/0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch
deleted file mode 100644
index c23d348e0a9c..000000000000
--- a/0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 42cb14080bbb6acb8dbbb98f1a1f454f794692ed Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Thu, 15 Oct 2020 02:29:49 -0400
-Subject: [PATCH 1/2] tests: Skip a test if virtual image driver is not enabled
-
-test_manager_get_devices_on_name_appeared requires the virtual image
-driver to be available.
----
- tests/fprintd.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/tests/fprintd.py b/tests/fprintd.py
-index 0bd9ac3..06c65bc 100755
---- a/tests/fprintd.py
-+++ b/tests/fprintd.py
-@@ -270,6 +270,9 @@ class FPrintdTest(dbusmock.DBusTestCase):
-         return pwd.getpwuid(os.getuid()).pw_name
- 
-     def setUp(self):
-+        self.daemon = None
-+        self.manager = None
-+        self.device = None
-         self.test_dir = tempfile.mkdtemp()
-         self.addCleanup(shutil.rmtree, self.test_dir)
-         self.state_dir = os.path.join(self.test_dir, 'state')
-@@ -325,8 +328,6 @@ class FPrintdVirtualDeviceBaseTest(FPrintdTest):
-     def setUp(self):
-         super().setUp()
- 
--        self.manager = None
--        self.device = None
-         self.polkitd_start()
-         self.daemon_start()
- 
-@@ -441,6 +442,9 @@ class FPrintdManagerPreStartTests(FPrintdTest):
-             on_name_appeared, None)
- 
-         self.daemon_start()
-+        if self.device is None:
-+            self.skipTest("Need virtual_image device to run the test")
-+
-         while not self._appeared_res:
-             ctx.iteration(True)
- 
--- 
-2.28.0
-
diff --git a/0002-data-Remove-TasksMax.patch b/0002-data-Remove-TasksMax.patch
deleted file mode 100644
index 275035c8ba07..000000000000
--- a/0002-data-Remove-TasksMax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f3c2ecae6b0d2ab4bbe52dad8f7bd9b050b81bbd Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Thu, 15 Oct 2020 02:38:59 -0400
-Subject: [PATCH 2/2] data: Remove TasksMax
-
-fprintd can spawn new threads like the gmain thread, and the gusb
-library can spawn more threads of its own.
----
- data/fprintd.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/data/fprintd.service.in b/data/fprintd.service.in
-index daca723..b61d36b 100644
---- a/data/fprintd.service.in
-+++ b/data/fprintd.service.in
-@@ -33,7 +33,6 @@ RestrictRealtime=true
- 
- # Privilege escalation
- NoNewPrivileges=true
--TasksMax=1
- 
- # Capabilities
- CapabilityBoundingSet=
--- 
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 572b3ddd134d..bb2f74bd251d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=fprintd-libfprint2
 _pkgname=fprintd
 epoch=1
-pkgver=1.90.1+97+gc42e627
+pkgver=1.90.8+3+gc6647ba
 pkgrel=1
 pkgdesc="D-Bus service to access fingerprint readers"
 arch=(x86_64)
@@ -20,22 +20,16 @@ conflicts=(fprintd)
 makedepends=(git gtk-doc meson pam)
 checkdepends=(pam_wrapper python-cairo python-dbus python-dbusmock python-gobject)
 groups=(fprint)
-source=("git+https://gitlab.freedesktop.org/libfprint/$_pkgname.git"
-        '0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch'
-        '0002-data-Remove-TasksMax.patch')
-sha256sums=('SKIP'
-            '66f5f73676bcdc36b92c23923180c0a96f70f57b643e2b5d158494f1d0fb7ce5'
-            'a1d4577633e931d58fb9b3421558b58391218abee0d93ec4c4778d29d5ccfd87')
+source=("git+https://gitlab.freedesktop.org/libfprint/$_pkgname.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgname
-  git describe --tags | sed 's/^V_//;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/^V_\|^v//;s/_/./g;s/-/+/g'
 }
 
 prepare() {
   cd $_pkgname
-  git apply < '../0001-tests-Skip-a-test-if-virtual-image-driver-is-not-ena.patch'
-  git apply < '../0002-data-Remove-TasksMax.patch'
 }
 
 build() {