Pedro Monreal Gonzalez
b531427812
- 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
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From d23528cadf4284f508bc4ba05e1b5c14b46bd354 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
|
|
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 <mail@eworm.de>
|
|
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
|
|
|