[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-187-g97c78ee

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  97c78ee9948012e26084e358f4c17fecdf6c9554 (commit)
      from  5fb12d33cc529d9ce02f54938528b8e693be6bc5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 97c78ee9948012e26084e358f4c17fecdf6c9554
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 5 18:17:56 2016 +0200

    Update Kleopatra to latest master
    
    * packages/packages.current (klepatra): Update
    * patches/kleopatra/fix-paperkey.patch: Removed. Upstream.
    * Makefile.am (EXTRA_DIST): Remove patch.

diff --git a/Makefile.am b/Makefile.am
index 3c55fe4..e4869f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/qtsvg/qtsvg-link-zlib.patch \
         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/fix-paperkey.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 \
         patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
diff --git a/packages/packages.current b/packages/packages.current
index 46267cf..5c4757b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -558,5 +558,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201608111605.tar.gz
-chk c095e7a551a8923291def9da497dc0cedb04300d30cc475eecb9cb0db81e492d
+file kleopatra/kleopatra-201609051810.tar.gz
+chk 73498bcbc40ffb3e3a4f0998a178c94480e4de78380b0992e3811aa335e4067f
diff --git a/patches/kleopatra/fix-paperkey.patch b/patches/kleopatra/fix-paperkey.patch
deleted file mode 100755
index c7cdc2a..0000000
--- a/patches/kleopatra/fix-paperkey.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/src/utils/gnupg-helper.cpp b/src/utils/gnupg-helper.cpp
-index 7933606..ca85814 100644
---- a/src/utils/gnupg-helper.cpp
-+++ b/src/utils/gnupg-helper.cpp
-@@ -229,6 +229,8 @@ bool Kleo::engineIsVersion(int major, int minor, int patch, Engine engine)
-
- const QString& Kleo::paperKeyInstallPath()
- {
--    static const QString pkPath = QStandardPaths::findExecutable("paperkey");
-+    static const QString pkPath = QStandardPaths::findExecutable("paperkey", QStringList() << QCoreApplication::applicationDirPath()).isEmpty() ?
-+                                  QStandardPaths::findExecutable("paperkey") :
-+                                  QStandardPaths::findExecutable("paperkey", QStringList() << QCoreApplication::applicationDirPath());
-     return pkPath;
- }

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                          |  1 -
 packages/packages.current            |  4 ++--
 patches/kleopatra/fix-paperkey.patch | 18 ------------------
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100755 patches/kleopatra/fix-paperkey.patch


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org