From 2aa2eeeda5ef32f4eccd52fecaccc0df3952784e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 27 Apr 2024 15:28:10 +0000
Subject: [PATCH] core/gpgme to 1.23.2-4

---
 core/gpgme/.SRCINFO | 10 +---------
 core/gpgme/PKGBUILD | 33 ++++-----------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/core/gpgme/.SRCINFO b/core/gpgme/.SRCINFO
index ac2519756..01a61e4ea 100644
--- a/core/gpgme/.SRCINFO
+++ b/core/gpgme/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gpgme
 	pkgdesc = A C wrapper library for GnuPG
 	pkgver = 1.23.2
-	pkgrel = 1
+	pkgrel = 4
 	url = https://www.gnupg.org/related_software/gpgme/
 	arch = x86_64
 	license = LGPL
@@ -12,7 +12,6 @@ pkgbase = gpgme
 	makedepends = python-installer
 	makedepends = python-setuptools
 	makedepends = python-wheel
-	makedepends = qt5-base
 	makedepends = qt6-base
 	makedepends = swig
 	source = https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.23.2.tar.bz2
@@ -29,13 +28,6 @@ pkgname = gpgme
 	provides = libgpgmepp.so
 	options = !emptydirs
 
-pkgname = qgpgme-qt5
-	pkgdesc = Qt5 bindings for GPGme
-	depends = gpgme
-	depends = qt5-base
-	provides = qgpgme
-	replaces = qgpgme
-
 pkgname = qgpgme-qt6
 	pkgdesc = Qt6 bindings for GPGme
 	depends = gpgme
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 2615eb8d3..a289b3126 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -6,9 +6,9 @@
 #  - add -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 to v7 CPPFLAGS
 
 pkgbase=gpgme
-pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
+pkgname=(gpgme qgpgme-qt6 python-gpgme)
 pkgver=1.23.2
-pkgrel=1
+pkgrel=4
 pkgdesc='A C wrapper library for GnuPG'
 arch=('x86_64')
 url='https://www.gnupg.org/related_software/gpgme/'
@@ -21,7 +21,6 @@ makedepends=(
   'python-installer'
   'python-setuptools'
   'python-wheel'
-  'qt5-base'
   'qt6-base'
   'swig'
 )
@@ -36,9 +35,6 @@ prepare() {
 
   sed -i 's/-unknown//' autogen.sh
   autoreconf -fi
-
-  # Building qt5 and qt6 bindings in the same source tree is not supported
-  cp -r ${srcdir}/${pkgbase}-${pkgver}{,-qt6}
 }
 
 build() {
@@ -58,15 +54,6 @@ build() {
     cd lang/python/
     top_builddir="$srcdir/$pkgbase-$pkgver" python -m build --wheel --no-isolation
   )
-
-  cd ../${pkgbase}-${pkgver}-qt6
-  ./configure \
-    --prefix=/usr \
-    --disable-fd-passing \
-    --disable-static \
-    --disable-gpgsm-test \
-    --enable-languages=cpp,qt6
-  make
 }
 
 check() {
@@ -89,27 +76,15 @@ package_gpgme() {
   make DESTDIR="${pkgdir}" install
 
   # split qgpgme
-  rm -r "${pkgdir}"/usr/lib/{cmake/QGpgme/,libqgpgme.*}
+  rm -r "${pkgdir}"/usr/lib/{cmake/QGpgmeQt6/,libqgpgmeqt6.*}
   rm -r "${pkgdir}"/usr/lib/python*
 }
 
-package_qgpgme-qt5() {
-  pkgdesc="Qt5 bindings for GPGme"
-  depends=('gpgme' 'qt5-base')
-  provides=('qgpgme')
-  replaces=('qgpgme')
-
-  cd ${pkgbase}-${pkgver}/lang/qt
-
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/include
-}
-
 package_qgpgme-qt6() {
   pkgdesc="Qt6 bindings for GPGme"
   depends=('gpgme' 'qt6-base')
 
-  cd ${pkgbase}-${pkgver}-qt6/lang/qt
+  cd ${pkgbase}-${pkgver}/lang/qt
 
   make DESTDIR="${pkgdir}" install
   rm -r "${pkgdir}"/usr/include