Update gpgol and gpg4win-tools to master
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 25 Oct 2018 11:00:42 +0000 (13:00 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 25 Oct 2018 11:00:42 +0000 (13:00 +0200)
--

Makefile.am
packages/packages.current
patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.patch [deleted file]

index 697af88..75e48b4 100644 (file)
@@ -32,7 +32,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
         patches/glib-2.41.5/01-socket.patch \
         patches/glib-2.41.5/02-formatsec.patch \
-        patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.patch \
         patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
         patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
         patches/kiconthemes/0001-Make-DBus-optional.patch \
index 56fe556..387b98a 100644 (file)
@@ -238,14 +238,14 @@ server http://files.gpg4win.org/src
 # last-changed: 2018-08-30
 # by: ah
 # verified: Sig 5B80 C575 4298 F0CB  55D8 ED6A BCEF 7E29 4B09 2E28
-file gpgol/gpgol-2.3.1.tar.bz2
-chk  2b2b4ef08fda8103cfbdcb3d988081d5d6c9ae6e8021bd2d237da1257efd5dc5
+#file gpgol/gpgol-2.3.1.tar.bz2
+#chk  2b2b4ef08fda8103cfbdcb3d988081d5d6c9ae6e8021bd2d237da1257efd5dc5
 
 # for beta
 server http://files.intevation.de/projects/gpg4all
 
-#file gpgol/gpgol-2.3.1-beta84.tar.bz2
-#chk  9de866f9f3255dd8df3b0d34d743f63816f86d3b61b41276069c8c38ace8101a
+file gpgol/gpgol-2.3.2-beta15.tar.bz2
+chk  0bc7edb65d952d2c21bf409d35d12945ce5b431b0f389501cc6e61e579fc91ff
 
 #
 # GpgEX
@@ -569,8 +569,8 @@ chk  d3c8e91f9c758e0d5505f7cae6d3908e606cb92103ac2900c021c6c418adfe2a
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file gpg4win-tools/gpg4win-tools-201810151610.tar.gz
-chk  09cba38db9f06d473f53aa59b4c5cf91e691fe263152d83fc599ba1c5dac3e5d
+file gpg4win-tools/gpg4win-tools-201810251247.tar.gz
+chk  c0e06af394ef203734034bbc1c2eeecdc8fdb70a978da34107f48cbf81b3d40b
 
 # Kleopatra
 # last changed: see package date.
diff --git a/patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.patch b/patches/gpgol-2.3.1/0001-Pass-lang-correctly-to-config-dialog.patch
deleted file mode 100755 (executable)
index d801ea8..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 50e65b8425e2dece5dc791269bc564168bf819e1 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Tue, 16 Oct 2018 14:14:29 +0200
-Subject: [PATCH] Pass lang correctly to config dialog
-
-* src/addin-options.cpp (open_gpgolconfig): Pass lang.
----
- src/addin-options.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/addin-options.cpp b/src/addin-options.cpp
-index d82b095..137d880 100644
---- a/src/addin-options.cpp
-+++ b/src/addin-options.cpp
-@@ -185,6 +185,9 @@ open_gpgolconfig (LPVOID arg)
-   args.push_back (std::string("--gpgol-version"));
-   args.push_back (std::string(VERSION));
-
-+  args.push_back (std::string ("--lang"));
-+  args.push_back (std::string (gettext_localename ()));
-+
-   auto ctx = GpgME::Context::createForEngine (GpgME::SpawnEngine);
-   if (!ctx)
-     {
---
-2.11.0