[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-177-g1a0a326
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jul 22 17:18:26 CEST 2016
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 1a0a3264cedfb82aab59a473001ed39f15bd4490 (commit)
via b27a192b3b7264f1ba569b530c68c21fd7fe79ef (commit)
via 2424eb11582aa4721e46ee341ba617b43b0bb93a (commit)
via 4d38bc36a3ef04521f03d6f274aa3115396d403f (commit)
via f73a01d11b7f474aba866b0fa103abd69074ddcf (commit)
from f1a07aa186ee43cb645afde394092b373c088981 (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 1a0a3264cedfb82aab59a473001ed39f15bd4490
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 22 17:18:01 2016 +0200
Distribute slideshow images
* src/Makefile.am (EXTRA_DIST): Add slides.
diff --git a/src/Makefile.am b/src/Makefile.am
index 8554173..78992c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,7 +84,13 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
- inst-final.nsi index.theme
+ inst-final.nsi index.theme \
+ slideshow/slides.dat \
+ slideshow/beta.png \
+ slideshow/context_menu.png \
+ slideshow/file-ext.png \
+ slideshow/gpgol.png \
+ slideshow/launch_kleo.png
SUBDIRS = dictionaries
commit b27a192b3b7264f1ba569b530c68c21fd7fe79ef
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 22 17:16:21 2016 +0200
Update mutliple packages
* packages/packages.current: Update libgpg-error and libassuan.
Update qt packages, kleopatra, gpgmepp and kmime.
* patches: Rebase, remove upstream patches.
* patches/qtbase/fix-fontconfig.patch: New.
* Makefile.am (EXTRA_DIST): Update accordingly.
diff --git a/Makefile.am b/Makefile.am
index 478577c..63c16ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,20 +28,19 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 \
build-aux/git-log-footer build-aux/git-log-fix \
patches/glib-2.41.5/01-socket.patch \
- patches/qtbase-5.5.1/fix-freetype-link.patch \
- patches/qtbase-5.5.1/fix-oci-detect.patch \
- patches/qtbase-5.5.1/fix-syssemaphore.patch \
- patches/qtbase-5.5.1/fix-zlib-link.patch \
- patches/qtbase-5.5.1/relative-paths.patch \
- patches/qtbase-5.5.1/config-standardpaths.patch \
+ patches/qtbase/fix-freetype-link.patch \
+ patches/qtbase/fix-oci-detect.patch \
+ patches/qtbase/fix-syssemaphore.patch \
+ patches/qtbase/fix-zlib-link.patch \
+ patches/qtbase/relative-paths.patch \
+ patches/qtbase/fix-fontconfig.patch \
+ patches/qtbase/config-standardpaths.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
patches/gpgmepp/0002-disable-variants.patch \
- patches/kmime/0001-Check-for-and-replace-strcasestr.patch \
- patches/kmime/0002-Fix-Windows-build.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
@@ -51,6 +50,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/fix-paperkey.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/gpgol-1.4.0/0001-Fix-UI-Server-startup.patch \
diff --git a/packages/packages.current b/packages/packages.current
index 0c447bb..92c6b67 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -275,15 +275,15 @@ chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
-# last-changed: 2016-03-30
+# last-changed: 2016-07-22
# by: ah
-file libgpg-error/libgpg-error-1.23.tar.bz2
-chk 7f0c7f65b98c4048f649bfeebfa4d4c1559707492962504592b985634c939eaa
+file libgpg-error/libgpg-error-1.24.tar.bz2
+chk 9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540
-# last-changed: 2015-12-11
+# last-changed: 2016-07-22
# by: ah
-file libassuan/libassuan-2.4.2.tar.bz2
-chk bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20
+file libassuan/libassuan-2.4.3.tar.bz2
+chk 22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71
# last changed: 2016-07-22
# by: ah
@@ -341,39 +341,39 @@ file 1.60.0/boost_1_60_0.tar.bz2
chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b
# Qt base
-# last changed: 2016-01-05
+# last changed: 2016-07-22
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz.sha1
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz.sha256
server http://download.qt.io/official_releases/qt/
-name qtbase-5.5.1.tar.xz
-file 5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz
-chk dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916
+name qtbase-5.6.1.tar.xz
+file 5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz
+chk d01cc1ee2be9ecdb169be3aea9dc9fc019c1c6d0bb87e0c88bb95b5b3dce7264
# Qt Tools
-# last changed: 2016-01-11
+# last changed: 2016-07-22
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz.sha1
-name qttools-5.5.1.tar.xz
-file 5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
-chk 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz.sha256
+name qttools-5.6.1.tar.xz
+file 5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz
+chk 77a38895ee2d3fe2d0df4a5e1bbef4d3f8870fe20cd3b2cea27bd2d380c17f71
# Qt Winextras
-# last changed: 2016-01-22
+# last changed: 2016-07-22
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz.sha1
-name qtwinextras-5.5.1.tar.xz
-file 5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz
-chk cb00d2ac7a6039fe1119d458f16f319882cb9a250f4caea55657edcde38d851f
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz.sha256
+name qtwinextras-5.6.1.tar.xz
+file 5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz
+chk a86a3d7131ce3534689af9889c0f8d09b3f0f97234256829fac0292433a363b5
# Qt svg
-# last changed: 2016-01-28
+# last changed: 2016-07-22
# by: ah
-# verified: HTTPS https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz.sha1
-name qtsvg-5.5.1.tar.xz
-file 5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz
-chk f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
+# verified: HTTPS https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz.sha256
+name qtsvg-5.6.1.tar.xz
+file 5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz
+chk f12e4fd4f169123f7648e45c593b2c5a4556a9b2db3a798467aa9c67c82b8a21
# KDE Frameworks generated by gen-frameworks.sh
@@ -495,11 +495,18 @@ chk f86f35bf4a216348ab09aaef36ee2aca3b3223ceea78299f6cd9e2ed3274b6d8
##### End Paste #####
# KDE Applications
-#
+
+server http://download.kde.org/stable/applications/
+# kmime
+# last changed: 2016-07-22
+# by: ah
+# verified: https://www.kde.org/info/applications-16.04.3.php
+file 16.04.3/src/kmime-16.04.3.tar.xz
+chk 161c4b963f57bc52894fb63a5288e20e92651313136066698c02ead4a6d194b3
+
+
# Devel versions are needed until Kleopatra can be based on
# a stable branch.
-
-# server http://download.kde.org/stable/applications/
server http://files.intevation.de/projects/gpg4all
# Pinentry master to show new pinentry features under devel.
@@ -522,34 +529,20 @@ chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56
# chk 56d5f05bd513efc6caf770e43b6109e42842198f
#
# Gpgmepp-devel
-# last changed: 2016-04-19
+# last changed: 2016-07-22
# by: ah
# verified: Tarball created by ah.
-file gpgmepp/gpgmepp-201606171716.tar.xz
-chk 9314db98884585c33ad1a9abb105cdf930f948837431a20bd5dbaa340f50b5d6
-
-# kmime
-# last changed: 2016-01-25
-# by: ah
-# verified: https://www.kde.org/info/applications-15.12.1.php
-# file 15.12.1/src/kmime-15.12.1.tar.xz
-# chk fab98917a4cbde33040c97817c1e199d70e335c1a66b1329ff39be0b25287a48
-#
-# kmime-devel
-# last changed: 2016-01-25
-# by: ah
-# verified: Tarball created by ah.
+file gpgmepp/gpgmepp-201607221449.tar.xz
+chk d214a6c15558f335693f15246c69202bd3c3da9aab6341e9bc72263719034bb3
-file kmime/kmime-201601251644.tar.xz
-chk fab98917a4cbde33040c97817c1e199d70e335c1a66b1329ff39be0b25287a48
# Libkleo
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file libkleo/libkleo-201605171746.tar.xz
-chk ad5c2c96c88c283df3066e77fd8714d7b77c2f33f0fe3bb116bb352edf2e38b2
+file libkleo/libkleo-201607221445.tar.xz
+chk 2d6087dc5e404434178895a0585f5833b492ab4d3e4d78cba7a19dfc2dbcc5fc
# KDE-L10n
# last changed: 2016-02-19
@@ -565,5 +558,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201606171712.tar.gz
-chk 27f89375b896d18e07b551c1443ff5d1acc0cb8896db5437b77aab9f799c93a5
+file kleopatra/kleopatra-201607221447.tar.gz
+chk 9f70895dc99717c6b107da143fd95e89d80f28ea1edb7d8447054daf48c4c4bf
diff --git a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
index 17a65cc..6fd271f 100755
--- a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
+++ b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
@@ -229,7 +229,7 @@ new file mode 100644
index 0000000..d2d20fc
--- /dev/null
+++ b/src/fileoperationspreferences.cpp
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,24 @@
+// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
+// All changes you do to this file will be lost.
+
@@ -245,6 +245,9 @@ index 0000000..d2d20fc
+ KConfigSkeleton::ItemBool *itemUsePGPFileExt;
+ itemUsePGPFileExt = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "file-extension-pgp" ), mUsePGPFileExt, false );
+ addItem( itemUsePGPFileExt, QStringLiteral( "UsePGPFileExt" ) );
++ KConfigSkeleton::ItemBool *itemAutoDecryptVerify;
++ itemAutoDecryptVerify = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "auto-decrypt-verify" ), mAutoDecryptVerify, true );
++ addItem( itemAutoDecryptVerify, QStringLiteral( "AutoDecryptVerify" ) );
+}
+
+FileOperationsPreferences::~FileOperationsPreferences()
@@ -256,7 +259,7 @@ new file mode 100644
index 0000000..9866a70
--- /dev/null
+++ b/src/fileoperationspreferences.h
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,66 @@
+// This file is generated by kconfig_compiler_kf5 from fileoperationspreferences.kcfg.
+// All changes you do to this file will be lost.
+#ifndef KLEO_FILEOPERATIONSPREFERENCES_H
@@ -293,10 +296,28 @@ index 0000000..9866a70
+ return mUsePGPFileExt;
+ }
+
++ /**
++ Set Automatically start operation based on input detection for decrypt/verify.
++ */
++ void setAutoDecryptVerify( bool v )
++ {
++ if (!isImmutable( QStringLiteral( "AutoDecryptVerify" ) ))
++ mAutoDecryptVerify = v;
++ }
++
++ /**
++ Get Automatically start operation based on input detection for decrypt/verify.
++ */
++ bool autoDecryptVerify() const
++ {
++ return mAutoDecryptVerify;
++ }
++
+ protected:
+
+ // FileOperations
+ bool mUsePGPFileExt;
++ bool mAutoDecryptVerify;
+
+ private:
+};
diff --git a/patches/kleopatra/fix-paperkey.patch b/patches/kleopatra/fix-paperkey.patch
new file mode 100755
index 0000000..c7cdc2a
--- /dev/null
+++ b/patches/kleopatra/fix-paperkey.patch
@@ -0,0 +1,18 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/src/utils/gnupg-helper.cpp b/src/utils/gnupg-helper.cpp
+index 7933606..ca85814 100644
+--- a/src/utils/gnupg-helper.cpp
++++ b/src/utils/gnupg-helper.cpp
+@@ -229,6 +229,8 @@ bool Kleo::engineIsVersion(int major, int minor, int patch, Engine engine)
+
+ const QString& Kleo::paperKeyInstallPath()
+ {
+- static const QString pkPath = QStandardPaths::findExecutable("paperkey");
++ static const QString pkPath = QStandardPaths::findExecutable("paperkey", QStringList() << QCoreApplication::applicationDirPath()).isEmpty() ?
++ QStandardPaths::findExecutable("paperkey") :
++ QStandardPaths::findExecutable("paperkey", QStringList() << QCoreApplication::applicationDirPath());
+ return pkPath;
+ }
diff --git a/patches/kmime/0001-Check-for-and-replace-strcasestr.patch b/patches/kmime/0001-Check-for-and-replace-strcasestr.patch
deleted file mode 100755
index 4695424..0000000
--- a/patches/kmime/0001-Check-for-and-replace-strcasestr.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l $* < $0
-exit $?
-
-From 4e685983ef6f5ba09448378bf115ea581a2d1c58 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Mon, 25 Jan 2016 17:52:57 +0100
-Subject: [PATCH 1/2] Check for and replace strcasestr
-
-strcasestr is not standard and not available on Windows.
-Check for this and add a simple replacement in case it is
-not found.
----
- cmake/CMakeChecks.cmake | 40 ++++++++++++++++++++++++++++++++++++++++
- cmake/CheckTimezone.cmake | 34 ----------------------------------
- src/CMakeLists.txt | 2 +-
- src/config-kmime.h.cmake | 3 +++
- src/kmime_util.cpp | 15 +++++++++++++++
- 5 files changed, 59 insertions(+), 35 deletions(-)
- create mode 100644 cmake/CMakeChecks.cmake
- delete mode 100644 cmake/CheckTimezone.cmake
-
-diff --git a/cmake/CMakeChecks.cmake b/cmake/CMakeChecks.cmake
-new file mode 100644
-index 0000000..d4c7375
---- /dev/null
-+++ b/cmake/CMakeChecks.cmake
-@@ -0,0 +1,40 @@
-+# Discover the type of the timezone variable,
-+# set HAVE_TIMEZONE if found for config.h
-+
-+include (CheckCXXSourceCompiles)
-+
-+check_cxx_source_compiles("
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <unistd.h>
-+int main() { timezone = 1; return 0;}
-+"
-+ HAVE_TIMEZONE)
-+
-+if (NOT HAVE_TIMEZONE)
-+ # Then it's probably this variant, just to be sure
-+ check_cxx_source_compiles("
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <unistd.h>
-+int main() { const char *p = timezone(0,0); return 0;}
-+"
-+ HAVE_BSD_TIMEZONE)
-+endif()
-+
-+check_cxx_source_compiles("
-+#include <stdlib.h>
-+#include <ctype.h>
-+#include <time.h>
-+#include <unistd.h>
-+int main() { struct tm tm; tm.tm_gmtoff=1; return 0; }
-+"
-+ HAVE_TM_GMTOFF)
-+
-+check_cxx_source_compiles("
-+#include <string.h>
-+int main() { strcasestr(\"\", \"\"); }
-+"
-+ HAVE_STRCASESTR)
-diff --git a/cmake/CheckTimezone.cmake b/cmake/CheckTimezone.cmake
-deleted file mode 100644
-index adc1937..0000000
---- a/cmake/CheckTimezone.cmake
-+++ /dev/null
-@@ -1,34 +0,0 @@
--# Discover the type of the timezone variable,
--# set HAVE_TIMEZONE if found for config.h
--
--include (CheckCXXSourceCompiles)
--
--check_cxx_source_compiles("
--#include <stdlib.h>
--#include <ctype.h>
--#include <time.h>
--#include <unistd.h>
--int main() { timezone = 1; return 0;}
--"
-- HAVE_TIMEZONE)
--
--if (NOT HAVE_TIMEZONE)
-- # Then it's probably this variant, just to be sure
-- check_cxx_source_compiles("
--#include <stdlib.h>
--#include <ctype.h>
--#include <time.h>
--#include <unistd.h>
--int main() { const char *p = timezone(0,0); return 0;}
--"
-- HAVE_BSD_TIMEZONE)
--endif()
--
--check_cxx_source_compiles("
--#include <stdlib.h>
--#include <ctype.h>
--#include <time.h>
--#include <unistd.h>
--int main() { struct tm tm; tm.tm_gmtoff=1; return 0; }
--"
-- HAVE_TM_GMTOFF)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ef86420..3a4517b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include(CheckTimezone)
-+include(CMakeChecks)
-
- configure_file(config-kmime.h.cmake ${KMime_BINARY_DIR}/src/config-kmime.h)
-
-diff --git a/src/config-kmime.h.cmake b/src/config-kmime.h.cmake
-index 7b7ef6d..655565c 100644
---- a/src/config-kmime.h.cmake
-+++ b/src/config-kmime.h.cmake
-@@ -3,3 +3,6 @@
-
- /* Define if you have a tm_gmtoff member in struct tm */
- #cmakedefine HAVE_TM_GMTOFF 1
-+
-+/* Define if you have strcasestr in string.h */
-+#cmakedefine HAVE_STRCASESTR 1
-diff --git a/src/kmime_util.cpp b/src/kmime_util.cpp
-index ed002b9..c1e5886 100644
---- a/src/kmime_util.cpp
-+++ b/src/kmime_util.cpp
-@@ -285,6 +285,21 @@ int findHeaderLineEnd(const QByteArray &src, int &dataBegin, bool *folded)
- return end;
- }
-
-+#ifndef HAVE_STRCASESTR
-+static const char *strcasestr(const char *haystack, const char *needle)
-+{
-+ /* Copied from libreplace as part of qtwebengine 5.5.1 */
-+ const char *s;
-+ size_t nlen = strlen(needle);
-+ for (s = haystack; *s; s++) {
-+ if (toupper(*needle) == toupper(*s) && strncasecmp(s, needle, nlen) == 0) {
-+ return (char *)((uintptr_t)s);
-+ }
-+ }
-+ return NULL;
-+}
-+#endif
-+
- int indexOfHeader(const QByteArray &src, const QByteArray &name, int &end, int &dataBegin, bool *folded)
- {
- QByteArray n = name;
---
-2.1.4
diff --git a/patches/kmime/0002-Fix-Windows-build.patch b/patches/kmime/0002-Fix-Windows-build.patch
deleted file mode 100755
index 148a33a..0000000
--- a/patches/kmime/0002-Fix-Windows-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l $* < $0
-exit $?
-
-From d977ebb7d83cdbe01875273f133d5696af628c29 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Mon, 25 Jan 2016 18:05:01 +0100
-Subject: [PATCH 2/2] Fix Windows build
-
-gethostname is part of Winsock2 on Windows.
----
- src/CMakeLists.txt | 5 +++++
- src/kmime_mdn.cpp | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3a4517b..2b62c6d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -33,12 +33,17 @@ add_library(KF5::Mime ALIAS KF5Mime)
- target_include_directories(KF5Mime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KMime>")
- target_include_directories(KF5Mime PUBLIC "$<BUILD_INTERFACE:${KMime_SOURCE_DIR}/src;${KMime_BINARY_DIR}/src;${KMime_BINARY_DIR}>")
-
-+if (WIN32)
-+ set(_kmime_extra_libs ws2_32)
-+endif()
-+
- target_link_libraries(KF5Mime
- PUBLIC
- Qt5::Core
- PRIVATE
- KF5::I18n
- KF5::Codecs
-+ ${_kmime_extra_libs}
- )
-
- set_target_properties(KF5Mime PROPERTIES
-diff --git a/src/kmime_mdn.cpp b/src/kmime_mdn.cpp
-index 3061112..c441291 100644
---- a/src/kmime_mdn.cpp
-+++ b/src/kmime_mdn.cpp
-@@ -41,7 +41,11 @@
-
- #include <QtCore/QByteArray>
-
--#include <unistd.h> // gethostname
-+#ifdef Q_OS_WIN // gethostname
-+# include <winsock2.h>
-+#else
-+# include <unistd.h>
-+#endif
-
- namespace KMime
- {
---
-2.1.4
diff --git a/patches/qtbase-5.5.1/config-standardpaths.patch b/patches/qtbase/config-standardpaths.patch
similarity index 74%
rename from patches/qtbase-5.5.1/config-standardpaths.patch
rename to patches/qtbase/config-standardpaths.patch
index 9a11f26..9b30907 100755
--- a/patches/qtbase-5.5.1/config-standardpaths.patch
+++ b/patches/qtbase/config-standardpaths.patch
@@ -1,28 +1,11 @@
#! /bin/sh
-patch -p1 -f $* < $0
+patch -p1 -f -l $* < $0
exit $?
-From c6524a252fc362abe5b8412dcabec499ff092143 Mon Sep 17 00:00:00 2001
-From: Patrick Spendrin <ps_ml at gmx.de>
-Date: Tue, 29 Sep 2015 15:47:09 +0200
-Subject: [PATCH] WIP: configurable standardpaths
-
----
- src/corelib/global/global.pri | 1 +
- src/corelib/global/qlibraryinfo.cpp | 49 +++++++++++++---------------
- src/corelib/global/qlibraryinfo_p.h | 61 +++++++++++++++++++++++++++++++++++
- src/corelib/io/qstandardpaths.cpp | 42 ++++++++++++++++++++++++
- src/corelib/io/qstandardpaths.h | 2 ++
- src/corelib/io/qstandardpaths_mac.mm | 4 +++
- src/corelib/io/qstandardpaths_win.cpp | 4 ++-
- 7 files changed, 136 insertions(+), 27 deletions(-)
- create mode 100644 src/corelib/global/qlibraryinfo_p.h
-
-diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
-index 6a8104b..a905cb2 100644
---- a/src/corelib/global/global.pri
-+++ b/src/corelib/global/global.pri
-@@ -10,6 +10,7 @@ HEADERS += \
+diff -Nru qtbase-5.6.1.orig/src/corelib/global/global.pri qtbase-5.6.1/src/corelib/global/global.pri
+--- qtbase-5.6.1.orig/src/corelib/global/global.pri 2016-07-22 15:11:23.303466531 +0200
++++ qtbase-5.6.1/src/corelib/global/global.pri 2016-07-22 15:11:49.940044214 +0200
+@@ -10,6 +10,7 @@
global/qnumeric_p.h \
global/qnumeric.h \
global/qglobalstatic.h \
@@ -30,10 +13,9 @@ index 6a8104b..a905cb2 100644
global/qlibraryinfo.h \
global/qlogging.h \
global/qtypeinfo.h \
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 0cfcc4e..640e9cf 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
+diff -Nru qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo.cpp qtbase-5.6.1/src/corelib/global/qlibraryinfo.cpp
+--- qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo.cpp 2016-07-22 15:11:23.303466531 +0200
++++ qtbase-5.6.1/src/corelib/global/qlibraryinfo.cpp 2016-07-22 15:11:49.940044214 +0200
@@ -38,6 +38,7 @@
#include "qsettings.h"
#include "qlibraryinfo.h"
@@ -42,7 +24,7 @@ index 0cfcc4e..640e9cf 100644
#ifdef QT_BUILD_QMAKE
QT_BEGIN_NAMESPACE
-@@ -77,37 +78,33 @@ struct QLibrarySettings
+@@ -77,37 +78,33 @@
};
Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
@@ -102,11 +84,9 @@ index 0cfcc4e..640e9cf 100644
static const char platformsSection[] = "Platforms";
-diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h
-new file mode 100644
-index 0000000..e6e1b15
---- /dev/null
-+++ b/src/corelib/global/qlibraryinfo_p.h
+diff -Nru qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo_p.h qtbase-5.6.1/src/corelib/global/qlibraryinfo_p.h
+--- qtbase-5.6.1.orig/src/corelib/global/qlibraryinfo_p.h 1970-01-01 01:00:00.000000000 +0100
++++ qtbase-5.6.1/src/corelib/global/qlibraryinfo_p.h 2016-07-22 15:11:49.940044214 +0200
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
@@ -170,25 +150,25 @@ index 0000000..e6e1b15
+
+#endif
\ No newline at end of file
-diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
-index 74252d1..5bcfe2a 100644
---- a/src/corelib/io/qstandardpaths.cpp
-+++ b/src/corelib/io/qstandardpaths.cpp
-@@ -36,6 +36,13 @@
- #include <qdir.h>
- #include <qfileinfo.h>
- #include <qhash.h>
-+// #include <QtCore/private/qlibraryinfo_p.h>
+diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp
+--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:11:23.307466618 +0200
++++ qtbase-5.6.1/src/corelib/io/qstandardpaths.cpp 2016-07-22 15:12:52.629403686 +0200
+@@ -41,6 +41,14 @@
+ #include <qcoreapplication.h>
+ #endif
+
+#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED)
+#include "../global/qlibraryinfo_p.h"
++#include <qsettings.h>
+#endif
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
++
+ #ifndef QT_NO_STANDARDPATHS
- #ifndef QT_BOOTSTRAPPED
- #include <qobject.h>
-@@ -655,6 +659,55 @@ bool QStandardPaths::isTestModeEnabled()
+ QT_BEGIN_NAMESPACE
+@@ -655,6 +663,55 @@
return qsp_testMode;
}
@@ -244,11 +224,10 @@ index 74252d1..5bcfe2a 100644
QT_END_NAMESPACE
-diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h
-index 5c0e08b..2fb29bb 100644
---- a/src/corelib/io/qstandardpaths.h
-+++ b/src/corelib/io/qstandardpaths.h
-@@ -92,6 +92,8 @@ public:
+diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h qtbase-5.6.1/src/corelib/io/qstandardpaths.h
+--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:23.307466618 +0200
++++ qtbase-5.6.1/src/corelib/io/qstandardpaths.h 2016-07-22 15:11:49.940044214 +0200
+@@ -92,6 +92,8 @@
static bool isTestModeEnabled();
private:
@@ -257,11 +236,10 @@ index 5c0e08b..2fb29bb 100644
// prevent construction
QStandardPaths();
~QStandardPaths();
-diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm
-index d6126ce..29333bd 100644
---- a/src/corelib/io/qstandardpaths_mac.mm
-+++ b/src/corelib/io/qstandardpaths_mac.mm
-@@ -138,6 +138,10 @@ static QString macLocation(QStandardPaths::StandardLocation type, short domain)
+diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_mac.mm qtbase-5.6.1/src/corelib/io/qstandardpaths_mac.mm
+--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_mac.mm 2016-07-22 15:11:23.307466618 +0200
++++ qtbase-5.6.1/src/corelib/io/qstandardpaths_mac.mm 2016-07-22 15:11:49.940044214 +0200
+@@ -138,6 +138,10 @@
QString QStandardPaths::writableLocation(StandardLocation type)
{
@@ -272,11 +250,10 @@ index d6126ce..29333bd 100644
if (isTestModeEnabled()) {
const QString qttestDir = QDir::homePath() + QLatin1String("/.qttest");
QString path;
-diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
-index b1d5821..76d569d 100644
---- a/src/corelib/io/qstandardpaths_win.cpp
-+++ b/src/corelib/io/qstandardpaths_win.cpp
-@@ -87,7 +87,9 @@ static inline int clsidForAppDataLocation(QStandardPaths::StandardLocation type)
+diff -Nru qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_win.cpp qtbase-5.6.1/src/corelib/io/qstandardpaths_win.cpp
+--- qtbase-5.6.1.orig/src/corelib/io/qstandardpaths_win.cpp 2016-07-22 15:11:23.307466618 +0200
++++ qtbase-5.6.1/src/corelib/io/qstandardpaths_win.cpp 2016-07-22 15:13:41.682467339 +0200
+@@ -203,7 +203,9 @@
QString QStandardPaths::writableLocation(StandardLocation type)
{
@@ -284,8 +261,6 @@ index b1d5821..76d569d 100644
+ QString result = QStandardPaths::presetLocation(type);
+ if (!result.isEmpty())
+ return result;
-
- #if !defined(Q_OS_WINCE)
- static GetKnownFolderPath SHGetKnownFolderPath = (GetKnownFolderPath)QSystemLibrary::resolve(QLatin1String("shell32"), "SHGetKnownFolderPath");
---
-2.5.0.windows.1
+ switch (type) {
+ case DownloadLocation:
+ result = sHGetKnownFolderPath(qCLSID_FOLDERID_Downloads, type);
diff --git a/patches/qtbase/fix-fontconfig.patch b/patches/qtbase/fix-fontconfig.patch
new file mode 100755
index 0000000..a898b75
--- /dev/null
+++ b/patches/qtbase/fix-fontconfig.patch
@@ -0,0 +1,29 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001
+From: Boris Pek <tehnick-8 at yandex.ru>
+Date: Sun, 19 Jun 2016 03:15:43 +0300
+Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows
+
+when qtbase is configured with -fontconfig and -system-freetype.
+
+This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f.
+Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea.
+
+Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef
+(cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd)
+
+diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
+index bd6f2d8..4b63461 100644
+--- a/src/plugins/platforms/minimal/minimal.pro.orig 2016-07-22 15:53:11.365351113 +0200
++++ b/src/plugins/platforms/minimal/minimal.pro 2016-07-22 15:55:21.772137814 +0200
+@@ -11,6 +11,7 @@
+ OTHER_FILES += minimal.json
+
+ CONFIG += qpa/genericunixfontdatabase
++win32: DEFINES += QT_NO_FONTCONFIG
+
+ PLUGIN_TYPE = platforms
+ PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
diff --git a/patches/qtbase-5.5.1/fix-freetype-link.patch b/patches/qtbase/fix-freetype-link.patch
similarity index 100%
rename from patches/qtbase-5.5.1/fix-freetype-link.patch
rename to patches/qtbase/fix-freetype-link.patch
diff --git a/patches/qtbase-5.5.1/fix-oci-detect.patch b/patches/qtbase/fix-oci-detect.patch
similarity index 100%
rename from patches/qtbase-5.5.1/fix-oci-detect.patch
rename to patches/qtbase/fix-oci-detect.patch
diff --git a/patches/qtbase-5.5.1/fix-syssemaphore.patch b/patches/qtbase/fix-syssemaphore.patch
similarity index 100%
rename from patches/qtbase-5.5.1/fix-syssemaphore.patch
rename to patches/qtbase/fix-syssemaphore.patch
diff --git a/patches/qtbase-5.5.1/fix-zlib-link.patch b/patches/qtbase/fix-zlib-link.patch
similarity index 100%
rename from patches/qtbase-5.5.1/fix-zlib-link.patch
rename to patches/qtbase/fix-zlib-link.patch
diff --git a/patches/qtbase-5.5.1/relative-paths.patch b/patches/qtbase/relative-paths.patch
similarity index 56%
rename from patches/qtbase-5.5.1/relative-paths.patch
rename to patches/qtbase/relative-paths.patch
index 27d3267..08e2ac2 100755
--- a/patches/qtbase-5.5.1/relative-paths.patch
+++ b/patches/qtbase/relative-paths.patch
@@ -9,23 +9,23 @@ diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpat
index 5e56db3..4d46430 100644
--- a/src/corelib/io/qstandardpaths_win.cpp
+++ b/src/corelib/io/qstandardpaths_win.cpp
-@@ -214,6 +214,16 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
- dirs.append(QCoreApplication::applicationDirPath());
- dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
- }
-+ dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share"));
-+ if (type != GenericDataLocation && type != GenericConfigLocation) {
-+ QString appData = QCoreApplication::applicationDirPath() + QLatin1String("/../share");
-+ if (!QCoreApplication::organizationName().isEmpty())
-+ appData += QLatin1Char('/') + QCoreApplication::organizationName();
-+ if (!QCoreApplication::applicationName().isEmpty())
-+ appData += QLatin1Char('/') + QCoreApplication::applicationName();
-+ dirs.append(appData);
-+ }
-+ dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../etc/xdg"));
- #endif
- }
- break;
+@@ -275,6 +275,16 @@
+ dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
+ # endif // !QT_BOOTSTRAPPED
+ } // isConfigLocation()
++ dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share"));
++ if (type != GenericDataLocation && type != GenericConfigLocation) {
++ QString appData = QCoreApplication::applicationDirPath() + QLatin1String("/../share");
++ if (!QCoreApplication::organizationName().isEmpty())
++ appData += QLatin1Char('/') + QCoreApplication::organizationName();
++ if (!QCoreApplication::applicationName().isEmpty())
++ appData += QLatin1Char('/') + QCoreApplication::applicationName();
++ dirs.append(appData);
++ }
++ dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../etc/xdg"));
+ #endif // !Q_OS_WINCE
+
+ return dirs;
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 06491f1..ef9436f 100644
--- a/src/gui/image/qiconloader.cpp
@@ -42,7 +42,7 @@ diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platf
index 66735d8..5731560 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -321,6 +321,8 @@ static inline QStringList iconThemeSearchPaths()
+@@ -338,6 +338,8 @@
static inline QStringList styleNames()
{
QStringList result;
@@ -51,10 +51,10 @@ index 66735d8..5731560 100644
if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
result.append(QStringLiteral("WindowsVista"));
if (QSysInfo::WindowsVersion >= QSysInfo::WV_XP)
-@@ -382,6 +384,10 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const
- return QVariant(booleanSystemParametersInfo(SPI_GETSNAPTODEFBUTTON, false));
- case ContextMenuOnMouseRelease:
+@@ -401,6 +403,10 @@
return QVariant(true);
+ case WheelScrollLines:
+ return QVariant(int(dWordSystemParametersInfo(SPI_GETWHEELSCROLLLINES, 3)));
+ case QPlatformTheme::SystemIconThemeName:
+ return QVariant(QLatin1String("breeze"));
+ case QPlatformTheme::SystemIconFallbackThemeName:
diff --git a/patches/qtsvg/qtsvg-link-zlib.patch b/patches/qtsvg/qtsvg-link-zlib.patch
index ec52ca7..11d790a 100755
--- a/patches/qtsvg/qtsvg-link-zlib.patch
+++ b/patches/qtsvg/qtsvg-link-zlib.patch
@@ -1,21 +1,23 @@
#! /bin/sh
-patch -p0 -f -l $* < $0
+patch -p1 -f -l $* < $0
exit $?
---- src/svg/svg.pro.orig 2016-01-28 18:06:09.395046821 +0100
-+++ src/svg/svg.pro 2016-01-28 18:06:53.687941080 +0100
-@@ -44,12 +44,5 @@
+--- qtsvg-5.6.1/src/svg/svg.pro.orig 2016-07-22 16:02:19.433065335 +0200
++++ qtsvg-5.6.1/src/svg/svg.pro 2016-07-22 16:10:06.255064441 +0200
+@@ -43,14 +43,6 @@
qsvgfunctions_wince_p.h
}
-contains(QT_CONFIG, system-zlib) {
- if(unix|mingw): LIBS_PRIVATE += -lz
-- else: LIBS += zdll.lib
+- else {
+- isEmpty(ZLIB_LIBS): LIBS += zdll.lib
+- else: LIBS += $$ZLIB_LIBS
+- }
-} else {
-- git_build: \
-- INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib
-- else: \
-- INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib
+- QT_PRIVATE += zlib-private
-}
+-
+if(unix|mingw): LIBS_PRIVATE += -lz
+else: LIBS += zdll.lib
+ load(qt_module)
commit 2424eb11582aa4721e46ee341ba617b43b0bb93a
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 22 17:14:03 2016 +0200
Install Qt Printsupport
* src/inst-qtbase.nsi, src/uninst-qtbase.nsi: Install printsupport.
--
Needed for paperkey export in Kleopatra
diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index 29af596..c6e2268 100644
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -50,8 +50,10 @@ Section "-qtbase" SEC_qtbase
pop $1
SetOutPath "$INSTDIR\bin\platforms"
-
File ${prefix}/plugins/platforms/qwindows.dll
+ SetOutPath "$INSTDIR\bin\printsupport"
+ File ${prefix}/plugins/printsupport/windowsprintersupport.dll
+
!endif
SectionEnd
diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index 684f3d6..7d82f3b 100644
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -40,7 +40,9 @@ Section "-un.qtbase"
Delete "$INSTDIR\bin\qt.conf"
Delete "$INSTDIR\bin\platforms\qwindows.dll"
+ Delete "$INSTDIR\bin\printsupport\windowsprintersupport.dll"
+ RMDir "$INSTDIR\bin\printsupport"
RMDir "$INSTDIR\bin\platforms"
RMDir "$INSTDIR\bin"
commit 4d38bc36a3ef04521f03d6f274aa3115396d403f
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 22 17:09:35 2016 +0200
Improve slideshow slightly for beta
* src/inst-gpg4win.nsi: Call new images.
* src/slideshow: Add some better dummy slides.
--
Still difficult to make this look nice..
diff --git a/src/inst-gpg4win.nsi b/src/inst-gpg4win.nsi
index cc151d5..72b5378 100644
--- a/src/inst-gpg4win.nsi
+++ b/src/inst-gpg4win.nsi
@@ -28,11 +28,13 @@ Section "-gpg4win" SEC_gpg4win
SetDetailsPrint none
SetOutPath "$PLUGINSDIR\Slides"
- File "${BUILD_DIR}/slideshow/01.png"
-# File "${BUILD_DIR}/slideshow/02.png"
-# File "${BUILD_DIR}/slideshow/03.png"
+ File "${BUILD_DIR}/slideshow/beta.png"
+ File "${BUILD_DIR}/slideshow/context_menu.png"
+ File "${BUILD_DIR}/slideshow/file-ext.png"
+ File "${BUILD_DIR}/slideshow/gpgol.png"
+ File "${BUILD_DIR}/slideshow/launch_kleo.png"
File "${BUILD_DIR}/slideshow/slides.dat"
- g4wihelp::slide_show /NOUNLOAD /CCOLOR=0x0000FF "/auto=$PLUGINSDIR\Slides\slides.dat"
+ g4wihelp::slide_show /NOUNLOAD /CCOLOR=0x000000 "/auto=$PLUGINSDIR\Slides\slides.dat"
SetDetailsPrint both
SetOutPath "$INSTDIR"
diff --git a/src/slideshow/01.png b/src/slideshow/01.png
deleted file mode 100644
index 18cf060..0000000
Binary files a/src/slideshow/01.png and /dev/null differ
diff --git a/src/slideshow/beta.png b/src/slideshow/beta.png
new file mode 100644
index 0000000..a4cab5d
Binary files /dev/null and b/src/slideshow/beta.png differ
diff --git a/src/slideshow/context_menu.png b/src/slideshow/context_menu.png
new file mode 100644
index 0000000..3b77aea
Binary files /dev/null and b/src/slideshow/context_menu.png differ
diff --git a/src/slideshow/file-ext.png b/src/slideshow/file-ext.png
new file mode 100644
index 0000000..95b82be
Binary files /dev/null and b/src/slideshow/file-ext.png differ
diff --git a/src/slideshow/gpgol.png b/src/slideshow/gpgol.png
new file mode 100644
index 0000000..4b70944
Binary files /dev/null and b/src/slideshow/gpgol.png differ
diff --git a/src/slideshow/launch_kleo.png b/src/slideshow/launch_kleo.png
new file mode 100644
index 0000000..11c9bc5
Binary files /dev/null and b/src/slideshow/launch_kleo.png differ
diff --git a/src/slideshow/slides.dat b/src/slideshow/slides.dat
index d2ebcd4..d57d6b1 100644
--- a/src/slideshow/slides.dat
+++ b/src/slideshow/slides.dat
@@ -6,8 +6,9 @@
; For more info see: http://wiz0u.free.fr/prog/nsisSlideshow/
[1033]
-=01.png,1000,2000,"We will show"
-=01.png,500,3000,"some hints that the app is called Kleopatra"
-=01.png,500,500,"or GPA,.."
-=01.png,2000,2000,"and how to access GpgOL and GpgEx Here!"
-=01.png,2000,2000,"Awesome!"
+=beta.png,250,3000,"Thank you for testing Gpg4win"
+=beta.png,250,3000,"We will add better slides before the release,.."
+=context_menu.png,250,3000,"Protect your files through the context menu."
+=file-ext.png,250,3000,"Decrypt or Verify them with a double click."
+=gpgol.png,250,3000,"Protect your Mails in Outlook."
+=launch_kleo.png,250,3000,"Or start the Crypto Manager Kleopatra."
commit f73a01d11b7f474aba866b0fa103abd69074ddcf
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 22 14:38:07 2016 +0200
Update GnuPG to 2.1.14
--
diff --git a/packages/packages.current b/packages/packages.current
index 4473d71..0c447bb 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -285,15 +285,15 @@ chk 7f0c7f65b98c4048f649bfeebfa4d4c1559707492962504592b985634c939eaa
file libassuan/libassuan-2.4.2.tar.bz2
chk bb06dc81380b74bf1b64d5849be5c0409a336f3b4c45f20ac688e86d1b5bcb20
-# last changed: 2016-06-17
+# last changed: 2016-07-22
# by: ah
-name gnupg-w32-2.1.13-20160616-bin.exe
-file binary/gnupg-w32-2.1.13_20160616.exe
-chk c868b7fadd5907bb598b11490e0214ce2f11340609bb5829e0d9b0875684d876
+name gnupg-w32-2.1.14-20160714.exe
+file binary/gnupg-w32-2.1.14_20160714.exe
+chk 43ac527c85cc2651d4c96fa7c104caadf303ae88dff3cf8ec27f98ef76fa2d89
-name gnupg-w32-2.1.13-20160616-src.tar.xz
-file binary/gnupg-w32-2.1.13_20160616.tar.xz
-chk f928e680770f3754b22ee6bfb0532307a4fa1f871a726656e028e6e95095bf2d
+name gnupg-w32-2.1.14-20160714-src.tar.xz
+file binary/gnupg-w32-2.1.14_20160714.tar.xz
+chk 80364f956ce90d3924ef750ee8c47a883a2085cc44545b750207d2801ac2e8ae
# TODO: Switch back to released version
# last changed: 2015-12-11
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 16 +--
packages/packages.current | 107 +++++++-------
...k-generated-conf-files-for-Crosscompiling.patch | 25 +++-
patches/kleopatra/fix-paperkey.patch | 18 +++
.../0001-Check-for-and-replace-strcasestr.patch | 157 ---------------------
patches/kmime/0002-Fix-Windows-build.patch | 56 --------
.../config-standardpaths.patch | 103 +++++---------
patches/qtbase/fix-fontconfig.patch | 29 ++++
.../fix-freetype-link.patch | 0
.../{qtbase-5.5.1 => qtbase}/fix-oci-detect.patch | 0
.../fix-syssemaphore.patch | 0
.../{qtbase-5.5.1 => qtbase}/fix-zlib-link.patch | 0
.../{qtbase-5.5.1 => qtbase}/relative-paths.patch | 42 +++---
patches/qtsvg/qtsvg-link-zlib.patch | 20 +--
src/Makefile.am | 8 +-
src/inst-gpg4win.nsi | 10 +-
src/inst-qtbase.nsi | 4 +-
src/slideshow/01.png | Bin 9264 -> 0 bytes
src/slideshow/beta.png | Bin 0 -> 13979 bytes
src/slideshow/context_menu.png | Bin 0 -> 28689 bytes
src/slideshow/file-ext.png | Bin 0 -> 25150 bytes
src/slideshow/gpgol.png | Bin 0 -> 10356 bytes
src/slideshow/launch_kleo.png | Bin 0 -> 8987 bytes
src/slideshow/slides.dat | 11 +-
src/uninst-qtbase.nsi | 2 +
25 files changed, 223 insertions(+), 385 deletions(-)
create mode 100755 patches/kleopatra/fix-paperkey.patch
delete mode 100755 patches/kmime/0001-Check-for-and-replace-strcasestr.patch
delete mode 100755 patches/kmime/0002-Fix-Windows-build.patch
rename patches/{qtbase-5.5.1 => qtbase}/config-standardpaths.patch (74%)
create mode 100755 patches/qtbase/fix-fontconfig.patch
rename patches/{qtbase-5.5.1 => qtbase}/fix-freetype-link.patch (100%)
rename patches/{qtbase-5.5.1 => qtbase}/fix-oci-detect.patch (100%)
rename patches/{qtbase-5.5.1 => qtbase}/fix-syssemaphore.patch (100%)
rename patches/{qtbase-5.5.1 => qtbase}/fix-zlib-link.patch (100%)
rename patches/{qtbase-5.5.1 => qtbase}/relative-paths.patch (56%)
delete mode 100644 src/slideshow/01.png
create mode 100644 src/slideshow/beta.png
create mode 100644 src/slideshow/context_menu.png
create mode 100644 src/slideshow/file-ext.png
create mode 100644 src/slideshow/gpgol.png
create mode 100644 src/slideshow/launch_kleo.png
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list