pool/gpgme
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1105236 from home:pmonrealgonzalez:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Pedro Monreal Gonzalez 2023-08-22 12:20:40 +00:00 committed by Git OBS Bridge
parent dfb45d7a71
commit b531427812
8 changed files with 137 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpgme-1.21.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88
size 1830113

BIN
gpgme-1.21.0.tar.bz2.sig
View File

Binary file not shown.

3
gpgme-1.22.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71
size 1717836

BIN
gpgme-1.22.0.tar.bz2.sig Normal file
View File

Binary file not shown.

27
gpgme-build-Suggest-out-of-source-build.patch Normal file
View File

@ -0,0 +1,27 @@
From 24a8c279da98fe7e586a9fc3cd91175c9e60ffef 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: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

71
gpgme-qt-tests-Fix-build-in-source-directory.patch Normal file
View File

@ -0,0 +1,71 @@
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

32
gpgme.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Tue Aug 22 08:31:50 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
- 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 <pmonreal@suse.com>
- 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 <schwab@suse.de>

5
gpgme.spec
View File

@ -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++