diff --git a/Makefile.am b/Makefile.am
index d827e09d..acc27a5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,87 +1,88 @@
# 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 .
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/boost/boost-1-fixes.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib-2.41.5/01-socket.patch \
patches/glib-2.41.5/02-formatsec.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/fix-qt5.6-build.patch \
+ patches/kleopatra/0001-Allow-build-with-older-KWindowsystem-versions.patch \
patches/kxmlgui/0001-make-qdbus-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/libgpg-error-1.29/0001-doc-Fix-yat2m-build-for-cross-compilation.patch \
patches/qtbase/config-standardpaths.patch \
patches/qtbase/qtbase-mingw-fixes.patch \
patches/qtbase/relative-paths.patch \
patches/qttools/disable-most-tools.patch \
patches/qtwinextras/support-xp.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/breeze-icons/0001-Make-binary-icons-cross-compilable.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/patches/kleopatra/0001-Allow-build-with-older-KWindowsystem-versions.patch b/patches/kleopatra/0001-Allow-build-with-older-KWindowsystem-versions.patch
new file mode 100755
index 00000000..b7ec7778
--- /dev/null
+++ b/patches/kleopatra/0001-Allow-build-with-older-KWindowsystem-versions.patch
@@ -0,0 +1,57 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From ad630efaa9cf5d45a0e356be29f239b92ac34247 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke
+Date: Mon, 4 Nov 2019 16:20:55 +0100
+Subject: [PATCH] Allow build with older KWindowsystem versions
+
+Older versions used the widget and not the window id.
+---
+ src/commands/command.cpp | 2 +-
+ src/kleopatraapplication.cpp | 2 +-
+ src/uiserver/assuanserverconnection.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/commands/command.cpp b/src/commands/command.cpp
+index 24d70614..565a5d2b 100644
+--- a/src/commands/command.cpp
++++ b/src/commands/command.cpp
+@@ -246,7 +246,7 @@ void Command::applyWindowID(QWidget *w) const
+ w->setParent(pw, w->windowFlags());
+ } else {
+ w->setAttribute(Qt::WA_NativeWindow, true);
+- KWindowSystem::setMainWindow(w->windowHandle(), d->parentWId);
++ KWindowSystem::setMainWindow(w, d->parentWId);
+ }
+ } else {
+ w->setParent(d->parentWidgetOrView(), w->windowFlags());
+diff --git a/src/kleopatraapplication.cpp b/src/kleopatraapplication.cpp
+index e2e38989..45e70f46 100644
+--- a/src/kleopatraapplication.cpp
++++ b/src/kleopatraapplication.cpp
+@@ -542,7 +542,7 @@ void KleopatraApplication::openConfigDialogWithForeignParent(WId parentWId)
+ if (QWidget *pw = QWidget::find(parentWId)) {
+ d->configureDialog->setParent(pw, d->configureDialog->windowFlags());
+ } else {
+- KWindowSystem::setMainWindow(d->configureDialog->windowHandle(), parentWId);
++ KWindowSystem::setMainWindow(d->configureDialog, parentWId);
+ }
+ }
+
+diff --git a/src/uiserver/assuanserverconnection.cpp b/src/uiserver/assuanserverconnection.cpp
+index 8e16e0fc..6f1ceb8b 100644
+--- a/src/uiserver/assuanserverconnection.cpp
++++ b/src/uiserver/assuanserverconnection.cpp
+@@ -234,7 +234,7 @@ static void apply_window_id(QWidget *widget, const QString &winIdStr)
+ widget->setParent(pw, widget->windowFlags());
+ } else {
+ widget->setAttribute(Qt::WA_NativeWindow, true);
+- KWindowSystem::setMainWindow(widget->windowHandle(), wid);
++ KWindowSystem::setMainWindow(widget, wid);
+ }
+ }
+
+--
+2.20.1