[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-206-gd7a3586

[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  d7a3586fb286d507996b29e055b8356b2a02ef39 (commit)
      from  639fe70adb66aac28e5de38c4f9e22f2d5a3b240 (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 d7a3586fb286d507996b29e055b8356b2a02ef39
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jan 17 13:34:48 2017 +0100

    Add kf5 version requirement patch to kleo
    
    * Makefile.am (EXTRA_DIST): Update accordingly.
    * patches/kleopatra/lower-kf5-required.patch: New.

diff --git a/Makefile.am b/Makefile.am
index d7fa075..3bac8b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,6 +49,7 @@ 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/lower-kf5-required.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/libkleo/lower-kf5-required.patch \
diff --git a/patches/kleopatra/lower-kf5-required.patch b/patches/kleopatra/lower-kf5-required.patch
new file mode 100755
index 0000000..9b8fe99
--- /dev/null
+++ b/patches/kleopatra/lower-kf5-required.patch
@@ -0,0 +1,18 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7223ab9..754088c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,8 +6,8 @@ option(FORCE_DISABLE_KCMUTILS "Force building Kleopatra without KCMUtils. Doing
+ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
+
+ # Standalone build. Find / include everything neccessary.
+-set(KF5_VERSION "5.28.0")
+-set(KMIME_VERSION "5.4.40")
++set(KF5_VERSION "5.25.0")
++set(KMIME_VERSION "5.2")
+ set(LIBKLEO_VERSION "5.4.40")
+ set(QT_REQUIRED_VERSION "5.5.0")

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

Summary of changes:
 Makefile.am                                |  1 +
 patches/kleopatra/lower-kf5-required.patch | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100755 patches/kleopatra/lower-kf5-required.patch


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