Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
gpgme
Commits:
c2eb6870 by Antonio Rojas at 2024-04-22T10:33:54+02:00
Drop no longer used Qt5 bindings
And stop having to build twice
- - - - -
2 changed files:
- .SRCINFO
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -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
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
# Contributor: Sarah Hay <sa...@archlinux.org>
pkgbase=gpgme
-pkgname=(gpgme qgpgme-qt5 qgpgme-qt6 python-gpgme)
+pkgname=(gpgme qgpgme-qt6 python-gpgme)
pkgver=1.23.2
pkgrel=3
pkgdesc='A C wrapper library for GnuPG'
@@ -18,7 +18,6 @@ makedepends=(
'python-installer'
'python-setuptools'
'python-wheel'
- 'qt5-base'
'qt6-base'
'swig'
)
@@ -33,9 +32,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() {
@@ -54,15 +50,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() {
@@ -85,27 +72,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
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gpgme/-/commit/c2eb68701c2263fd8b34709f04c7790eb927b8dd
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gpgme/-/commit/c2eb68701c2263fd8b34709f04c7790eb927b8dd
You're receiving this email because of your account on gitlab.archlinux.org.
