Re: [PR PATCH] [Updated] New package: gpgme-qt6-1.23.2

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/Luciogi/void-packages gpgme-qt6
https://github.com/void-linux/void-packages/pull/50058

New package: gpgme-qt6-1.23.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)


A patch file from https://github.com/void-linux/void-packages/pull/50058.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpgme-qt6-50058.patch --]
[-- Type: text/x-diff, Size: 5268 bytes --]

From d404d16096bd351d1262b6c212e1ebf942ee2222 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 27 Apr 2024 21:01:32 +0500
Subject: [PATCH] gpgme: update to 1.23.2.

---
 common/shlibs           |  1 +
 srcpkgs/gpgme-qt6       |  1 +
 srcpkgs/gpgme-qt6-devel |  1 +
 srcpkgs/gpgme/template  | 76 +++++++++++++++++++++++++++++++++--------
 srcpkgs/gpgmeqt-headers |  1 +
 5 files changed, 66 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/gpgme-qt6
 create mode 120000 srcpkgs/gpgme-qt6-devel
 create mode 120000 srcpkgs/gpgmeqt-headers

diff --git a/common/shlibs b/common/shlibs
index 105196bea39154..9dbc8f0d118823 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -733,6 +733,7 @@ libassuan.so.0 libassuan-2.0.1_1
 libgpgme.so.11 libgpgme-1.12.0_2
 libgpgmepp.so.6 gpgmepp-1.7.0_3
 libqgpgme.so.15 gpgmeqt-1.18.0_1
+libqgpgmeqt6.so.15 gpgme-qt6-1.23.2_1
 libgarcon-1.so.0 garcon-0.1.12_1
 libgarcon-gtk3-1.so.0 garcon-0.6.1_1
 libxfce4ui-2.so.0 libxfce4ui-4.18.0_1
diff --git a/srcpkgs/gpgme-qt6 b/srcpkgs/gpgme-qt6
new file mode 120000
index 00000000000000..b291e753127a0b
--- /dev/null
+++ b/srcpkgs/gpgme-qt6
@@ -0,0 +1 @@
+gpgme
\ No newline at end of file
diff --git a/srcpkgs/gpgme-qt6-devel b/srcpkgs/gpgme-qt6-devel
new file mode 120000
index 00000000000000..b291e753127a0b
--- /dev/null
+++ b/srcpkgs/gpgme-qt6-devel
@@ -0,0 +1 @@
+gpgme
\ No newline at end of file
diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index f86f0a1ff32732..690ae492a94272 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,15 +1,15 @@
 # Template file for 'gpgme'
 pkgname=gpgme
-version=1.23.1
-revision=2
+version=1.23.2
+revision=1
 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 python3-setuptools
- python3-installer python3-build python3-wheel swig"
-makedepends="libassuan-devel qt5-tools-devel python3-devel"
+ python3-installer python3-build python3-wheel swig qt6-base"
+makedepends="libassuan-devel qt5-devel python3-devel qt6-base-devel"
 checkdepends="which gnupg"
 short_desc="GnuPG Made Easy"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnupg.org/software/gpgme/index.html"
 changelog="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2"
-checksum=a0c316f7ab7d3bfb01a8753c3370dc906e5b61436021f3b54ff1483b513769bd
+checksum=9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
 
 CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
@@ -28,13 +28,34 @@ elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	CXXFLAGS+=" ${CFLAGS}"
 fi
 
-post_build() {
-	cd lang/python
-	top_builddir=../.. python -m build --wheel --no-isolation
+do_configure() {
+	mkdir -p build
+	mkdir -p build-qt6
+	cd build
+	../configure ${configure_args}
+	cd ../build-qt6
+	../configure ${configure_args} --enable-languages=qt6,cpp \
+		MOC=/usr/lib/qt6/libexec/moc
 }
 
-post_install() {
-	cd lang/python
+do_build() {
+	local f
+	make -C build ${makejobs}
+	make -C build-qt6 ${makejobs}
+	cd build/lang/python
+	top_builddir=../.. srcdir=../../../lang/python \
+		python -m build --wheel --no-isolation
+}
+
+do_check() {
+	make -C build ${makejobs} check
+	make -C build-qt6 ${makejobs} check
+}
+
+do_install() {
+	make -C build install DESTDIR=${DESTDIR}
+	make -C build-qt6 install DESTDIR=${DESTDIR}
+	cd build/lang/python
 	python -m installer --destdir="${DESTDIR}" dist/*.whl
 }
 
@@ -78,23 +99,50 @@ gpgmepp-devel_package() {
 }
 
 gpgmeqt_package() {
-	short_desc+=" - Qt binding"
+	short_desc+=" - Qt5 binding"
 	pkg_install() {
 		vmove "usr/lib/libqgpgme.so.*"
 	}
 }
 
-gpgmeqt-devel_package() {
-	depends="gpgme-devel>=${version}_${revision} gpgmeqt>=${version}_${revision}"
-	short_desc+=" - Qt binding development files"
+gpgmeqt-headers_package() {
+	short_desc+=" - Qt binding headers"
 	pkg_install() {
 		vmove usr/include/QGpgME
 		vmove usr/include/qgpgme
+	}
+}
+
+gpgmeqt-devel_package() {
+	depends="gpgme-devel>=${version}_${revision}
+	 gpgmeqt-headers>=${version}_${revision}
+	 gpgmeqt>=${version}_${revision}"
+	short_desc+=" - Qt5 binding development files"
+	pkg_install() {
 		vmove usr/lib/libqgpgme.so
 		vmove usr/lib/cmake/QGpgme
 	}
 }
 
+gpgme-qt6_package() {
+	short_desc+=" - Qt 6 binding"
+	pkg_install() {
+		vmove "usr/lib/libqgpgmeqt6.so.*"
+	}
+}
+
+gpgme-qt6-devel_package() {
+	depends="gpgme-devel>=${version}_${revision}
+	 gpgmeqt-headers>=${version}_${revision}
+	 gpgme-qt6>=${version}_${revision}"
+	short_desc+=" - Qt 6 binding - development files"
+	pkg_install() {
+		vmove usr/lib/libqgpgmeqt6.la
+		vmove usr/lib/libqgpgmeqt6.so
+		vmove usr/lib/cmake/QGpgmeQt6
+	}
+}
+
 gpgme-python3_package() {
 	short_desc+=" - Python binding"
 	depends="gpgme"
diff --git a/srcpkgs/gpgmeqt-headers b/srcpkgs/gpgmeqt-headers
new file mode 120000
index 00000000000000..b291e753127a0b
--- /dev/null
+++ b/srcpkgs/gpgmeqt-headers
@@ -0,0 +1 @@
+gpgme
\ No newline at end of file