From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] fprint upgrade to 1.90.x series
Date: Thu, 10 Sep 2020 18:23:51 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24809@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fprint-upgrade
https://github.com/void-linux/void-packages/pull/24809
fprint upgrade to 1.90.x series
- I'm exciting for this upgrade since it can work with ThinkPad T480, albeit with 3 patches from Ubuntu.
- This PR is in drafting state for now, I haven't applied Ubuntu patch set, yet.
A patch file from https://github.com/void-linux/void-packages/pull/24809.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fprint-upgrade-24809.patch --]
[-- Type: text/x-diff, Size: 8973 bytes --]
From c77a3d7995fc85faa24e90a7760091d657026af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 22:56:15 +0700
Subject: [PATCH 1/5] New package: pam_wrapper-1.1.3
---
common/shlibs | 1 +
srcpkgs/pam_wrapper/template | 28 ++++++++++++++++++++++++++++
srcpkgs/python3-pypamtest | 1 +
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/pam_wrapper/template
create mode 120000 srcpkgs/python3-pypamtest
diff --git a/common/shlibs b/common/shlibs
index ec8310df7b3..067c2864966 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+libpamtest.so.0 pam_wrapper-1.1.3_1
diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template
new file mode 100644
index 00000000000..0bda491a5a6
--- /dev/null
+++ b/srcpkgs/pam_wrapper/template
@@ -0,0 +1,28 @@
+# Template file for 'pam_wrapper'
+pkgname=pam_wrapper
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DUNIT_TESTING=ON"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="cmake"
+makedepends="python3-devel pam-devel cmocka-devel"
+short_desc="Tool to test PAM applications and modules"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://cwrap.org/pam_wrapper.html"
+distfiles="https://www.samba.org/ftp/cwrap/pam_wrapper-${version}.tar.gz"
+checksum=4feedd788c6fa36516f6d6060482cd86455998d72849eb5f539de48915bdc5f3
+lib32disabled=yes
+
+python3-pypamtest_package() {
+ lib32disabled=yes
+ short_desc+=" - Python 3 bindings"
+ depends="${sourcepkg}-${version}_${revision} python3"
+ pkg_install() {
+ vmove usr/lib/python*
+ }
+}
diff --git a/srcpkgs/python3-pypamtest b/srcpkgs/python3-pypamtest
new file mode 120000
index 00000000000..3ea00f9d1ad
--- /dev/null
+++ b/srcpkgs/python3-pypamtest
@@ -0,0 +1 @@
+pam_wrapper
\ No newline at end of file
From c8b79788114713e5dc297a4a2521e1419fabc13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:29:20 +0700
Subject: [PATCH 2/5] libfprint: update to 1.90.2.
---
common/shlibs | 2 +-
srcpkgs/libfprint/template | 11 ++++++-----
srcpkgs/libfprint/update | 2 --
3 files changed, 7 insertions(+), 8 deletions(-)
delete mode 100644 srcpkgs/libfprint/update
diff --git a/common/shlibs b/common/shlibs
index 067c2864966..a46f53ed4eb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1581,7 +1581,7 @@ libtcmalloc.so.4 gperftools-2.1_1
libaio.so.1 libaio-0.3.109_1
libofx.so.7 libofx-0.9.11_1
libsigsegv.so.2 libsigsegv-2.10_2
-libfprint.so.0 libfprint-0.5.1_1
+libfprint-2.so.2 libfprint-1.90.2_1
libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1
libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1
libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1
diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template
index ae22b871f3d..8e47ef8ab02 100644
--- a/srcpkgs/libfprint/template
+++ b/srcpkgs/libfprint/template
@@ -1,19 +1,20 @@
# Template file for 'libfprint'
pkgname=libfprint
-version=1.0
+version=1.90.2
revision=1
-wrksrc="libfprint-V_${version//./_}"
build_style=meson
+build_helper=gir
configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false"
hostmakedepends="pkg-config"
-makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel"
+makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel
+ libgusb-devel"
short_desc="Support for consumer fingerprint reader devices"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9
+distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1d4b4f34c074567e9fd7572631c31c2a/libfprint-$version.tar.xz"
+checksum=f126b37c036ead4b4711d1a305bbd75de4041ec95b3fa376a2d1a95a40eab578
post_install() {
vmkdir usr/lib/udev/rules.d
diff --git a/srcpkgs/libfprint/update b/srcpkgs/libfprint/update
deleted file mode 100644
index 1f57940e938..00000000000
--- a/srcpkgs/libfprint/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")'
-ignore='*.99.*'
From d31d5ac0bfc4703bd38aee797d00d35a3a7b04b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:54:57 +0700
Subject: [PATCH 3/5] fprintd: update to 1.90.1.
---
srcpkgs/fprintd/template | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/fprintd/template b/srcpkgs/fprintd/template
index 11e0922ea43..14c5c6464ef 100644
--- a/srcpkgs/fprintd/template
+++ b/srcpkgs/fprintd/template
@@ -1,36 +1,31 @@
# Template file for 'fprintd'
pkgname=fprintd
-version=0.9.0
-revision=3
-wrksrc="fprintd-V_${version//./_}"
-build_style=gnu-configure
-configure_args="--sysconfdir=/etc/${pkgname} --disable-static --without-systemdsystemunitdir"
+version=1.90.1
+revision=1
+build_style=meson
+configure_args="-Dman=true -Dgtk_doc=false
+ -Dpam_modules_dir=/usr/lib/security
+ -Dsystemd_system_unit_dir=/not-systemd"
conf_files="/etc/fprintd/fprintd.conf"
-hostmakedepends="autoconf automake dbus-glib-devel gettext-devel glib-devel gtk-doc intltool libtool m4 pkg-config"
-makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel libfprint-devel pam-devel polkit-devel"
+hostmakedepends="meson dbus-glib-devel gettext-devel glib-devel intltool
+ pkg-config perl"
+makedepends="dbus-devel dbus-glib-devel gettext-devel glib-devel
+ libfprint-devel pam-devel polkit-devel cairo-devel elogind-devel
+ pam_wrapper python3-cairo python3-pypamtest python3-dbus python3-dbusmock"
short_desc="Daemon that provides fingerprint scanning functionality"
maintainer="Enno Boland <gottox@voidlinux.org>"
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=3bfbf870a3c333a0a1f08287b2b8501c34fd347faac8c1d52bd0d64ab3474d8e
+distfiles="https://gitlab.freedesktop.org/libfprint/fprintd/uploads/a47c31c844e23e070665a8a85dae0144/fprintd-$version.tar.xz"
+checksum=b4940b1dfb052a3641f1bb9bc7685b649aaa26220016dd793871d4f421c8a30d
lib32disabled=yes
CFLAGS="-fcommon"
-pre_configure() {
- glib-gettextize -c -f
- gtkdocize --copy
- intltoolize -c -f
- libtoolize -c
- aclocal
- autoconf
- autoheader
- automake -a -c
+post_patch() {
+ vsed -i -e "/^systemd_dep *=/d" meson.build
}
post_install() {
- mv $DESTDIR/etc/$pkgname/dbus-1 $DESTDIR/usr/share/dbus-1
- vmkdir usr/share/dbus-1/system.d
- mv $DESTDIR/usr/share/dbus-1/dbus-1/system.d/net.reactivated.Fprint.conf $DESTDIR/usr/share/dbus-1/system.d/
+ rm -rf $DESTDIR/not-systemd
}
From 9dfc65e72645fe9087fd83e9524b5a305ea971a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:28:22 +0700
Subject: [PATCH 4/5] fingerprint-gui: rebuild with libfprint 1.90.2
---
srcpkgs/fingerprint-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template
index f030ab573aa..dd09aae305f 100644
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@@ -1,7 +1,7 @@
# Template file for 'fingerprint-gui'
pkgname=fingerprint-gui
version=1.09
-revision=2
+revision=3
wrksrc="${pkgname}-${version}-qt5"
build_style=qmake
hostmakedepends="qt5-host-tools qt5-qmake"
From 470e9ca2a7682bd33d6689caafca8e7b09050c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 10 Sep 2020 20:28:22 +0700
Subject: [PATCH 5/5] fprint_demo: rebuild with libfprint 1.90.2
---
srcpkgs/fprint_demo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fprint_demo/template b/srcpkgs/fprint_demo/template
index a801b480bbf..c9234221a8f 100644
--- a/srcpkgs/fprint_demo/template
+++ b/srcpkgs/fprint_demo/template
@@ -1,7 +1,7 @@
# Template file for 'fprint_demo'
pkgname=fprint_demo
version=0.4
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config"
makedepends="gtk+-devel libfprint-devel"
next reply other threads:[~2020-09-10 16:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 16:23 sgn [this message]
2020-09-10 16:25 ` [PR PATCH] [Updated] " sgn
2020-09-11 0:49 ` sgn
2020-09-18 1:56 ` sgn
2020-09-18 2:13 ` sgn
2020-09-19 3:42 ` [PR PATCH] [Closed]: " sgn
2020-12-07 0:03 ` sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24809@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).