From 4ff80e46c4de634d3b4473c4f71cc561128a9a4b Mon Sep 17 00:00:00 2001
From: bra1nwave <brainwave@openmailbox.org>
Date: Wed, 4 Sep 2019 10:48:32 +0200
Subject: [PATCH 1/2] libpwquality: enable python3 binding

---
 srcpkgs/libpwquality-python3                  |  1 +
 .../libpwquality/patches/pythoncross.patch    | 12 ++++++++++
 srcpkgs/libpwquality/template                 | 23 +++++++++++++++----
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libpwquality-python3
 create mode 100644 srcpkgs/libpwquality/patches/pythoncross.patch

diff --git a/srcpkgs/libpwquality-python3 b/srcpkgs/libpwquality-python3
new file mode 120000
index 00000000000..db26e623f28
--- /dev/null
+++ b/srcpkgs/libpwquality-python3
@@ -0,0 +1 @@
+libpwquality
\ No newline at end of file
diff --git a/srcpkgs/libpwquality/patches/pythoncross.patch b/srcpkgs/libpwquality/patches/pythoncross.patch
new file mode 100644
index 00000000000..5e7ea7bd5d1
--- /dev/null
+++ b/srcpkgs/libpwquality/patches/pythoncross.patch
@@ -0,0 +1,12 @@
+--- python/Makefile.am.orig
++++ python/Makefile.am
+@@ -11,7 +11,7 @@
+ EXTRA_DIST = pwquality.c setup.py
+ 
+ all-local:
+-	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=.
++	LDSHARED="${CC} -pthread -shared" CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=.
+ 
+ install-exec-local:
+-	CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix}
++	LDSHARED="${CC} -pthread -shared" CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix}
diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template
index 3093808c526..9a90dcf3acb 100644
--- a/srcpkgs/libpwquality/template
+++ b/srcpkgs/libpwquality/template
@@ -1,20 +1,24 @@
 # Template file for 'libpwquality'
 pkgname=libpwquality
 version=1.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-pam --disable-python-bindings
- --with-securedir=/usr/lib/security"
+configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security"
 hostmakedepends="libtool automake gettext-devel"
-makedepends="cracklib-devel pam-devel"
+makedepends="cracklib-devel pam-devel python3-devel"
 conf_files="/etc/security/pwquality.conf"
 short_desc="Library for password quality checking and generating random passwords"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/libpwquality/libpwquality"
-license="GPL-2"
 distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2"
 checksum=1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b
 
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+fi
+
 pre_configure() {
 	autoreconf -fi
 }
@@ -26,5 +30,14 @@ libpwquality-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove usr/share/man/man3
+	}
+}
+
+libpwquality-python3_package() {
+	lib32disabled=yes
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python3*"
 	}
 }

From 1375819255f1510a1baee455f832c3dcd7ccf531 Mon Sep 17 00:00:00 2001
From: bra1nwave <brainwave@openmailbox.org>
Date: Thu, 5 Sep 2019 09:56:35 +0200
Subject: [PATCH 2/2] gnome-passwordsafe: add missing runtime dependency

---
 srcpkgs/gnome-passwordsafe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-passwordsafe/template b/srcpkgs/gnome-passwordsafe/template
index cec9f84e238..f310ce03a08 100644
--- a/srcpkgs/gnome-passwordsafe/template
+++ b/srcpkgs/gnome-passwordsafe/template
@@ -1,14 +1,15 @@
 # Template file for 'gnome-passwordsafe'
 pkgname=gnome-passwordsafe
 version=3.32.0
-revision=1
+revision=2
 archs=noarch
 wrksrc="PasswordSafe-${version}"
 build_style=meson
 pycompile_module="passwordsafe"
 hostmakedepends="glib-devel pkg-config gobject-introspection python3-pykeepass"
 makedepends="gtk+3-devel libhandy-devel python3-pykeepass libpwquality-devel"
-depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct"
+depends="gtk+3 libnotify libhandy python3-gobject python3-pykeepass python3-construct
+ libpwquality-python3"
 short_desc="Keepass compatible password manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"