Update Kleopatra to latest master master
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 5 Sep 2016 16:17:56 +0000 (18:17 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 5 Sep 2016 16:17:56 +0000 (18:17 +0200)
* packages/packages.current (klepatra): Update
* patches/kleopatra/fix-paperkey.patch: Removed. Upstream.
* Makefile.am (EXTRA_DIST): Remove patch.

Makefile.am
packages/packages.current
patches/kleopatra/fix-paperkey.patch [deleted file]

index 3c55fe4..e4869f6 100644 (file)
@@ -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 \
index 46267cf..5c4757b 100644 (file)
@@ -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 (executable)
index c7cdc2a..0000000
+++ /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;
- }