Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: qgpgme-qt6-1.23.2
@ 2024-04-27 16:12 Luciogi
  2024-04-30 18:16 ` [PR PATCH] [Updated] New package: gpgmeqt-qt6-1.23.2 Luciogi
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Luciogi @ 2024-04-27 16:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

There is a new pull request by Luciogi 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: qgpgme-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: 8982 bytes --]

From bcde6fbcd18169deea2dcff3f4080fdb1df68279 Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Thu, 14 Mar 2024 22:27:50 +0500
Subject: [PATCH 1/2] New package: qgpgme-qt6-1.23.2

---
 common/shlibs                                 |  1 +
 srcpkgs/gpgmeqt-qt6-devel                     |  1 +
 .../patches/cmake-crossbuild-support.patch    | 97 +++++++++++++++++++
 srcpkgs/gpgmeqt-qt6/template                  | 42 ++++++++
 4 files changed, 141 insertions(+)
 create mode 120000 srcpkgs/gpgmeqt-qt6-devel
 create mode 100644 srcpkgs/gpgmeqt-qt6/patches/cmake-crossbuild-support.patch
 create mode 100644 srcpkgs/gpgmeqt-qt6/template

diff --git a/common/shlibs b/common/shlibs
index 794290d3a2f77d..fa78ee1316f839 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -732,6 +732,7 @@ libassuan.so.0 libassuan-2.0.1_1
 libgpgme.so.11 libgpgme-1.12.0_2
 libgpgmepp.so.6 gpgmepp-1.7.0_3
 libqgpgme.so.15 gpgmeqt-1.18.0_1
+libqgpgmeqt6.so.15 qgpgme-qt6-1.23.1_1
 libgarcon-1.so.0 garcon-0.1.12_1
 libgarcon-gtk3-1.so.0 garcon-0.6.1_1
 libxfce4ui-2.so.0 libxfce4ui-4.18.0_1
diff --git a/srcpkgs/gpgmeqt-qt6-devel b/srcpkgs/gpgmeqt-qt6-devel
new file mode 120000
index 00000000000000..50b458113211fd
--- /dev/null
+++ b/srcpkgs/gpgmeqt-qt6-devel
@@ -0,0 +1 @@
+gpgmeqt-qt6
\ No newline at end of file
diff --git a/srcpkgs/gpgmeqt-qt6/patches/cmake-crossbuild-support.patch b/srcpkgs/gpgmeqt-qt6/patches/cmake-crossbuild-support.patch
new file mode 100644
index 00000000000000..328a13e5b640b0
--- /dev/null
+++ b/srcpkgs/gpgmeqt-qt6/patches/cmake-crossbuild-support.patch
@@ -0,0 +1,97 @@
+diff --git lang/cpp/src/GpgmeppConfig.cmake.in.in lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 73f5eaad..019de555 100644
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
+ unset(_targetsNotDefined)
+ unset(_expectedTargets)
+ 
++
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/Gpgmepp" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/Gpgmepp")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ # Create imported target Gpgmepp
+ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
+-  IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp@libsuffix@"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
++  INTERFACE_LINK_LIBRARIES "pthread;${_IMPORT_PREFIX}/lib/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libgpgmepp@libsuffix@"
+ )
+ 
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+   message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+ endif()
+ 
++# Cleanup temporary variables.
++set(_IMPORT_PREFIX)
++
+ # Loop over all imported files and verify that they actually exist
+ foreach(target ${_IMPORT_CHECK_TARGETS} )
+   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+diff --git lang/qt/src/QGpgmeConfig.cmake.in.in lang/qt/src/QGpgmeConfig.cmake.in.in
+index a17a19fd..29a6b87a 100644
+--- a/lang/qt/src/QGpgmeConfig.cmake.in.in
++++ b/lang/qt/src/QGpgmeConfig.cmake.in.in
+@@ -58,19 +58,41 @@ unset(_targetsDefined)
+ unset(_targetsNotDefined)
+ unset(_expectedTargets)
+ 
++
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++# Use original install prefix when loaded through a
++# cross-prefix symbolic link such as /lib -> /usr/lib.
++get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH)
++get_filename_component(_realOrig "/usr/lib/cmake/QGpgme" REALPATH)
++if(_realCurr STREQUAL _realOrig)
++  set(_IMPORT_PREFIX "/usr/lib/cmake/QGpgme")
++endif()
++unset(_realOrig)
++unset(_realCurr)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ # Create imported target QGpgme
+ add_library(QGpgme SHARED IMPORTED)
+ 
+ set_target_properties(QGpgme PROPERTIES
+-  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
++  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
+   INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
+-  IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
++  IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/libqgpgme@libsuffix@"
+ )
+ 
+ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+   message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+ endif()
+ 
++# Cleanup temporary variables.
++set(_IMPORT_PREFIX)
++
+ # Loop over all imported files and verify that they actually exist
+ foreach(target ${_IMPORT_CHECK_TARGETS} )
+   foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
diff --git a/srcpkgs/gpgmeqt-qt6/template b/srcpkgs/gpgmeqt-qt6/template
new file mode 100644
index 00000000000000..b43684a08610c1
--- /dev/null
+++ b/srcpkgs/gpgmeqt-qt6/template
@@ -0,0 +1,42 @@
+# Template file for 'gpgmeqt-qt6'
+# XXX: sync version with gpgme
+pkgname=gpgmeqt-qt6
+version=1.23.2
+revision=1
+build_style=gnu-configure
+configure_args="--enable-fd-passing
+ --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr
+ --with-libassuan-prefix=$XBPS_CROSS_BASE/usr
+ --enable-languages=qt6,cpp"
+hostmakedepends="gnupg pkg-config qt6-base qt6-tools swig"
+makedepends="libassuan-devel qt6-base-devel"
+checkdepends="which gnupg"
+short_desc="GnuPG Made Easy - Qt6 bindings"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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=9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
+
+CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" ac_cv_sys_file_offset_bits=no"
+elif [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+	CXXFLAGS+=" ${CFLAGS}"
+fi
+
+post_install() {
+	rm -r "${DESTDIR}"/usr/lib/{pkgconfig,cmake/Gpgmepp,libgpgme.*,libgpgmepp.*}
+	rm -r "${DESTDIR}"/usr/{include,bin,share}
+}
+gpgmeqt-qt6-devel_package() {
+	depends="gpgme-devel>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 2ba2a9875d256d489b7b42f0aead969841de708b Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 27 Apr 2024 21:01:32 +0500
Subject: [PATCH 2/2] gpgme: update to 1.23.2.

---
 srcpkgs/gpgme/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template
index f86f0a1ff32732..2dab919767a80e 100644
--- a/srcpkgs/gpgme/template
+++ b/srcpkgs/gpgme/template
@@ -1,7 +1,7 @@
 # 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
@@ -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"
 
@@ -78,7 +78,7 @@ gpgmepp-devel_package() {
 }
 
 gpgmeqt_package() {
-	short_desc+=" - Qt binding"
+	short_desc+=" - Qt5 binding"
 	pkg_install() {
 		vmove "usr/lib/libqgpgme.so.*"
 	}
@@ -86,7 +86,7 @@ gpgmeqt_package() {
 
 gpgmeqt-devel_package() {
 	depends="gpgme-devel>=${version}_${revision} gpgmeqt>=${version}_${revision}"
-	short_desc+=" - Qt binding development files"
+	short_desc+=" - Qt5 binding development files"
 	pkg_install() {
 		vmove usr/include/QGpgME
 		vmove usr/include/qgpgme

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-05-01 13:38 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2024-05-01 13:13 ` sgn
2024-05-01 13:38 ` [PR PATCH] [Merged]: " sgn

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).