diff --git a/util/crypt/gpgme/files/0001-qt-tests-Fix-build-in-source-directory.patch b/util/crypt/gpgme/files/0001-qt-tests-Fix-build-in-source-directory.patch new file mode 100644 index 0000000000..a327a0da9e --- /dev/null +++ b/util/crypt/gpgme/files/0001-qt-tests-Fix-build-in-source-directory.patch @@ -0,0 +1,37 @@ +From d23528cadf4284f508bc4ba05e1b5c14b46bd354 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= +Date: Mon, 21 Aug 2023 21:08:01 +0200 +Subject: qt,tests: Fix build in source directory + +* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources +before C++ binding sources and C sources. +-- + +This fixes the problem that the debug.h in the C sources was found +before the one in the Qt bindings. + +GnuPG-bug-id: 6673 +--- + lang/qt/tests/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am +index 32ad6466..aedd3264 100644 +--- a/lang/qt/tests/Makefile.am ++++ b/lang/qt/tests/Makefile.am +@@ -51,10 +51,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \ + ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \ + @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++ -I$(top_builddir)/src \ + @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \ +- -I$(top_srcdir)/lang/qt/src \ + -DTOP_SRCDIR="$(top_srcdir)" + endif + if WANT_QT6 +-- +2.42.0 + diff --git a/util/crypt/gpgme/files/0002-qt-tests-Fix-build-in-source-directory-part-2.patch b/util/crypt/gpgme/files/0002-qt-tests-Fix-build-in-source-directory-part-2.patch new file mode 100644 index 0000000000..edf944e69a --- /dev/null +++ b/util/crypt/gpgme/files/0002-qt-tests-Fix-build-in-source-directory-part-2.patch @@ -0,0 +1,37 @@ +From 2d570b3f80b306ccdbc49b4a8e71c4945486fd1c Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 21 Aug 2023 23:53:47 +0200 +Subject: [PATCH 1/1] qt,tests: Fix build in source directory, part 2 + +* lang/qt/tests/Makefile.am (AM_CPPFLAGS): Include Qt binding sources +before C++ binding sources and C sources. + +This fixes the problem that the debug.h in the C sources was found +before the one in the Qt bindings. + +Commit d23528cadf4284f508bc4ba05e1b5c14b46bd354 fixed it for Qt5, we +need Qt6 as well. +--- + lang/qt/tests/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am +index aedd3264..615daf6d 100644 +--- a/lang/qt/tests/Makefile.am ++++ b/lang/qt/tests/Makefile.am +@@ -62,10 +62,10 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \ + ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \ + @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++ -I$(top_builddir)/src \ + @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \ +- -I$(top_srcdir)/lang/qt/src \ + -DTOP_SRCDIR="$(top_srcdir)" + endif + +-- +2.42.0 + diff --git a/util/crypt/gpgme/pspec.xml b/util/crypt/gpgme/pspec.xml index 8424912c0a..7dad1ef13f 100644 --- a/util/crypt/gpgme/pspec.xml +++ b/util/crypt/gpgme/pspec.xml @@ -13,7 +13,7 @@ library GnuPG Made Easy is a library for making GnuPG easier to use GPGME is a library designed to make access to GnuPG easier for applications. It provides a high-Level Crypto application programming interface (API) for encryption, decryption, signing, signature verification and key management. - https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.20.0.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.22.0.tar.bz2 swig gnupg @@ -25,7 +25,8 @@ libgpg-error-devel - + 0001-qt-tests-Fix-build-in-source-directory.patch + 0002-qt-tests-Fix-build-in-source-directory-part-2.patch @@ -120,6 +121,13 @@ + + 2023-08-23 + 1.22.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2023-04-21 1.20.0