[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-306-g6de883f
by Jochen Saalfeld
cvs at cvs.gnupg.org
Wed Sep 13 11:57:58 CEST 2017
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 6de883fdd773e5672e07d731797f612050bb9ed3 (commit)
from 27f5592623f7b0d62177a276d8b6d7722a967dad (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 6de883fdd773e5672e07d731797f612050bb9ed3
Author: Jochen Saalfeld <privat at jochen-saalfeld.de>
Date: Wed Sep 13 11:54:27 2017 +0200
Move lowering of required KF5 versions to mk-file
* 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
diff --git a/Makefile.am b/Makefile.am
index ea62e46..2e18138 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
index b9a3f0d..0000000
--- a/patches/kleopatra/lower-kf5-required.patch
+++ /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
index bea30a7..0000000
--- a/patches/libkleo/lower-kf5-required.patch
+++ /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)
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 2cd8c7e..c8c71e7 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -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)
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 --
patches/kleopatra/lower-kf5-required.patch | 23 -----------------------
patches/libkleo/lower-kf5-required.patch | 17 -----------------
src/gpg4win.mk.in | 6 ++++++
4 files changed, 6 insertions(+), 42 deletions(-)
delete mode 100755 patches/kleopatra/lower-kf5-required.patch
delete mode 100755 patches/libkleo/lower-kf5-required.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list