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

- Update to 1.23.0:
  * Support GPGME_ENCRYPT_ALWAYS_TRUST also for S/MIME. [T6559]
  * New keylist mode GPGME_KEYLIST_MODE_WITH_V5FPR. [T6705]
  * New key capability flags has_*. [T6748]
  * gpgme-tool: Support use of Windows HANDLE. [T6634]
  * qt: Support refreshing keys via WKD. [T6672]
  * qt: Handle cancel in changeexpiryjob. [T6754]
  * Remove patches fixed upstream:
    - gpgme-qt-tests-Fix-build-in-source-directory.patch
    - gpgme-build-Suggest-out-of-source-build.patch

OBS-URL: https://build.opensuse.org/request/show/1120231
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=160
This commit is contained in:
Pedro Monreal Gonzalez 2023-10-25 11:51:29 +00:00 committed by Git OBS Bridge
parent 3a72affd19
commit 7ec013f06f
8 changed files with 18 additions and 105 deletions

View File

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

Binary file not shown.

BIN
gpgme-1.23.0.tar.bz2 (Stored with Git LFS) Normal file

Binary file not shown.

BIN
gpgme-1.23.0.tar.bz2.sig Normal file

Binary file not shown.

View File

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

View File

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

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Oct 25 10:56:48 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
- Update to 1.23.0:
* Support GPGME_ENCRYPT_ALWAYS_TRUST also for S/MIME. [T6559]
* New keylist mode GPGME_KEYLIST_MODE_WITH_V5FPR. [T6705]
* New key capability flags has_*. [T6748]
* gpgme-tool: Support use of Windows HANDLE. [T6634]
* qt: Support refreshing keys via WKD. [T6672]
* qt: Handle cancel in changeexpiryjob. [T6754]
* Remove patches fixed upstream:
- gpgme-qt-tests-Fix-build-in-source-directory.patch
- gpgme-build-Suggest-out-of-source-build.patch
-------------------------------------------------------------------
Sat Sep 23 23:26:53 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -33,7 +33,7 @@
%bcond_without qt6
%endif
Name: gpgme%{psuffix}
Version: 1.22.0
Version: 1.23.0
Release: 0
Summary: Programmatic library interface to GnuPG
License: GPL-3.0-or-later AND LGPL-2.1-or-later
@ -50,9 +50,6 @@ 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++