From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: gpgme-qt6-1.23.2
Date: Wed, 01 May 2024 14:03:50 +0200 [thread overview]
Message-ID: <20240501120350.2F28722229@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-50058@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/Luciogi/void-packages gpgme-qt6
https://github.com/void-linux/void-packages/pull/50058
New package: gpgme-qt6-1.23.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/50058.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gpgme-qt6-50058.patch --]
[-- Type: text/x-diff, Size: 4805 bytes --]
From 0854544205c2937381718035f2d9f36dbb592115 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
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 +++++++++++++++++++++++++++++++++--------
| 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 <orphan@voidlinux.org>"
@@ -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"
--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
next prev parent reply other threads:[~2024-05-01 12:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-27 16:12 [PR PATCH] New package: qgpgme-qt6-1.23.2 Luciogi
2024-04-30 18:16 ` [PR PATCH] [Updated] New package: gpgmeqt-qt6-1.23.2 Luciogi
2024-04-30 18:38 ` Luciogi
2024-05-01 7:52 ` Luciogi
2024-05-01 8:17 ` Luciogi
2024-05-01 10:06 ` Luciogi
2024-05-01 11:34 ` sgn
2024-05-01 11:36 ` sgn
2024-05-01 11:52 ` New package: gpgme-qt6-1.23.2 Luciogi
2024-05-01 12:01 ` [PR PATCH] [Updated] " sgn
2024-05-01 12:03 ` sgn [this message]
2024-05-01 13:13 ` sgn
2024-05-01 13:38 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240501120350.2F28722229@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).