From 0854544205c2937381718035f2d9f36dbb592115 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Sat, 27 Apr 2024 21:01:32 +0500 Subject: [PATCH] gpgme: update to 1.23.2. --- srcpkgs/gpgme-qt6 | 1 + srcpkgs/gpgme-qt6-devel | 1 + srcpkgs/gpgme/template | 76 +++++++++++++++++++++++++++++++++-------- srcpkgs/gpgmeqt-headers | 1 + 4 files changed, 65 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/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 " @@ -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