Move lowering of required KF5 versions to mk-file
authorJochen Saalfeld <privat@jochen-saalfeld.de>
Wed, 13 Sep 2017 09:54:27 +0000 (11:54 +0200)
committerJochen Saalfeld <privat@jochen-saalfeld.de>
Wed, 13 Sep 2017 09:54:27 +0000 (11:54 +0200)
* Makefile.am: Delete referenced patches
* patches/kleopatra/lower-kf5-required.patch: obsolete
* patches/libkleo/lower-kf5-required.patch: obsolete
* src/gpg4win.mk.in: Replaced the required versions
   for KF5, KMIME, LIBKLEO and GPGME with fixed
   values, so manual patching will be obsolete

Makefile.am
patches/kleopatra/lower-kf5-required.patch [deleted file]
patches/libkleo/lower-kf5-required.patch [deleted file]
src/gpg4win.mk.in

index ea62e46..2e18138 100644 (file)
@@ -47,11 +47,9 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/kiconthemes/0001-Make-DBus-optional.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/kleopatra/fix-qt5.6-build.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 \
         patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
         patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
         patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.patch
diff --git a/patches/kleopatra/lower-kf5-required.patch b/patches/kleopatra/lower-kf5-required.patch
deleted file mode 100755 (executable)
index b9a3f0d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-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 necessary.
--set(KF5_VERSION "5.37.0")
--set(KMIME_VERSION "5.6.40")
--set(LIBKLEO_VERSION "5.6.40")
--set(QT_REQUIRED_VERSION "5.8.0")
-+set(KF5_VERSION "5.20.0")
-+set(KMIME_VERSION "5.2.40")
-+set(LIBKLEO_VERSION "5.4.40")
-+set(QT_REQUIRED_VERSION "5.7.0")
- set(GPGME_REQUIRED_VERSION "1.8.0")
-
- option(RUN_UNINSTALL "test run uninstalled apps (experimental)" FALSE)
diff --git a/patches/libkleo/lower-kf5-required.patch b/patches/libkleo/lower-kf5-required.patch
deleted file mode 100755 (executable)
index bea30a7..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /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
-@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
-
- project(libkleo)
-
--set(KF5_VERSION "5.35.0")
-+set(KF5_VERSION "5.25.0")
- find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- set(LIBRARY_NAMELINK)
index 2cd8c7e..c8c71e7 100644 (file)
@@ -639,6 +639,12 @@ stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
 stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
        (shopt -s nullglob;                             \
         $(call SETVARS,$(1));                          \
+        cd "$$$${pkgsdir}";                            \
+        sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.30.0")/' CMakeLists.txt; \
+        sed -i 's/set(KMIME_VERSION.*)/set(KMIME_VERSION "5.2.40")/' CMakeLists.txt; \
+        sed -i 's/set(LIBKLEO_VERSION.*)/set(LIBKLEO_VERSION "5.4.40")/' CMakeLists.txt; \
+        sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.7.0")/' CMakeLists.txt; \
+        sed -i 's/set(GPGME_REQUIRED_VERSION.*)/set(GPGME_REQUIRED_VERSION "1.8.0")/' CMakeLists.txt; \
         for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do  \
           (cd "$$$${pkgsdir}"; "$$$${pfile}")          \
         done)