From bdb2ed1d917f6032bfeb6a3b621d167cc37d4a97 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: Sat, 21 Dec 2024 07:12:58 +0700
Subject: [PATCH] gpgme-qt6: update to 1.24.1.

---
 srcpkgs/gpgme-qt6/template | 21 +++++++++------------
 srcpkgs/gpgmeqt-headers    |  1 -
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/gpgmeqt-headers

diff --git a/srcpkgs/gpgme-qt6/template b/srcpkgs/gpgme-qt6/template
index 4604d2aec6f..5c573b4a0d9 100644
--- a/srcpkgs/gpgme-qt6/template
+++ b/srcpkgs/gpgme-qt6/template
@@ -6,8 +6,8 @@
 #     SDL2 -> pipewire -> libcanberra -> gtk+ -> gtk+3
 #          -> colord -> sane -> poppler -> gpgme -> qt5 -> SDL2
 pkgname=gpgme-qt6
-version=1.23.2
-revision=6
+version=1.24.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-fd-passing
  --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
@@ -21,7 +21,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=9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
+checksum=ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f
 
 CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
 
@@ -40,7 +40,8 @@ do_configure() {
 	( cd build-qt6 && \
 		../configure ${configure_args} \
 			--enable-languages=qt6,cpp \
-			MOC=/usr/lib/qt6/libexec/moc )
+			MOC=/usr/lib/qt6/libexec/moc \
+			MOC6=/usr/lib/qt6/libexec/moc )
 }
 
 do_build() {
@@ -80,20 +81,14 @@ gpgmeqt_package() {
 	}
 }
 
-gpgmeqt-headers_package() {
-	short_desc="GnuPG Made Easy - Qt binding headers"
-	pkg_install() {
-		vmove usr/include/QGpgME
-		vmove usr/include/qgpgme
-	}
-}
-
 gpgmeqt-devel_package() {
 	depends="gpgme-devel>=${version}
 	 gpgmeqt-headers>=${version}_${revision}
 	 gpgmeqt>=${version}_${revision}"
+	replaces="gpgmeqt-headers<1.24.0"
 	short_desc="GnuPG Made Easy - Qt5 development files"
 	pkg_install() {
+		vmove usr/include/qgpgme-qt5
 		vmove usr/lib/libqgpgme.so
 		vmove usr/lib/cmake/QGpgme
 	}
@@ -103,8 +98,10 @@ gpgme-qt6-devel_package() {
 	depends="gpgme-devel>=${version}
 	 gpgmeqt-headers>=${version}_${revision}
 	 gpgme-qt6>=${version}_${revision}"
+	replaces="gpgmeqt-headers<1.24.0"
 	short_desc="GnuPG Made Easy - Qt6 development files"
 	pkg_install() {
+		vmove usr/include/qgpgme-qt6
 		vmove usr/lib/libqgpgmeqt6.la
 		vmove usr/lib/libqgpgmeqt6.so
 		vmove usr/lib/cmake/QGpgmeQt6
diff --git a/srcpkgs/gpgmeqt-headers b/srcpkgs/gpgmeqt-headers
deleted file mode 120000
index a16f079ab5a..00000000000
--- a/srcpkgs/gpgmeqt-headers
+++ /dev/null
@@ -1 +0,0 @@
-gpgme-qt6
\ No newline at end of file