[packages/gpgme] up to 1.23.0

[atler]

commit e082db1038bc239cb59b34fafc288ce90768caa5
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Oct 25 21:42:23 2023 +0200

    up to 1.23.0

 gpgme-largefile.patch | 12 ++++++------
 gpgme-qt-tests.patch  | 27 ---------------------------
 gpgme.spec            |  6 ++----
 3 files changed, 8 insertions(+), 37 deletions(-)
---
diff --git a/gpgme.spec b/gpgme.spec
index 64d68db..0451c15 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -24,19 +24,18 @@
 Summary:	Library for accessing GnuPG
 Summary(pl.UTF-8):	Biblioteka dająca dostęp do funkcji GnuPG
 Name:		gpgme
-Version:	1.22.0
+Version:	1.23.0
 Release:	1
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-# Source0-md5:	828b8a1f9992826d7ad43741b349db01
+# Source0-md5:	e64d32e248b353314d2c3781d5ba0e06
 Patch0:		%{name}-info.patch
 Patch1:		orig-version.patch
 Patch2:		%{name}-largefile.patch
 Patch3:		%{name}-python.patch
 Patch4:		0001-fix-stupid-ax_python_devel.patch
-Patch5:		%{name}-qt-tests.patch
 URL:		http://www.gnupg.org/gpgme.html
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.14
@@ -292,7 +291,6 @@ PyME to interfejs Pythona do biblioteki GPGME.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__libtoolize}
diff --git a/gpgme-largefile.patch b/gpgme-largefile.patch
index 11761d0..bdf6d59 100644
--- a/gpgme-largefile.patch
+++ b/gpgme-largefile.patch
@@ -100,20 +100,20 @@
 --- gpgme-1.7.0/lang/qt/tests/Makefile.am.orig	2016-09-20 19:09:38.000000000 +0200
 +++ gpgme-1.7.0/lang/qt/tests/Makefile.am	2016-10-08 09:37:15.642004112 +0200
 @@ -53,7 +53,7 @@
- 
- 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 \
 +              @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \
-               -I$(top_srcdir)/lang/qt/src \
                -DTOP_SRCDIR="$(top_srcdir)"
  endif
+ if WANT_QT6
 @@ -64,7 +64,7 @@
- 
- 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 \
 +              @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \
-               -I$(top_srcdir)/lang/qt/src \
                -DTOP_SRCDIR="$(top_srcdir)"
  endif
+ 
diff --git a/gpgme-qt-tests.patch b/gpgme-qt-tests.patch
deleted file mode 100644
index 80de01e..0000000
--- a/gpgme-qt-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-qt tests want debug.h from lang/qt/src, not the one from src
---- gpgme-1.22.0/lang/qt/tests/Makefile.am.orig	2023-10-20 19:20:27.323100921 +0200
-+++ gpgme-1.22.0/lang/qt/tests/Makefile.am	2023-10-20 20:01:44.799679279 +0200
-@@ -51,10 +51,9 @@ LDADD = ../../cpp/src/libgpgmepp.la ../s
-         ../../../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@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \
--              -I$(top_srcdir)/lang/qt/src \
-               -DTOP_SRCDIR="$(top_srcdir)"
- endif
- if WANT_QT6
-@@ -62,10 +61,9 @@ LDADD = ../../cpp/src/libgpgmepp.la ../s
-         ../../../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@ @FILE_OFFSET_BITS_CPPFLAGS@ -DBUILDING_QGPGME \
--              -I$(top_srcdir)/lang/qt/src \
-               -DTOP_SRCDIR="$(top_srcdir)"
- endif
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpgme.git/commitdiff/e082db1038bc239cb59b34fafc288ce90768caa5