Fix rebased kleo patch
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 22 Aug 2017 14:43:39 +0000 (16:43 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 22 Aug 2017 14:43:39 +0000 (16:43 +0200)
--

patches/kleopatra/lower-kf5-required.patch

index 88e2ef8..b9a3f0d 100755 (executable)
@@ -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)