upgpkg: gpgme-git 1.22.0.r26.gab25df83-1

2 files changed, 89 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9a41ce7c9bf..0230dd4cb333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gpgme-git
 	pkgdesc = GnuPG Made Easy
-	pkgver = 1.22.0.r11.g8fde9cbe
+	pkgver = 1.22.0.r26.gab25df83
 	pkgrel = 1
 	url = https://www.gnupg.org/related_software/gpgme/
 	arch = i686
@@ -9,16 +9,21 @@ pkgbase = gpgme-git
 	makedepends = git
 	makedepends = gnupg
 	makedepends = python
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
 	makedepends = qt5-base
+	makedepends = qt6-base
 	makedepends = swig
 	source = git+https://dev.gnupg.org/source/gpgme.git
 	sha256sums = SKIP
 
 pkgname = gpgme-git
-	depends = glibc
+	depends = gcc-libs
 	depends = gnupg
 	depends = libgpg-error
-	provides = gpgme=1.22.0.r11.g8fde9cbe
+	provides = gpgme=1.22.0.r26.gab25df83
 	provides = libgpgme.so
 	provides = libgpgmepp.so
 	conflicts = gpgme
@@ -27,12 +32,23 @@ pkgname = python-gpgme-git
 	pkgdesc = Python bindings for GPGme
 	depends = python
 	depends = gpgme-git
-	provides = python-gpgme=1.22.0.r11.g8fde9cbe
+	provides = python-gpgme=1.22.0.r26.gab25df83
 	conflicts = python-gpgme
 
-pkgname = qgpgme-git
-	pkgdesc = Qt bindings for GPGme
+pkgname = qgpgme-qt5-git
+	pkgdesc = Qt5 bindings for GPGme
+	depends = gcc-libs
+	depends = gpgme-git
 	depends = qt5-base
+	provides = qgpgme-qt5=1.22.0.r26.gab25df83
+	conflicts = qgpgme-qt5
+
+pkgname = qgpgme-qt6-git
+	pkgdesc = Qt6 bindings for GPGme
+	depends = gcc-libs
 	depends = gpgme-git
-	provides = qgpgme=1.22.0.r11.g8fde9cbe
-	conflicts = qgpgme
+	depends = qt6-base
+	provides = qgpgme-qt6=1.22.0.r26.gab25df83
+	provides = qgpgme
+	conflicts = qgpgme-qt6
+	replaces = qgpgme
diff --git a/PKGBUILD b/PKGBUILD
index f2679c58180b..38681230d2d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgbase=gpgme-git
-pkgname=('gpgme-git' 'python-gpgme-git' 'qgpgme-git')
-pkgver=1.22.0.r11.g8fde9cbe
+pkgname=('gpgme-git' 'python-gpgme-git' 'qgpgme-qt5-git' 'qgpgme-qt6-git')
+pkgver=1.22.0.r26.gab25df83
 pkgrel=1
 pkgdesc="GnuPG Made Easy"
 arch=('i686' 'x86_64')
 url="https://www.gnupg.org/related_software/gpgme/"
 license=('LGPL')
-makedepends=('git' 'gnupg' 'python' 'qt5-base' 'swig')
+makedepends=('git' 'gnupg' 'python' 'python-build' 'python-installer' 'python-setuptools'
+             'python-wheel' 'qt5-base' 'qt6-base' 'swig')
 source=("git+https://dev.gnupg.org/source/gpgme.git")
 sha256sums=('SKIP')
 
@@ -22,32 +23,60 @@ pkgver() {
 build() {
   cd "gpgme"
 
+  local _common_options=(
+    --prefix="/usr"
+    --disable-fd-passing
+    --disable-gpgsm-test
+  )
+
   ./autogen.sh
+
+  mkdir -p _build-qt{5,6}
+
+  pushd "_build-qt5"
+  ../configure \
+    "${_common_options[@]}" \
+    --enable-languages=cpp,qt5
+  make
+  popd
+
+  pushd "_build-qt6"
+  ../configure \
+    "${_common_options[@]}" \
+    --enable-languages=cpp,qt6
+  make
+  popd
+
   ./configure \
-    --prefix="/usr" \
-    --disable-fd-passing \
-    --disable-gpgsm-test
+    "${_common_options[@]}" \
+    --enable-languages=python
   make
+  pushd "lang/python"
+  top_builddir="../.." \
+    python \
+      -m build \
+      --wheel \
+      --no-isolation
+  popd
 }
 
 check() {
   cd "gpgme"
 
-  make check
+  #make -C "_build-qt5" check
 }
 
 package_gpgme-git() {
-  depends=('glibc' 'gnupg' 'libgpg-error')
+  depends=('gcc-libs' 'gnupg' 'libgpg-error')
   provides=("gpgme=$pkgver" 'libgpgme.so' 'libgpgmepp.so')
   conflicts=('gpgme')
 
   cd "gpgme"
 
-  make DESTDIR="$pkgdir" install
+  make -C "_build-qt5" DESTDIR="$pkgdir" install
 
   # split packages
-  rm -r "$pkgdir/usr/include"/{qgpgme,QGpgME}
-  rm -r "$pkgdir/usr/lib"/{cmake/QGpgme/,libqgpgme.*,python*}
+  rm -r "$pkgdir/usr/lib"/{cmake/QGpgme,libqgpgme*}
 }
 
 package_python-gpgme-git() {
@@ -59,15 +88,33 @@ package_python-gpgme-git() {
   cd "gpgme/lang/python"
 
   make DESTDIR="$pkgdir" install
+  python \
+    -m installer \
+    --destdir="$pkgdir" \
+    dist/*.whl
 }
 
-package_qgpgme-git() {
-  pkgdesc="Qt bindings for GPGme"
-  depends=('qt5-base' 'gpgme-git')
-  provides=("qgpgme=$pkgver")
-  conflicts=('qgpgme')
+package_qgpgme-qt5-git() {
+  pkgdesc="Qt5 bindings for GPGme"
+  depends=('gcc-libs' 'gpgme-git' 'qt5-base')
+  provides=("qgpgme-qt5=$pkgver")
+  conflicts=('qgpgme-qt5')
 
-  cd "gpgme/lang/qt"
+  cd "gpgme"
 
-  make DESTDIR="$pkgdir" install
+  make -C "_build-qt5/lang/qt" DESTDIR="$pkgdir" install
+  rm -r "$pkgdir/usr/include"
+}
+
+package_qgpgme-qt6-git() {
+  pkgdesc="Qt6 bindings for GPGme"
+  depends=('gcc-libs' 'gpgme-git' 'qt6-base')
+  provides=("qgpgme-qt6=$pkgver" 'qgpgme')
+  conflicts=('qgpgme-qt6')
+  replaces=('qgpgme')
+
+  cd "gpgme"
+
+  make -C "_build-qt6/lang/qt" DESTDIR="$pkgdir" install
+  rm -r "$pkgdir/usr/include"
 }