Update gpgme and remove obsolete patches
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 4 Sep 2017 09:33:23 +0000 (11:33 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 4 Sep 2017 09:33:23 +0000 (11:33 +0200)
* packages/packages.current (gpgme): Update to latest master.
* patches/kleopatra/relax-gpgme-checks.patch: Obsolete
* patches/gpgme-1.9.0: Patches applied upstream.
* Makefile.am (EXTRA_DIST): Update accordingly.

Makefile.am
packages/packages.current
patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch [deleted file]
patches/kleopatra/relax-gpgme-checks.patch [deleted file]

index 3901b8d..ea62e46 100644 (file)
@@ -39,7 +39,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/w32pth-2.0.5/workaround-broken-libtool.patch \
         patches/qttools/disable-most-tools.patch \
         patches/ki18n/no-tests.patch \
-        patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch \
         patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
         patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
         patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
@@ -49,7 +48,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
         patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
         patches/kleopatra/lower-kf5-required.patch \
-        patches/kleopatra/relax-gpgme-checks.patch \
         patches/kleopatra/fix-qt5.6-build.patch \
         patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
         patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
index 8af4e2f..4b524d1 100644 (file)
@@ -531,8 +531,8 @@ file gpgex/gpgex-1.0.5-beta8.tar.bz2
 chk  518957d7d0203e6e29877b103ac76d0af5fe0b8c0b949e7f072cc3f554c927b8
 
 # by: ah
-file gpgme/gpgme-1.9.1-beta57.tar.bz2
-chk  524899103529d0feb163bbbf7567c6c46f4d1c2a9c6c87f9a36def9062e00148
+file gpgme/gpgme-1.10.0-beta75.tar.bz2
+chk  1aecd6b22507f6b0c27afe6dc6f6d3fa4c813bbaef46199a9e4ac7f7359aef89
 
 # Libkleo
 # last changed: see package date.
diff --git a/patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch b/patches/gpgme-1.9.0/0001-core-Don-t-split-gpgconf-strings-on-comma.patch
deleted file mode 100755 (executable)
index 2520ddd..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-
-From d86b8b46b4f484f5bc26652f01c9332ce401d1eb Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Wed, 5 Apr 2017 18:23:48 +0200
-Subject: [PATCH] core: Don't split gpgconf strings on comma
-
-* src/engine-gpgconf.c (gpgconf_parse_option): Don't split
-strings on comma.
-
---
-This only affects values where the main type is string. Values
-with the alt_type string but another main type are still split
-to keep lists (e.g. groups) working.
----
- src/engine-gpgconf.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
-index 6f7c8ac..af5f110 100644
---- a/src/engine-gpgconf.c
-+++ b/src/engine-gpgconf.c
-@@ -399,7 +399,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
-                     gpgme_conf_arg_t *arg_p, char *line)
- {
-   gpgme_error_t err;
--  char *mark;
-+  char *mark = NULL;
-
-   if (!line[0])
-     return 0;
-@@ -408,7 +408,8 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
-     {
-       gpgme_conf_arg_t arg;
-
--      mark = strchr (line, ',');
-+      if (opt->type != GPGME_CONF_STRING)
-+        mark = strchr (line, ',');
-       if (mark)
-       *mark = '\0';
-
---
-2.1.4
diff --git a/patches/kleopatra/relax-gpgme-checks.patch b/patches/kleopatra/relax-gpgme-checks.patch
deleted file mode 100755 (executable)
index 605cd93..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/src/commands/keytocardcommand.cpp b/src/commands/keytocardcommand.cpp
-index 7fedf50..464c2a0 100644
---- a/src/commands/keytocardcommand.cpp
-+++ b/src/commands/keytocardcommand.cpp
-@@ -48,7 +48,7 @@
- #include <cassert>
-
- #include <gpgme++/gpgmepp_version.h>
--#if GPGMEPP_VERSION > 0x10801
-+#if GPGMEPP_VERSION > 0x10800
- # define GPGME_SUBKEY_HAS_KEYGRIP
- #endif
-
-diff --git a/src/view/pgpcardwidget.cpp b/src/view/pgpcardwidget.cpp
-index 4d04f20..3a69744 100644
---- a/src/view/pgpcardwidget.cpp
-+++ b/src/view/pgpcardwidget.cpp
-@@ -63,7 +63,7 @@
- #include <QGpgME/DataProvider>
-
-
--#if GPGMEPP_VERSION > 0x10801 // 1.8.1
-+#if GPGMEPP_VERSION > 0x10800 // 1.8.1
- // TODO remove ifdef once > 1.8.1 is required
- #include <gpgme++/gpggencardkeyinteractor.h>
- # define GPGME_CAN_GENCARDKEY