From b531427812727d1340dd534bfd34d53db02f497d1abee7b5b32596340034cc71 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 22 Aug 2023 12:20:40 +0000 Subject: [PATCH] Accepting request 1105236 from home:pmonrealgonzalez:branches:Base:System - Fix builds with qt and qt6 [T6673]: * qt,tests: Fix build in source directory. 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. * build: Suggest out-of-source build. Suggest to run configure from a build subdirectory. * Add patches: - gpgme-qt-tests-Fix-build-in-source-directory.patch - gpgme-build-Suggest-out-of-source-build.patch - Update to 1.22.0: * Prevent wrong plaintext when verifying clearsigned signature. * Return bad data error instead of general error on unexpected data. * Take care of offline mode for all operations of gpgsm engine. * Prepare the use of the forthcoming libassuan version 3. * New configure option --with-libtool-modification. * cpp: Expose gpgme_decrypt_result_t.is_mime. * qt: Clean up after failure or cancel of sign/encrypt archive operation. * qt: Add setInputEncoding to QGpgMe::EncryptJob. * qt: Make toLogString helper public. * Interface changes relative to the 1.21.0 release: - qt: EncryptJob::setInputEncoding NEW. - qt: DecryptionResult::isMime NEW. - qt: toLogString NEW. OBS-URL: https://build.opensuse.org/request/show/1105236 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=156 --- gpgme-1.21.0.tar.bz2 | 3 - gpgme-1.21.0.tar.bz2.sig | Bin 119 -> 0 bytes gpgme-1.22.0.tar.bz2 | 3 + gpgme-1.22.0.tar.bz2.sig | Bin 0 -> 119 bytes gpgme-build-Suggest-out-of-source-build.patch | 27 +++++++ ...-tests-Fix-build-in-source-directory.patch | 71 ++++++++++++++++++ gpgme.changes | 32 ++++++++ gpgme.spec | 5 +- 8 files changed, 137 insertions(+), 4 deletions(-) delete mode 100644 gpgme-1.21.0.tar.bz2 delete mode 100644 gpgme-1.21.0.tar.bz2.sig create mode 100644 gpgme-1.22.0.tar.bz2 create mode 100644 gpgme-1.22.0.tar.bz2.sig create mode 100644 gpgme-build-Suggest-out-of-source-build.patch create mode 100644 gpgme-qt-tests-Fix-build-in-source-directory.patch diff --git a/gpgme-1.21.0.tar.bz2 b/gpgme-1.21.0.tar.bz2 deleted file mode 100644 index ecc414a..0000000 --- a/gpgme-1.21.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 -size 1830113 diff --git a/gpgme-1.21.0.tar.bz2.sig b/gpgme-1.21.0.tar.bz2.sig deleted file mode 100644 index 894512583ab69f2bf7cc97e33edc653cd9ceb797ae8858aa7a77094a36db3ce5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGV2~A4WXWBXm$E!p!y#PSlPRcU`VKV*t6Qv0Da-%4F>rATz(f>S7#Yr; zi`pk3Z8q(W`-7{o$&NhVbESONPq?EzL$;QA1IP1DMuuyq3pA@8uB#XG-Z&=3)pGOc Urv$G6^^vXi<8-IM>EYUn6<-G@};;8k?l}l&$PTtWo|K9#f(ewVE T@IE8HMB;}%t4`}LJ2PGY3Lh|) literal 0 HcmV?d00001 diff --git a/gpgme-build-Suggest-out-of-source-build.patch b/gpgme-build-Suggest-out-of-source-build.patch new file mode 100644 index 0000000..04b5657 --- /dev/null +++ b/gpgme-build-Suggest-out-of-source-build.patch @@ -0,0 +1,27 @@ +From 24a8c279da98fe7e586a9fc3cd91175c9e60ffef Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= +Date: Mon, 21 Aug 2023 21:32:40 +0200 +Subject: build: Suggest out-of-source build + +* autogen.rc (final_info): Suggest to run configure from a build +subdirectory. +-- + +We recommend out-of-source builds. The suggestion what to do next shown +by autogen.sh should reflect this. + +GnuPG-bug-id: 6673 + +diff --git a/autogen.rc b/autogen.rc +index 1759ef93..6d6ea93f 100644 +--- a/autogen.rc ++++ b/autogen.rc +@@ -11,4 +11,4 @@ case "$myhost" in + esac + + +-final_info="./configure --enable-maintainer-mode && make" ++final_info="mkdir build && cd build && ../configure --enable-maintainer-mode && make" +-- +2.41.0 + diff --git a/gpgme-qt-tests-Fix-build-in-source-directory.patch b/gpgme-qt-tests-Fix-build-in-source-directory.patch new file mode 100644 index 0000000..2d32325 --- /dev/null +++ b/gpgme-qt-tests-Fix-build-in-source-directory.patch @@ -0,0 +1,71 @@ +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 + +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.41.0 + +From aee18a2ab2498bc6092bef518c532796bbe5b502 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Tue, 22 Aug 2023 00:12:05 +0200 +Subject: 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. + +GnuPG-bug-id: 6673 + +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.41.0 + diff --git a/gpgme.changes b/gpgme.changes index 7fbd2ae..ae926da 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Aug 22 08:31:50 UTC 2023 - Pedro Monreal + +- Fix builds with qt and qt6 [T6673]: + * qt,tests: Fix build in source directory. 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. + * build: Suggest out-of-source build. Suggest to run configure + from a build subdirectory. + * Add patches: + - gpgme-qt-tests-Fix-build-in-source-directory.patch + - gpgme-build-Suggest-out-of-source-build.patch + +------------------------------------------------------------------- +Tue Aug 22 08:16:40 UTC 2023 - Pedro Monreal + +- Update to 1.22.0: + * Prevent wrong plaintext when verifying clearsigned signature. + * Return bad data error instead of general error on unexpected data. + * Take care of offline mode for all operations of gpgsm engine. + * Prepare the use of the forthcoming libassuan version 3. + * New configure option --with-libtool-modification. + * cpp: Expose gpgme_decrypt_result_t.is_mime. + * qt: Clean up after failure or cancel of sign/encrypt archive operation. + * qt: Add setInputEncoding to QGpgMe::EncryptJob. + * qt: Make toLogString helper public. + * Interface changes relative to the 1.21.0 release: + - qt: EncryptJob::setInputEncoding NEW. + - qt: DecryptionResult::isMime NEW. + - qt: toLogString NEW. + ------------------------------------------------------------------- Thu Aug 3 11:27:50 UTC 2023 - Andreas Schwab diff --git a/gpgme.spec b/gpgme.spec index a7b4ca2..0ce854c 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -33,7 +33,7 @@ %bcond_without qt6 %endif Name: gpgme%{psuffix} -Version: 1.21.0 +Version: 1.22.0 Release: 0 Summary: Programmatic library interface to GnuPG License: GPL-3.0-or-later AND LGPL-2.1-or-later @@ -50,6 +50,9 @@ Source99: gpgme.changes Patch1: gpgme-D545-python310.patch # PATCH-FIX-OPENSUSE gpgme-suse-nobetasuffix.patch code@bnavigator.de -- remove "-unknown" betasuffix boo#1205197 Patch2: gpgme-suse-nobetasuffix.patch +# PATCH-FIX-UPSTREAM Fix building with qt +Patch3: gpgme-qt-tests-Fix-build-in-source-directory.patch +Patch4: gpgme-build-Suggest-out-of-source-build.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++