[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-156-g525086e

[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  525086e05d425715ca85aa519a23abda629fd4b9 (commit)
      from  655a0f491b51cd34a1e7f63799d44931771f205b (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 525086e05d425715ca85aa519a23abda629fd4b9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jun 21 15:36:58 2016 +0200

    Reduce gpgmepp frameworks version dependency
    
    --
    This is a quick workaround to fix the build. Frameworks should
    be updated.

diff --git a/Makefile.am b/Makefile.am
index 9a2e80a..0fa7a12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,9 @@ 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/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch
+        patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
+        patches/drop-version-dep.patch
+
 
 copy-news:
 	cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgmepp/drop-version-dep.patch b/patches/gpgmepp/drop-version-dep.patch
new file mode 100755
index 0000000..6d373f2
--- /dev/null
+++ b/patches/gpgmepp/drop-version-dep.patch
@@ -0,0 +1,16 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 613c6fe..f9a045f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
+ project(Gpgmepp)
+
+ # ECM setup
+-set(KF5_VERSION "5.22.0")
++set(KF5_VERSION "5.20.0")
+ find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
+ set(CMAKE_MODULE_PATH ${Gpgmepp_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})

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

Summary of changes:
 Makefile.am                            |  4 +++-
 patches/gpgmepp/drop-version-dep.patch | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100755 patches/gpgmepp/drop-version-dep.patch


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