No OneTemporary
Actions

Size

70 KB

Subscribers

None

View Options

	diff --git a/Makefile.am b/Makefile.am
	index 478577c5..63c16edb 100644
	--- a/Makefile.am
	+++ b/Makefile.am
	@@ -1,97 +1,97 @@
	# Makefile.am - Installer for GnuPG 4 Windows Makefile.
	# Copyright (C) 2005, 2008, 2012 g10 Code GmbH
	#
	# This file is part of GPG4Win.
	#
	# GPG4Win is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 2 of the License, or
	# (at your option) any later version.
	#
	# GPG4Win is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with this program; if not, see <http://www.gnu.org/licenses/>.

	ACLOCAL_AMFLAGS = -I m4
	AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
	DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32

	SUBDIRS = po packages doc src

	# find patches -type f \| sort \| sed 's/$/ \\/' \| sed 's/^/ /'

	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 \
	patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
	patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
	patches/kiconthemes/0001-Make-DBus-optional.patch \
	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 \
	patches/gpgol-1.4.0/0002-Ignore-sent-S-MIME-Mails-if-S-MIME-is-disabled.patch \
	patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch

	copy-news:
	cp NEWS doc/website/NEWS.last


	copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
	installers/gpg4win-light-$(VERSION).exe \
	installers/gpg4win-vanilla-$(VERSION).exe
	@echo Copying $(VERSION) to $(RELEASEHOST) >&2
	@set -e;\
	if ssh "$$(echo $(RELEASEHOST)\|cut -d: -f -1)" \
	test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe\|cut -d: -f2-)";\
	then echo "This release has already been copied to the server" >&2 ;\
	else scp gpg4win-$(VERSION).tar.bz2 \
	installers/gpg4win-$(VERSION).exe \
	installers/gpg4win-light-$(VERSION).exe \
	installers/gpg4win-vanilla-$(VERSION).exe \
	installers/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
	for f in en de ; do \
	scp src/README.$$f.txt \
	$(RELEASEHOST)/README-$(VERSION).$$f.txt; \
	done;\
	fi

	dist-hook: gen-ChangeLog

	gen_start_date = 2012-03-26T00:00:00
	.PHONY: gen-ChangeLog
	gen-ChangeLog:
	set -e; \
	if test -d $(top_srcdir)/.git; then \
	(cd $(top_srcdir) && \
	$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
	--amend=build-aux/git-log-fix \
	--since=$(gen_start_date) ) > $(distdir)/cl-t; \
	cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
	rm -f $(distdir)/ChangeLog; \
	mv $(distdir)/cl-t $(distdir)/ChangeLog; \
	fi
	diff --git a/packages/packages.current b/packages/packages.current
	index 0c447bbc..92c6b676 100644
	--- a/packages/packages.current
	+++ b/packages/packages.current
	@@ -1,569 +1,562 @@
	# packages.current - list of current packages for use with gpg4win -- sh --
	#
	# The download script processes the statements here to
	# actually download the packages. The syntax is trivial:
	#
	# If the first non whitespace character of a line is #, the line is
	# considered a comment. If the first word of a line is "server", the
	# rest of the line will be taken as the base URL for following file
	# commands. If the first word of a line is "file" the rest of the
	# line will be appended to the current base URL (with a / as
	# delimiter). The statement "chk" is followed by the SHA1 checksum of
	# the last file.


	#
	# zlib
	#
	server http://zlib.net

	# checked: 2014-06-20 ah
	file zlib-1.2.8.tar.gz
	chk 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d


	#
	# GNU
	#

	server ftp://ftp.gnu.org/pub/gnu

	#checked: 2016-04-05 jochen
	file libiconv/libiconv-1.14.tar.gz
	chk 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613

	#checked: 2016-04-05 jochen
	file gettext/gettext-0.19.5.tar.xz
	chk 3410a61c5c05d0392533c92133e135de828973fee27477a6d6dd3d3e36f2a2dd

	#
	# GLIB
	#
	# The GTK boyz seem to think that sha256sum files on the server
	# magically get them a lot of additional security karma.
	#
	# And it's plain to see
	# You were meant for me
	# Yeah I'm your .sig
	# Your 21th Century sig
	# 21th Century sig, I wanna be your file
	#
	server http://ftp.gnome.org/pub/gnome/sources/glib/2.41

	# last-changed: 2015-06-05
	# Latest minor release is 2.45 but 2.41 works for us.
	# by: ah
	# compared checksum with debian experimental version.
	# https://lists.debian.org/debian-experimental-changes/2014/09/msg00182.html
	# verified: Sig 3D0E FB95 E7B5 237F 16E8 2258 E352 D5C5 1C50 41D4
	file glib-2.41.5.tar.xz
	chk e76a6bd1456749bdd05db19a8f0f174e787e612ed443d30cc9cf02237dd58e16

	#
	# GDK-PIXBUF
	#
	server http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/

	# checked: 2015-06-05
	# by: ah
	# There is a 2.31 series but afaik no security problems with 2.30
	# verified: with linuxfromscratch and frugalware checksums
	file gdk-pixbuf-2.30.8.tar.xz
	chk 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be


	#
	# ATK
	#
	server http://ftp.gnome.org/pub/gnome/sources/atk/1.32

	# checked: 2013-04-29 wk (1.32.0 still the latest in 1.32)
	file atk-1.32.0.tar.bz2
	chk e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e

	server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32

	# checked: 2013-04-29 wk
	name atk-1.32.0.zip
	file atk_1.32.0-2_win32.zip
	chk cadc6d52f2af21996a6dcba7b1fac27ce66721e14d1c4ab21fde7bc9965f5037

	# checked: 2013-04-29 wk
	name atk-dev-1.32.0.zip
	file atk-dev_1.32.0-2_win32.zip
	chk 5021d64043d270350d6a8d50b91db691a7421a68ca0bfa4eeb0c8804a176ac44

	#
	# PANGO
	#
	server http://ftp.gnome.org/pub/gnome/sources/pango/1.29

	# fixme: 2013-04-29 wk - There is a 1.29.5 but no 1.29.5 binaries
	# What shall we do: Update to 1.32? There are no
	# 1.32 binaries either.
	file pango-1.29.4.tar.bz2
	chk f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b

	server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29

	name pango-1.29.4.zip
	file pango_1.29.4-1_win32.zip
	chk e1b865ae2e4054388c598f92b34593b3d24d7fd15e6308c8926ee634717c21ce

	name pango-dev-1.29.4.zip
	file pango-dev_1.29.4-1_win32.zip
	chk 0d7fb255e65ed4bd43acedab4405986e4877b87ba8227d5fa22b38330485e3cb

	#
	# CAIRO
	#
	server http://cairographics.org/releases

	# checked: 2013-04-29 wk - 1.10.2 is the latest in the 1.10 series.
	file cairo-1.10.2.tar.gz
	chk 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
	# checked: 2013-07-16 ah most recent package on that server is from
	# 2012-09-27 TODO -> Move to another source / source build of those
	# dependencies

	# checked: 2013-04-29 wk
	name cairo-1.10.2.zip
	file cairo_1.10.2-2_win32.zip
	chk e6c361ec1df4ccb23edbe5b68db16329d563a19eeee7fa70d583dda3d2358f4e
	name cairo-dev-1.10.2.zip
	file cairo-dev_1.10.2-2_win32.zip
	chk b86f875bf776bbf578e3fa8c46866b84c93200b962b30d03cf795f82157e3167

	# checked: 2013-04-29 wk
	file freetype-2.4.2.tar.bz2
	chk 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
	name freetype-2.4.2.zip
	file freetype_2.4.2-1_win32.zip
	chk bdf67e6573363fd2256a58295931cc1186382fd0ad1fe420059d6ffdb5fba7c0
	name freetype-dev-2.4.2.zip
	file freetype-dev_2.4.2-1_win32.zip
	chk eed58c2807b65d5e0ec78031e89f1628577ad76bf47f02eaecde432c0b99eae9

	server http://www.fontconfig.org/release

	# checked: 2013-04-29 wk - 2.8.0 still the latest in 2.8
	file fontconfig-2.8.0.tar.gz
	chk fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2013-04-29 wk
	name fontconfig-2.8.0.zip
	file fontconfig_2.8.0-2_win32.zip
	chk 9d6bcaeed0eced43a649953132d9f2b3e15b98c7bb9e4a207872dfeade818204
	name fontconfig-dev-2.8.0.zip
	file fontconfig-dev_2.8.0-2_win32.zip
	chk 2f15af3d27ca507dad2a208e58409f484aa7e7c7eac10b49edca079b31ae7073

	server ftp://ftp.g10code.com/g10code/misc

	# checked: 2013-04-29 wk - 2.0.1 still the latest in 2.0
	file expat-2.0.1.tar.gz
	chk 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93

	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2013-04-29 wk
	name expat-2.0.1.zip
	file expat_2.0.1-1_win32.zip
	chk 77b88ab780e698d6590426b26a877878584b9f8b6357909699674fb5045737bd
	name expat-dev-2.0.1.zip
	file expat-dev_2.0.1-1_win32.zip
	chk 67b92b7f3441fee077bdc0094bf4dd673870acdf51899e32e199246801538162


	#
	# GTK+
	#
	server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24

	# last-changed: 2015-06-05
	# by: ah
	# verified: chk from https://download.gnome.org/core/3.17/3.17.2/sources/SHA256SUMS-for-xz
	file gtk+-2.24.28.tar.xz
	chk b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656

	#
	# GIMP stuff for W32
	#
	server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies

	# checked: 2012-03-28 wk - Not updated - not a security problem
	name pkgconfig-0.23.tar.gz
	file pkg-config-0.23.tar.gz
	chk 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53

	name pkgconfig-0.23.zip
	file pkg-config_0.23-3_win32.zip
	chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278


	# PNG

	# last changed: 2015-11-13
	# by: ah
	# verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F
	server ftp://ftp.simplesystems.org/pub/png/src/
	file libpng14/libpng-1.4.19.tar.xz
	chk 52b830ea8900fad3ed46fc91021355211f418c8a41c39699600dbf1db2bbf7ff

	#
	# LibFFI
	#
	server ftp://sourceware.org/pub/libffi

	# checked: 2013-04-29 wk - updated from 3.0.10.
	# checked: 2014-07-16 ah - only rc availble from 3.0.14
	file libffi-3.0.13.tar.gz
	chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c


	#
	# GpgOL
	#
	server ftp://ftp.g10code.com/g10code/gpgol

	# last-changed: 2016-03-30
	# by: ah
	# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
	file gpgol-1.4.0.tar.bz2
	chk abebb06bcf64c11854b110830b148eada7e7d9046e565c407d7957594f09800f

	#
	# GpgEX
	#
	server ftp://ftp.g10code.com/g10code/gpgex

	# last-changed: 2016-03-30
	# by: ah
	# verified: Sig D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
	file gpgex-1.0.4.tar.bz2
	chk aea2232d026219072491f1bf5b2f189a15552f66377ff4dd3b11c0f069379206

	#
	# Pth emulation
	#

	server ftp://ftp.g10code.com/g10code/w32pth

	# checked: 2014-07-16 ah
	file w32pth-2.0.5.tar.bz2
	chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06

	#
	# Stripped down version of BZIP2
	# (full source at http://bzip.org)
	#
	server ftp://ftp.g10code.com/g10code/bzip2

	# checked: 2014-07-16 ah
	file bzip2-1.0.6-g10.tar.gz
	chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07

	#
	# GnuPG et al.
	#
	# All tarballs from this server are verified with an openpgp
	# signature made by "Werner Koch (dist sig)".
	# 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
	name gnupg-w32-2.1.14-20160714.exe
	file binary/gnupg-w32-2.1.14_20160714.exe
	chk 43ac527c85cc2651d4c96fa7c104caadf303ae88dff3cf8ec27f98ef76fa2d89

	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
	# by: ah
	#file pinentry/pinentry-0.9.7.tar.bz2
	#chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2

	# TODO: Switch back to released version
	# last changed: 2015-08-26
	# by: ah
	# file gpgme/gpgme-1.6.0.tar.bz2
	# chk b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d

	# last changed: 2015-09-09
	# by: ah
	file gpa/gpa-0.9.9.tar.bz2
	chk 6828d738b9e1d3cce96d2ec9831c09873c4cb2c87ba67a161ef54485192c4334

	# (Snapshots)
	# server ftp://ftp.g10code.com/g10code/scratch


	#
	# GnuPG utilities
	#
	server http://www.jabberwocky.com/software/paperkey

	# checked: 2014-07-16 ah
	file paperkey-1.3.tar.gz
	chk 5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb

	#
	# Kleopatra and dependencies
	#

	# Boost
	# last changes: 2016-01-21
	# by: ah
	# verified: Second source https://github.com/mxe/mxe/commit/fdd5b9f7aa8bf0e40c1f1f8119701af96e51457e

	server http://downloads.sourceforge.net/project/boost/boost/

	name boost-1.60.0.tar.bz2
	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

	server http://download.kde.org/stable/frameworks/

	##### Paste Here #####
	# extra-cmake-modules
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/extra-cmake-modules-5.24.0.tar.xz
	chk 8a4fd5eac37d4c6a4998c48716efe2392c6f7ec9a124aab4c8fc26516815a106

	# kconfig
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kconfig-5.24.0.tar.xz
	chk bb57371d419457529450ba570cd2804ea127a451bfbd8e8d0cfc45cfa28982b5

	# ki18n
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/ki18n-5.24.0.tar.xz
	chk bb01b060e29634678ef262aed500a54e8f26bda96c003eef1d0a6b5eaf268233

	# kwidgetsaddons
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kwidgetsaddons-5.24.0.tar.xz
	chk 9d551fb9a0813f2df5563856d4e7e40665e59d6b42cba80d36cb42772fe8f7ce

	# kcompletion
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kcompletion-5.24.0.tar.xz
	chk bbbb6eba8786939b275bcbc72ac5b04904d77cc8324e0bf99f06d917c60696e2

	# kwindowsystem
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kwindowsystem-5.24.0.tar.xz
	chk bf191b760eb5de97e7a2cdda8c8a59d50597e46d7714510c1e1b20aa2baabe70

	# kcoreaddons
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kcoreaddons-5.24.0.tar.xz
	chk 7080985a9d51358fb8638a4a048e3d045ab2fb02b7c8ad6c8b596d3bfc3a5d1b

	# kcodecs
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kcodecs-5.24.0.tar.xz
	chk 8c849f6c3411fe6036e2b8ae3449d0f5eab86eb491d6252440ff0b860794ffe2

	# kconfigwidgets
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kconfigwidgets-5.24.0.tar.xz
	chk 82a6ea0c5a07c121ecb4d5e9071c768c3ef89aca196cfa29412916f840c9456c

	# kxmlgui
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kxmlgui-5.24.0.tar.xz
	chk 174643efc8ba49aaa2e1f014088ec73fe7000121c7407973a57331081bed11e2

	# kguiaddons
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kguiaddons-5.24.0.tar.xz
	chk 2c8e27aa763c5af2877fb5f3aa0816706e3a85da49727d792e6f7920a032e945

	# kitemviews
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kitemviews-5.24.0.tar.xz
	chk dc298914af2436003fcf1dd6dbd03d9a11a2063af83b5e735647f43061ea6e78

	# kitemmodels
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kitemmodels-5.24.0.tar.xz
	chk c9403de0a6a155931cb96790dc1407c06d95ee096a5ab9795bbfe11bb82537e8

	# kiconthemes
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/kiconthemes-5.24.0.tar.xz
	chk d5c0a0422cdc655fc3a800a8dfbb97bd0a838456b72176cdf6ee7363c58bbfcc

	# breeze-icons
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/breeze-icons-5.24.0.tar.xz
	chk a2b344907aab4e0549d72740f4ebde0e60566ae5240d63f7584da7d4655c07b6

	# karchive
	# last changed: 2016-07-12
	# by: ah
	# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
	file 5.24/karchive-5.24.0.tar.xz
	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.
	# by: ah
	# verified: tarball created by ah
	file pinentry/pinentry-0.9.8-beta18.tar.bz2
	chk 67b017001928ad072f57435b72d473a961f64bfb17c792e42984dc31f72ae7d1

	# ditto for gpgme.
	# by: ah
	# verified: tarball created by ah
	file gpgme/gpgme-1.7.0-beta225.tar.bz2
	chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56

	# Gpgmepp
	# last changed: 2016-01-21
	# by: ah
	# verified: https://www.kde.org/info/applications-15.12.1.php
	# file 15.12.1/src/gpgmepp-15.12.1.tar.xz
	# 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
	# by: ah
	# verified: Tarball created by ah with script kde-l10n.sh
	file kde-l10n/kde-l10n-201602191116-bin.tar.xz
	chk 3e73412a8444cd22262a5ebbe0a6f546cc68b24fa66bd5c6705df54f45a4d68b

	file kde-l10n/kde-l10n-201602191116-src.tar.xz
	chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592

	# Kleopatra
	# 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 17a65cc2..6fd271fc 100755
	--- a/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
	+++ b/patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch
	@@ -1,521 +1,542 @@
	#! /bin/sh
	patch -p1 -l -f $* < $0
	exit $?

	From 4bf713fdca3a549d12b76afcb64533516f6436ec Mon Sep 17 00:00:00 2001
	From: Andre Heinecke <aheinecke@intevation.de>
	Date: Tue, 16 Feb 2016 18:19:07 +0100
	Subject: [PATCH 5/5] Hack generated conf files for Crosscompiling

	This patch can be removed once Gpg4win is built on a platform
	that has a packaged kconfig_compiler5.
	---
	src/CMakeLists.txt \| 21 +++++++---
	src/conf/CMakeLists.txt \| 20 +++++----
	src/emailoperationspreferences.cpp \| 27 ++++++++++++
	src/emailoperationspreferences.h \| 84 ++++++++++++++++++++++++++++++++++++++
	src/fileoperationspreferences.cpp \| 21 ++++++++++
	src/fileoperationspreferences.h \| 48 ++++++++++++++++++++++
	src/smimevalidationpreferences.cpp \| 22 ++++++++++
	src/smimevalidationpreferences.h \| 55 +++++++++++++++++++++++++
	src/tooltippreferences.cpp \| 27 ++++++++++++
	src/tooltippreferences.h \| 84 ++++++++++++++++++++++++++++++++++++++
	10 files changed, 394 insertions(+), 15 deletions(-)
	create mode 100644 src/emailoperationspreferences.cpp
	create mode 100644 src/emailoperationspreferences.h
	create mode 100644 src/fileoperationspreferences.cpp
	create mode 100644 src/fileoperationspreferences.h
	create mode 100644 src/smimevalidationpreferences.cpp
	create mode 100644 src/smimevalidationpreferences.h
	create mode 100644 src/tooltippreferences.cpp
	create mode 100644 src/tooltippreferences.h

	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index 6799187..8c8193c 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -259,12 +259,21 @@ ki18n_wrap_ui(_kleopatra_SRCS
	newcertificatewizard/advancedsettingsdialog.ui
	)

	-kconfig_add_kcfg_files(_kleopatra_SRCS
	- kcfg/tooltippreferences.kcfgc
	- kcfg/emailoperationspreferences.kcfgc
	- kcfg/fileoperationspreferences.kcfgc
	- kcfg/smimevalidationpreferences.kcfgc
	-)
	+if (NOT CMAKE_CROSSCOMPILING)
	+ kconfig_add_kcfg_files(_kleopatra_SRCS
	+ kcfg/tooltippreferences.kcfgc
	+ kcfg/emailoperationspreferences.kcfgc
	+ kcfg/fileoperationspreferences.kcfgc
	+ kcfg/smimevalidationpreferences.kcfgc
	+ )
	+else()
	+ set(_kleopatra_SRCS ${_kleopatra_SRCS}
	+ tooltippreferences.cpp
	+ emailoperationspreferences.cpp
	+ fileoperationspreferences.cpp
	+ smimevalidationpreferences.cpp
	+ )
	+endif()

	file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
	ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})
	diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
	index bd46c88..d7351e2 100644
	--- a/src/conf/CMakeLists.txt
	+++ b/src/conf/CMakeLists.txt
	@@ -14,10 +14,6 @@ if(BUILD_libkleopatraclient)
	cryptooperationsconfigwidget.ui
	)

	- kconfig_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS
	- ${kleopatra_SOURCE_DIR}/src/kcfg/smimevalidationpreferences.kcfgc
	- )
	-
	set(_kcm_kleopatra_libkleopatraclient_extra_LIBS kleopatraclientgui)

	set(_kcm_kleopatra_libkleopatraclient_extra_install_FILES
	@@ -48,12 +44,18 @@ ki18n_wrap_ui(kcm_kleopatra_PART_SRCS
	smimevalidationconfigurationwidget.ui
	)

	-kconfig_add_kcfg_files(kcm_kleopatra_PART_SRCS
	- ${kleopatra_SOURCE_DIR}/src/kcfg/tooltippreferences.kcfgc
	- ${kleopatra_SOURCE_DIR}/src/kcfg/emailoperationspreferences.kcfgc
	- ${kleopatra_SOURCE_DIR}/src/kcfg/fileoperationspreferences.kcfgc
	-)
	+if(CMAKE_CROSSCOMPILING)
	+ set(_kcfg_generated_files_dir ${kleopatra_SOURCE_DIR}/src)
	+else()
	+ set(_kcfg_generated_files_dir ${kleopatra_BINARY_DIR}/src)
	+endif()

	+set(kcm_kleopatra_PART_SRCS ${kcm_kleopatra_PART_SRCS}
	+ ${_kcfg_generated_files_dir}/tooltippreferences.cpp
	+ ${_kcfg_generated_files_dir}/emailoperationspreferences.cpp
	+ ${_kcfg_generated_files_dir}/fileoperationspreferences.cpp
	+ ${_kcfg_generated_files_dir}/smimevalidationpreferences.cpp
	+ )
	add_library(kcm_kleopatra MODULE ${kcm_kleopatra_PART_SRCS})

	if(HAVE_KCMUTILS)
	diff --git a/src/emailoperationspreferences.cpp b/src/emailoperationspreferences.cpp
	new file mode 100644
	index 0000000..730db97
	--- /dev/null
	+++ b/src/emailoperationspreferences.cpp
	@@ -0,0 +1,27 @@
	+// This file is generated by kconfig_compiler_kf5 from emailoperationspreferences.kcfg.
	+// All changes you do to this file will be lost.
	+
	+#include "emailoperationspreferences.h"
	+
	+using namespace Kleo;
	+
	+EMailOperationsPreferences::EMailOperationsPreferences( )
	+ : KConfigSkeleton( QStringLiteral( "kleopatrarc" ) )
	+{
	+ setCurrentGroup( QStringLiteral( "EMailOperations" ) );
	+
	+ KConfigSkeleton::ItemBool *itemQuickSignEMail;
	+ itemQuickSignEMail = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "quick-sign-email" ), mQuickSignEMail, false );
	+ addItem( itemQuickSignEMail, QStringLiteral( "QuickSignEMail" ) );
	+ KConfigSkeleton::ItemBool *itemQuickEncryptEMail;
	+ itemQuickEncryptEMail = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "quick-encrypt-email" ), mQuickEncryptEMail, false );
	+ addItem( itemQuickEncryptEMail, QStringLiteral( "QuickEncryptEMail" ) );
	+ KConfigSkeleton::ItemRect *itemDecryptVerifyPopupGeometry;
	+ itemDecryptVerifyPopupGeometry = new KConfigSkeleton::ItemRect( currentGroup(), QStringLiteral( "decrypt-verify-popup-geometry" ), mDecryptVerifyPopupGeometry );
	+ addItem( itemDecryptVerifyPopupGeometry, QStringLiteral( "DecryptVerifyPopupGeometry" ) );
	+}
	+
	+EMailOperationsPreferences::~EMailOperationsPreferences()
	+{
	+}
	+
	diff --git a/src/emailoperationspreferences.h b/src/emailoperationspreferences.h
	new file mode 100644
	index 0000000..58881f8
	--- /dev/null
	+++ b/src/emailoperationspreferences.h
	@@ -0,0 +1,84 @@
	+// This file is generated by kconfig_compiler_kf5 from emailoperationspreferences.kcfg.
	+// All changes you do to this file will be lost.
	+#ifndef KLEO_EMAILOPERATIONSPREFERENCES_H
	+#define KLEO_EMAILOPERATIONSPREFERENCES_H
	+
	+#include <qglobal.h>
	+#include <kconfigskeleton.h>
	+#include <QCoreApplication>
	+#include <QDebug>
	+
	+namespace Kleo {
	+
	+class EMailOperationsPreferences : public KConfigSkeleton
	+{
	+ public:
	+
	+ EMailOperationsPreferences( );
	+ ~EMailOperationsPreferences();
	+
	+ /**
	+ Set Quick Sign EMail
	+ */
	+ void setQuickSignEMail( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "QuickSignEMail" ) ))
	+ mQuickSignEMail = v;
	+ }
	+
	+ /**
	+ Get Quick Sign EMail
	+ */
	+ bool quickSignEMail() const
	+ {
	+ return mQuickSignEMail;
	+ }
	+
	+ /**
	+ Set Quick Encrypt EMail
	+ */
	+ void setQuickEncryptEMail( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "QuickEncryptEMail" ) ))
	+ mQuickEncryptEMail = v;
	+ }
	+
	+ /**
	+ Get Quick Encrypt EMail
	+ */
	+ bool quickEncryptEMail() const
	+ {
	+ return mQuickEncryptEMail;
	+ }
	+
	+ /**
	+ Set Decrypt/Verify Popup Geometry
	+ */
	+ void setDecryptVerifyPopupGeometry( const QRect & v )
	+ {
	+ if (!isImmutable( QStringLiteral( "DecryptVerifyPopupGeometry" ) ))
	+ mDecryptVerifyPopupGeometry = v;
	+ }
	+
	+ /**
	+ Get Decrypt/Verify Popup Geometry
	+ */
	+ QRect decryptVerifyPopupGeometry() const
	+ {
	+ return mDecryptVerifyPopupGeometry;
	+ }
	+
	+ protected:
	+
	+ // EMailOperations
	+ bool mQuickSignEMail;
	+ bool mQuickEncryptEMail;
	+ QRect mDecryptVerifyPopupGeometry;
	+
	+ private:
	+};
	+
	+}
	+
	+#endif
	+
	diff --git a/src/fileoperationspreferences.cpp b/src/fileoperationspreferences.cpp
	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.
	+
	+#include "fileoperationspreferences.h"
	+
	+using namespace Kleo;
	+
	+FileOperationsPreferences::FileOperationsPreferences( )
	+ : KConfigSkeleton( QStringLiteral( "kleopatrarc" ) )
	+{
	+ setCurrentGroup( QStringLiteral( "FileOperations" ) );
	+
	+ 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()
	+{
	+}
	+
	diff --git a/src/fileoperationspreferences.h b/src/fileoperationspreferences.h
	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
	+#define KLEO_FILEOPERATIONSPREFERENCES_H
	+
	+#include <qglobal.h>
	+#include <kconfigskeleton.h>
	+#include <QCoreApplication>
	+#include <QDebug>
	+
	+namespace Kleo {
	+
	+class FileOperationsPreferences : public KConfigSkeleton
	+{
	+ public:
	+
	+ FileOperationsPreferences( );
	+ ~FileOperationsPreferences();
	+
	+ /**
	+ Set Use pgp as the default extension for generated OpenPGP files
	+ */
	+ void setUsePGPFileExt( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "UsePGPFileExt" ) ))
	+ mUsePGPFileExt = v;
	+ }
	+
	+ /**
	+ Get Use pgp as the default extension for generated OpenPGP files
	+ */
	+ bool usePGPFileExt() const
	+ {
	+ 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:
	+};
	+
	+}
	+
	+#endif
	+
	diff --git a/src/smimevalidationpreferences.cpp b/src/smimevalidationpreferences.cpp
	new file mode 100644
	index 0000000..3d9a16f
	--- /dev/null
	+++ b/src/smimevalidationpreferences.cpp
	@@ -0,0 +1,22 @@
	+// This file is generated by kconfig_compiler_kf5 from smimevalidationpreferences.kcfg.
	+// All changes you do to this file will be lost.
	+
	+#include "smimevalidationpreferences.h"
	+
	+using namespace Kleo;
	+
	+SMimeValidationPreferences::SMimeValidationPreferences( )
	+ : KConfigSkeleton( QStringLiteral( "kleopatrarc" ) )
	+{
	+ setCurrentGroup( QStringLiteral( "SMime Validation" ) );
	+
	+ KConfigSkeleton::ItemUInt *itemRefreshInterval;
	+ itemRefreshInterval = new KConfigSkeleton::ItemUInt( currentGroup(), QStringLiteral( "refresh-interval" ), mRefreshInterval, 1 );
	+ itemRefreshInterval->setMaxValue(24);
	+ addItem( itemRefreshInterval, QStringLiteral( "RefreshInterval" ) );
	+}
	+
	+SMimeValidationPreferences::~SMimeValidationPreferences()
	+{
	+}
	+
	diff --git a/src/smimevalidationpreferences.h b/src/smimevalidationpreferences.h
	new file mode 100644
	index 0000000..9617bd5
	--- /dev/null
	+++ b/src/smimevalidationpreferences.h
	@@ -0,0 +1,55 @@
	+// This file is generated by kconfig_compiler_kf5 from smimevalidationpreferences.kcfg.
	+// All changes you do to this file will be lost.
	+#ifndef KLEO_SMIMEVALIDATIONPREFERENCES_H
	+#define KLEO_SMIMEVALIDATIONPREFERENCES_H
	+
	+#include <qglobal.h>
	+#include <kconfigskeleton.h>
	+#include <QCoreApplication>
	+#include <QDebug>
	+
	+namespace Kleo {
	+
	+class SMimeValidationPreferences : public KConfigSkeleton
	+{
	+ public:
	+
	+ SMimeValidationPreferences( );
	+ ~SMimeValidationPreferences();
	+
	+ /**
	+ Set Certificate refresh interval (in hours). Zero (0) disables.
	+ */
	+ void setRefreshInterval( uint v )
	+ {
	+
	+ if (v > 24)
	+ {
	+ qDebug() << "setRefreshInterval: value " << v << " is greater than the maximum value of 24";
	+ v = 24;
	+ }
	+
	+ if (!isImmutable( QStringLiteral( "RefreshInterval" ) ))
	+ mRefreshInterval = v;
	+ }
	+
	+ /**
	+ Get Certificate refresh interval (in hours). Zero (0) disables.
	+ */
	+ uint refreshInterval() const
	+ {
	+ return mRefreshInterval;
	+ }
	+
	+ protected:
	+
	+ // SMime Validation
	+ uint mRefreshInterval;
	+
	+ private:
	+};
	+
	+}
	+
	+#endif
	+
	diff --git a/src/tooltippreferences.cpp b/src/tooltippreferences.cpp
	new file mode 100644
	index 0000000..7e85c6a
	--- /dev/null
	+++ b/src/tooltippreferences.cpp
	@@ -0,0 +1,27 @@
	+// This file is generated by kconfig_compiler_kf5 from tooltippreferences.kcfg.
	+// All changes you do to this file will be lost.
	+
	+#include "tooltippreferences.h"
	+
	+using namespace Kleo;
	+
	+TooltipPreferences::TooltipPreferences( )
	+ : KConfigSkeleton( QStringLiteral( "kleopatrarc" ) )
	+{
	+ setCurrentGroup( QStringLiteral( "Tooltip" ) );
	+
	+ KConfigSkeleton::ItemBool *itemShowValidity;
	+ itemShowValidity = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "show-validity" ), mShowValidity, true );
	+ addItem( itemShowValidity, QStringLiteral( "ShowValidity" ) );
	+ KConfigSkeleton::ItemBool *itemShowOwnerInformation;
	+ itemShowOwnerInformation = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "show-owner-information" ), mShowOwnerInformation, false );
	+ addItem( itemShowOwnerInformation, QStringLiteral( "ShowOwnerInformation" ) );
	+ KConfigSkeleton::ItemBool *itemShowCertificateDetails;
	+ itemShowCertificateDetails = new KConfigSkeleton::ItemBool( currentGroup(), QStringLiteral( "show-certificate-details" ), mShowCertificateDetails, false );
	+ addItem( itemShowCertificateDetails, QStringLiteral( "ShowCertificateDetails" ) );
	+}
	+
	+TooltipPreferences::~TooltipPreferences()
	+{
	+}
	+
	diff --git a/src/tooltippreferences.h b/src/tooltippreferences.h
	new file mode 100644
	index 0000000..44f77a2
	--- /dev/null
	+++ b/src/tooltippreferences.h
	@@ -0,0 +1,84 @@
	+// This file is generated by kconfig_compiler_kf5 from tooltippreferences.kcfg.
	+// All changes you do to this file will be lost.
	+#ifndef KLEO_TOOLTIPPREFERENCES_H
	+#define KLEO_TOOLTIPPREFERENCES_H
	+
	+#include <qglobal.h>
	+#include <kconfigskeleton.h>
	+#include <QCoreApplication>
	+#include <QDebug>
	+
	+namespace Kleo {
	+
	+class TooltipPreferences : public KConfigSkeleton
	+{
	+ public:
	+
	+ TooltipPreferences( );
	+ ~TooltipPreferences();
	+
	+ /**
	+ Set Show certificate validity
	+ */
	+ void setShowValidity( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "ShowValidity" ) ))
	+ mShowValidity = v;
	+ }
	+
	+ /**
	+ Get Show certificate validity
	+ */
	+ bool showValidity() const
	+ {
	+ return mShowValidity;
	+ }
	+
	+ /**
	+ Set Show certificate owner information
	+ */
	+ void setShowOwnerInformation( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "ShowOwnerInformation" ) ))
	+ mShowOwnerInformation = v;
	+ }
	+
	+ /**
	+ Get Show certificate owner information
	+ */
	+ bool showOwnerInformation() const
	+ {
	+ return mShowOwnerInformation;
	+ }
	+
	+ /**
	+ Set Show certificate details
	+ */
	+ void setShowCertificateDetails( bool v )
	+ {
	+ if (!isImmutable( QStringLiteral( "ShowCertificateDetails" ) ))
	+ mShowCertificateDetails = v;
	+ }
	+
	+ /**
	+ Get Show certificate details
	+ */
	+ bool showCertificateDetails() const
	+ {
	+ return mShowCertificateDetails;
	+ }
	+
	+ protected:
	+
	+ // Tooltip
	+ bool mShowValidity;
	+ bool mShowOwnerInformation;
	+ bool mShowCertificateDetails;
	+
	+ private:
	+};
	+
	+}
	+
	+#endif
	+
	--
	2.1.4
	diff --git a/patches/kleopatra/fix-paperkey.patch b/patches/kleopatra/fix-paperkey.patch
	new file mode 100755
	index 00000000..c7cdc2a9
	--- /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 46954242..00000000
	--- 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@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 148a33a8..00000000
	--- 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@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 9a11f26e..9b309071 100755
	--- a/patches/qtbase-5.5.1/config-standardpaths.patch
	+++ b/patches/qtbase/config-standardpaths.patch
	@@ -1,291 +1,266 @@
	#! /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@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 \
	+ global/qlibraryinfo_p.h \
	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"
	#include "qscopedpointer.h"
	+#include "qlibraryinfo_p.h"

	#ifdef QT_BUILD_QMAKE
	QT_BEGIN_NAMESPACE
	-@@ -77,37 +78,33 @@ struct QLibrarySettings
	+@@ -77,37 +78,33 @@
	};
	Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)

	-class QLibraryInfoPrivate
	-{
	-public:
	- static QSettings *findConfiguration();
	#ifdef QT_BUILD_QMAKE
	- static bool haveGroup(QLibraryInfo::PathGroup group)
	- {
	- QLibrarySettings *ls = qt_library_settings();
	- return ls ? (group == QLibraryInfo::EffectiveSourcePaths
	- ? ls->haveEffectiveSourcePaths
	- : group == QLibraryInfo::EffectivePaths
	- ? ls->haveEffectivePaths
	- : group == QLibraryInfo::DevicePaths
	- ? ls->haveDevicePaths
	- : ls->havePaths) : false;
	- }
	+bool QLibraryInfoPrivate::haveGroup(QLibraryInfo::PathGroup group)
	+{
	+ QLibrarySettings *ls = qt_library_settings();
	+ return ls ? (group == QLibraryInfo::EffectiveSourcePaths
	+ ? ls->haveEffectiveSourcePaths
	+ : group == QLibraryInfo::EffectivePaths
	+ ? ls->haveEffectivePaths
	+ : group == QLibraryInfo::DevicePaths
	+ ? ls->haveDevicePaths
	+ : ls->havePaths) : false;
	+}
	#endif
	- static QSettings *configuration()
	- {
	- QLibrarySettings *ls = qt_library_settings();
	- if (ls) {
	+QSettings *QLibraryInfoPrivate::configuration()
	+{
	+ QLibrarySettings *ls = qt_library_settings();
	+ if (ls) {
	#ifndef QT_BUILD_QMAKE
	- if (ls->reloadOnQAppAvailable && QCoreApplication::instance() != 0)
	- ls->load();
	+ if (ls->reloadOnQAppAvailable && QCoreApplication::instance() != 0)
	+ ls->load();
	#endif
	- return ls->settings.data();
	- } else {
	- return 0;
	- }
	+ return ls->settings.data();
	+ } else {
	+ return 0;
	}
	-};
	+}
	+

	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 @@
	+/****************************************************************************
	+**
	+** Copyright (C) 2015 The Qt Company Ltd.
	+** Contact: http://www.qt.io/licensing/
	+**
	+** This file is part of the QtCore module of the Qt Toolkit.
	+**
	+** $QT_BEGIN_LICENSE:LGPL21$
	+** Commercial License Usage
	+** Licensees holding valid commercial Qt licenses may use this file in
	+** accordance with the commercial license agreement provided with the
	+** Software or, alternatively, in accordance with the terms contained in
	+** a written agreement between you and The Qt Company. For licensing terms
	+** and conditions see http://www.qt.io/terms-conditions. For further
	+** information use the contact form at http://www.qt.io/contact-us.
	+**
	+** GNU Lesser General Public License Usage
	+** Alternatively, this file may be used under the terms of the GNU Lesser
	+** General Public License version 2.1 or version 3 as published by the Free
	+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
	+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
	+** following information to ensure the GNU Lesser General Public License
	+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
	+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	+**
	+** As a special exception, The Qt Company gives you certain additional
	+** rights. These rights are described in The Qt Company LGPL Exception
	+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	+**
	+** $QT_END_LICENSE$
	+**
	+****************************************************************************/
	+
	+#ifndef QLIBRARYINFO_P_H
	+#define QLIBRARYINFO_P_H
	+
	+//
	+// W A R N I N G
	+// -------------
	+//
	+// This file is not part of the Qt API. It exists purely as an
	+// implementation detail. This header file may change from version to
	+// version without notice, or even be removed.
	+//
	+// We mean it.
	+//
	+
	+#include "qsettings.h"
	+#include "qlibraryinfo.h"
	+
	+class QLibraryInfoPrivate
	+{
	+public:
	+ static QSettings *findConfiguration();
	+#ifdef QT_BUILD_QMAKE
	+ static bool haveGroup(QLibraryInfo::PathGroup group);
	+#endif
	+ static QSettings *configuration();
	+};
	+
	+#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;
	}

	+static const char standardPathsSection[] = "StandardPaths";
	+
	+QString QStandardPaths::presetLocation(StandardLocation type)
	+{
	+#if !defined(QT_BUILD_QMAKE) && !defined(QT_NO_SETTINGS) && !defined(QT_BOOTSTRAPPED)
	+ QStringList locations = QStringList() << QStringLiteral("DesktopLocation")
	+ << QStringLiteral("DocumentsLocation")
	+ << QStringLiteral("FontsLocation")
	+ << QStringLiteral("ApplicationsLocation")
	+ << QStringLiteral("MusicLocation")
	+ << QStringLiteral("MoviesLocation")
	+ << QStringLiteral("PicturesLocation")
	+ << QStringLiteral("TempLocation")
	+ << QStringLiteral("HomeLocation")
	+ << QStringLiteral("DataLocation")
	+ << QStringLiteral("CacheLocation")
	+ << QStringLiteral("GenericDataLocation")
	+ << QStringLiteral("RuntimeLocation")
	+ << QStringLiteral("ConfigLocation")
	+ << QStringLiteral("DownloadLocation")
	+ << QStringLiteral("GenericCacheLocation")
	+ << QStringLiteral("GenericConfigLocation")
	+ << QStringLiteral("AppDataLocation")
	+ << QStringLiteral("AppConfigLocation")
	+ << QStringLiteral("AppLocalDataLocation");
	+
	+ QScopedPointer<const QSettings> settings(QLibraryInfoPrivate::findConfiguration());
	+ if (!settings.isNull()) {
	+ QString key = QLatin1String(standardPathsSection);
	+ key += QLatin1Char('/');
	+ key += locations[type];
	+ const QString value = settings->value(key).toString();
	+#ifdef Q_OS_WIN
	+ if (value.isEmpty())
	+#endif
	+ return value;
	+#ifdef Q_OS_WIN
	+ wchar_t expandedPath[MAX_PATH] = {0};
	+ if (ExpandEnvironmentStrings((wchar_t*)value.utf16(), expandedPath, MAX_PATH)) {
	+ return QString::fromWCharArray(expandedPath).replace("\\", "//");
	+ }
	+ return value;
	+#endif
	+ }
	+#endif // !QT_BUILD_QMAKE && !QT_NO_SETTINGS
	+
	+ return QString();
	+}
	+

	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:
	+ static QString presetLocation(StandardLocation type);
	+
	// 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)
	{
	+ const QString result = QStandardPaths::presetLocation(type);
	+ if(!result.isEmpty())
	+ return result;
	+
	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)
	{
	- QString result;
	+ 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 00000000..a898b757
	--- /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@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 27d3267a..08e2ac25 100755
	--- a/patches/qtbase-5.5.1/relative-paths.patch
	+++ b/patches/qtbase/relative-paths.patch
	@@ -1,64 +1,64 @@
	#! /bin/sh
	patch -p1 -f -l $* < $0
	exit $?

	Patch kindly provided by KDE Windows emerge. To
	look for files relative to the install location.

	diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
	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
	+++ b/src/gui/image/qiconloader.cpp
	@@ -157,6 +157,7 @@ QStringList QIconLoader::themeSearchPaths() const
	{
	if (m_iconDirs.isEmpty()) {
	m_iconDirs = systemIconSearchPaths();
	+ m_iconDirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/../share/icons"));
	// Always add resource directory as search path
	m_iconDirs.append(QLatin1String(":/icons"));
	}
	diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
	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;
	+ result.append(QStringLiteral("breeze"));
	+ result.append(QStringLiteral("oxygen"));
	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:
	+ return QVariant(QLatin1String("oxygen"));
	default:
	break;
	}
	diff --git a/patches/qtsvg/qtsvg-link-zlib.patch b/patches/qtsvg/qtsvg-link-zlib.patch
	index ec52ca76..11d790a0 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)

File Metadata

Mime Type: text/x-diff
Expires: Sun, Feb 23, 7:35 PM (1 d, 51 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 39/7d/e7d96f053775e5365e7bba94d512

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions