From 7c29d77f1ae200a698391a22a44c86cb549b1cf3 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 14:55:50 +0500 Subject: [PATCH 1/6] gpgme: package python binding --- srcpkgs/gpgme-python3 | 1 + srcpkgs/gpgme/template | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/gpgme-python3 diff --git a/srcpkgs/gpgme-python3 b/srcpkgs/gpgme-python3 new file mode 120000 index 0000000000000..b291e753127a0 --- /dev/null +++ b/srcpkgs/gpgme-python3 @@ -0,0 +1 @@ +gpgme \ No newline at end of file diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index e5db1704b5b98..4d0b16b864702 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -1,13 +1,16 @@ # Template file for 'gpgme' pkgname=gpgme version=1.23.1 -revision=1 +revision=2 build_style=gnu-configure +build_helper="python3" configure_args="--enable-fd-passing --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr - --with-libassuan-prefix=$XBPS_CROSS_BASE/usr" -hostmakedepends="gnupg pkg-config qt5-host-tools qt5-qmake" -makedepends="libassuan-devel qt5-tools-devel" + --with-libassuan-prefix=$XBPS_CROSS_BASE/usr + --enable-languages=qt,cpp,python" +hostmakedepends="gnupg pkg-config qt5-host-tools qt5-qmake python3-setuptools swig python3-devel" +makedepends="libassuan-devel qt5-tools-devel python3-devel" +checkdepends="which gnupg" short_desc="GnuPG Made Easy" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" @@ -81,3 +84,18 @@ gpgmeqt-devel_package() { vmove usr/lib/cmake/QGpgme } } + +gpgme-python3_package() { + short_desc+=" - Python binding" + depends="gpgme" + pkg_install() { + vmove "usr/lib/python*" + _sitepath="${PKGDESTDIR}/${py3_sitelib}" + _dotegg=$(echo "${_sitepath}"/gpg-"${version}"-*.egg) + _dotegginfo="$_dotegg"-info + mkdir -p $_dotegginfo + mv "${_dotegg}"/gpg "${_sitepath}"/ + mv "${_dotegg}"/EGG-INFO/* "${_dotegginfo}" + rm -r ${_dotegg} + } +} From bb90d9c26229aa156c9870c3fe8d6a3f12cdd021 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 23:45:40 +0500 Subject: [PATCH 2/6] python3-gpg: mark as dummy package , it is replaced by gpgme-python3 --- srcpkgs/python3-gpg/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/python3-gpg/template b/srcpkgs/python3-gpg/template index 617a546dd6455..836f6d04fc897 100644 --- a/srcpkgs/python3-gpg/template +++ b/srcpkgs/python3-gpg/template @@ -1,12 +1,10 @@ # Template file for 'python3-gpg' pkgname=python3-gpg version=1.10.0 -revision=11 -build_style=python3-module -hostmakedepends="swig gpgme-devel python3-setuptools" -makedepends="libgpg-error-devel libassuan-devel python3-devel ${hostmakedepends}" -depends="python3" -short_desc="Python3 bindings for GPGME GnuPG cryptography library" +revision=12 +build_style=meta +depends="gpgme-python3" +short_desc="Python3 bindings for GPGME GnuPG cryptography library - transitional dummy package" license="LGPL-2.1-or-later, GPL-2.0-or-later" maintainer="Felix Van der Jeugt " homepage="https://www.gnupg.org" From b4c10cfad32ecfa9f7c49431e6f8e441b8e4c702 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 23:49:02 +0500 Subject: [PATCH 3/6] alot: deps on gpgme-python3 --- srcpkgs/alot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template index 5a1a2df6d42b7..8538b71ad3f19 100644 --- a/srcpkgs/alot/template +++ b/srcpkgs/alot/template @@ -1,11 +1,11 @@ # Template file for 'alot' pkgname=alot version=0.9.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx" depends="python3-setuptools python3-Twisted notmuch-python3 python3-configobj - python3-gpg python3-magic python3-urwidtrees" + gpgme-python3 python3-magic python3-urwidtrees" checkdepends="$depends gnupg2 procps-ng python3-pytest" short_desc="Terminal-based mail user agent based on the notmuch mail indexer" maintainer="Felix Van der Jeugt " From fd47e373a2634157989def8867a538587249bf5e Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 23:49:52 +0500 Subject: [PATCH 4/6] caerbannog: deps on gpgme-python3 --- srcpkgs/caerbannog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/caerbannog/template b/srcpkgs/caerbannog/template index 71d1348f2b7be..a77bcd1fc7ee8 100644 --- a/srcpkgs/caerbannog/template +++ b/srcpkgs/caerbannog/template @@ -1,10 +1,10 @@ # Template file for 'caerbannog' pkgname=caerbannog version=0.3 -revision=2 +revision=3 build_style=meson hostmakedepends="glib-devel" -depends="libhandy1 libnotify python3-anytree python3-gpg python3-gobject python3-fuzzyfinder" +depends="libhandy1 libnotify python3-anytree gpgme-python3 python3-gobject python3-fuzzyfinder" short_desc="Frontend for password-store" maintainer="Piraty " license="GPL-3.0-or-later" From 9010f94df3585f091623449214c8146370637449 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 23:53:44 +0500 Subject: [PATCH 5/6] dropbox: deps on gpgme-python3 --- srcpkgs/dropbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dropbox/template b/srcpkgs/dropbox/template index f03251ce86fa4..475a5edfe5dfd 100644 --- a/srcpkgs/dropbox/template +++ b/srcpkgs/dropbox/template @@ -1,14 +1,14 @@ # Template file for 'dropbox' pkgname=dropbox version=2023.02.27+cf4ccaa -revision=1 +revision=2 archs="x86_64 i686" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config automake libtool python3-gobject python3-docutils gdk-pixbuf-devel" makedepends="nautilus-devel python3-devel python3-gobject-devel" -depends="libxslt python3-gobject python3-gpg gdk-pixbuf" +depends="libxslt python3-gobject gpgme-python3 gdk-pixbuf" short_desc="Dropbox file sharing" maintainer="Orphaned " license="GPL-3.0-or-later, CC-BY-ND-3.0" From a42c1c80cd2b4d96fa139f3b3095bf8e5da6fffa Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 4 Nov 2023 23:54:52 +0500 Subject: [PATCH 6/6] torbrowser-launcher: deps on gpgme-python3 --- srcpkgs/torbrowser-launcher/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template index 02cd9bf11160b..db72eddb946aa 100644 --- a/srcpkgs/torbrowser-launcher/template +++ b/srcpkgs/torbrowser-launcher/template @@ -1,13 +1,13 @@ # Template file for 'torbrowser-launcher' pkgname=torbrowser-launcher version=0.3.6 -revision=2 +revision=3 archs="i686 x86_64" # limited by Tor Browser itself build_style=python3-module hostmakedepends="gettext python3-distro python3-setuptools" -depends="python3-PyQt5 python3-gpg python3-requests python3-pysocks tor dbus-glib +depends="python3-PyQt5 gpgme-python3 python3-requests python3-pysocks tor dbus-glib python3-packaging" -checkdepends="python3-PyQt5 python3-gpg python3-requests python3-pysocks gnupg tor +checkdepends="python3-PyQt5 gpgme-python3 python3-requests python3-pysocks gnupg tor dbus-glib python3-packaging" short_desc="Securely download, verify and run Tor Browser" maintainer="Daniel Eyßer "