Add kf5 version requirement patch to kleo master
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 17 Jan 2017 12:34:48 +0000 (13:34 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 17 Jan 2017 12:34:48 +0000 (13:34 +0100)
* Makefile.am (EXTRA_DIST): Update accordingly.
* patches/kleopatra/lower-kf5-required.patch: New.

Makefile.am
patches/kleopatra/lower-kf5-required.patch [new file with mode: 0755]

index d7fa075..3bac8b7 100644 (file)
@@ -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 (executable)
index 0000000..9b8fe99
--- /dev/null
@@ -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")