[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-231-gda62134

[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  da621348dced2d2b31153905a47dc3b3171a7875 (commit)
      from  0e6fcd37a2a7f5f5f2bbb7da098daafeaaa0b978 (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 da621348dced2d2b31153905a47dc3b3171a7875
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Apr 28 12:56:04 2017 +0200

    Update Kleopatra and Libkleo to latest master
    
    * packages/packages.current: Update Kleo / libkleo
    * patches/kleopatra/fix-qt5.6-build.patch: New. Master is now 5.7
    * patches/kleopatra/lower-kf5-required.patch: Refresh
    * Makefile.am (EXTRA_DIST): Add new patch

diff --git a/Makefile.am b/Makefile.am
index 91f3d97..6f6c60f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
         patches/kleopatra/lower-kf5-required.patch \
         patches/kleopatra/relax-gpgme-checks.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 \
diff --git a/packages/packages.current b/packages/packages.current
index e527de7..b9b2c5a 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -521,8 +521,8 @@ chk f89a57cc57124e2bd4e506c4b26c8ca2ee4f7c3a8b987b0816762ea57251a8bf
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file libkleo/libkleo-201701171117.tar.xz
-chk 117a9402892c4bd5b0fb384bf79c932ef9132413b0bbc55c0a92fd95759ad0f8
+file libkleo/libkleo-201704281243.tar.gz
+chk 8dde3b69ad4afb8f1cee8e2a7682fee7a075a2d785c8c534530f393ee74f9834
 
 # KDE-L10n
 # last changed: 2016-02-19
@@ -538,5 +538,5 @@ chk c1c6cae8103d7437c46846f1a5775a5169b8a8e7d7da8536dcc0b801a9830942
 # last changed: see package date.
 # by: ah
 # verified: Tarball created by ah.
-file kleopatra/kleopatra-201703291508.tar.gz
-chk 58e8e19b086d0cf63deecf2bb425fd5a62aef8ee10ea38e428016cc215f24a2d
+file kleopatra/kleopatra-201704281244.tar.gz
+chk 28fb746a8c013f91705c1582a59ad35ed3b1229a49a4bc96190a294fbe5cb50a
diff --git a/patches/kleopatra/fix-qt5.6-build.patch b/patches/kleopatra/fix-qt5.6-build.patch
new file mode 100755
index 0000000..e482adf
--- /dev/null
+++ b/patches/kleopatra/fix-qt5.6-build.patch
@@ -0,0 +1,31 @@
+#! /bin/sh
+patch -p1 -l -f -R $* < $0
+exit $?
+
+diff --git a/src/utils/headerview.cpp b/src/utils/headerview.cpp
+index c5a9d9c..004ba3d 100644
+--- a/src/utils/headerview.cpp
++++ b/src/utils/headerview.cpp
+@@ -80,22 +80,6 @@ inline typename T_container::value_type lookup(const T_container &c, unsigned in
+
+ }
+
+-#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) // provided by Qt since 5.7
+-template <typename T, typename A>
+-QDebug operator<<(QDebug debug, const std::vector<T, A> &v)
+-{
+-    debug.nospace() << "std::vector(";
+-    for (typename std::vector<T, A>::size_type i = 0; i < v.size(); ++i) {
+-        if (i) {
+-            debug << ", ";
+-        }
+-        debug << v[i];
+-    }
+-    debug << ")";
+-    return debug.space();
+-}
+-#endif
+-
+ class HeaderView::Private
+ {
+     friend class ::Kleo::HeaderView;
diff --git a/patches/kleopatra/lower-kf5-required.patch b/patches/kleopatra/lower-kf5-required.patch
index 9066d60..9ec29c2 100755
--- a/patches/kleopatra/lower-kf5-required.patch
+++ b/patches/kleopatra/lower-kf5-required.patch
@@ -3,18 +3,21 @@ patch -p1 -l -f $* < $0
 exit $?
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b9c74e..2e06952 100644
+index 82317fd..bed1a72 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,9 +6,9 @@ option(FORCE_DISABLE_KCMUTILS "Force building Kleopatra without KCMUtils. Doing
+@@ -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.
 -set(KF5_VERSION "5.32.0")
--set(KMIME_VERSION "5.4.80")
--set(LIBKLEO_VERSION "5.4.80")
+-set(KMIME_VERSION "5.5.40")
+-set(LIBKLEO_VERSION "5.5.40")
+-set(QT_REQUIRED_VERSION "5.7.0")
 +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.6.0")
  set(GPGME_REQUIRED_VERSION "1.8.0")
+
+ find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)

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

Summary of changes:
 Makefile.am                                |  1 +
 packages/packages.current                  |  8 ++++----
 patches/kleopatra/fix-qt5.6-build.patch    | 31 ++++++++++++++++++++++++++++++
 patches/kleopatra/lower-kf5-required.patch | 13 ++++++++-----
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100755 patches/kleopatra/fix-qt5.6-build.patch


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