[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-284-gb86273a

[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  b86273ac4763e553525805e87036d371c89494df (commit)
      from  cb13a0ef87c20b9320d3e18e12e2e7d2f5a2c279 (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 b86273ac4763e553525805e87036d371c89494df
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 22 16:43:39 2017 +0200

    Fix rebased kleo patch
    
    --

diff --git a/patches/kleopatra/lower-kf5-required.patch b/patches/kleopatra/lower-kf5-required.patch
index 88e2ef8..b9a3f0d 100755
--- a/patches/kleopatra/lower-kf5-required.patch
+++ b/patches/kleopatra/lower-kf5-required.patch
@@ -3,13 +3,13 @@ patch -p1 -l -f $* < $0
 exit $?
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 82317fd..bed1a72 100644
+index 855a4aff..8d2767b8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -6,10 +6,10 @@ 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.
+ # Standalone build. Find / include everything necessary.
 -set(KF5_VERSION "5.37.0")
 -set(KMIME_VERSION "5.6.40")
 -set(LIBKLEO_VERSION "5.6.40")
@@ -17,7 +17,7 @@ index 82317fd..bed1a72 100644
 +set(KF5_VERSION "5.20.0")
 +set(KMIME_VERSION "5.2.40")
 +set(LIBKLEO_VERSION "5.4.40")
-+set(QT_REQUIRED_VERSION "5.6.0")
++set(QT_REQUIRED_VERSION "5.7.0")
  set(GPGME_REQUIRED_VERSION "1.8.0")
 
- find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
+ option(RUN_UNINSTALL "test run uninstalled apps (experimental)" FALSE)

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

Summary of changes:
 patches/kleopatra/lower-kf5-required.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


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