diff --git a/Makefile.am b/Makefile.am
index 96f27a7f..ecce37dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,120 +1,120 @@
# 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
if BUILD_GPG4WIN
po = po
else
po =
endif
if BUILD_GPG4WIN
doc = doc
else
doc =
endif
SUBDIRS = ${po} packages ${doc} src
# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
# find patches-appimage -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 \
docker/appimage/Dockerfile \
docker/build-appimage-docker-image.sh \
docker/run-appimage-build.sh \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib/glib-1-fixes.patch \
patches/glib/glib-2-fixes.patch \
patches/kconfig/0001-Read-defaults-from-Windows-registry.patch \
patches/kconfigwidgets/0001-Fix-crash-on-exit-on-Windows.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/kleopatra/set-windows-registry-key.patch \
patches/kwidgetsaddons/0001-KMessageWidget-Ensure-correct-tab-order-of-action-bu.patch \
patches/kxmlgui/0001-make-qdbus-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/libkleo/set-cxx-standard.patch \
patches/qtbase/0001-Fix-build-without-std-thread.patch \
patches/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \
patches/qtbase/0002-Gpg4win-theme-names-and-relpaths.patch \
patches/qtbase/0003-Fix-build-with-GCC-11-include-limits.patch \
patches/qttools/disable-most-tools.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch \
- patches-appimage/kleopatra/set-cxx-standard.patch \
- patches-appimage/kmime/set-cxx-standard.patch \
+ patches-appimage/qtwayland-5.15.0/00-disable-wayland-server.patch \
patches-appimage/kwidgetsaddons/0001-KMessageWidget-Ensure-correct-tab-order-of-action-bu.patch \
- patches-appimage/libkleo/gpg4win-check.patch \
patches-appimage/libkleo/set-cxx-standard.patch \
- patches-appimage/qtwayland-5.15.0/00-disable-wayland-server.patch \
+ patches-appimage/kmime/set-cxx-standard.patch \
+ patches-appimage/gnupg-2.3.7/0001-dirmngr-Fix-NTBTLS-include-for-test.patch \
+ patches-appimage/libkleo/gpg4win-check.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
download: packages/packages.common packages/packages.4 packages/packages.3
(cd packages; ./download.sh)
msi:
$(MAKE) $(AM_MAKEFLAGS) -C src msi
msi-signed:
$(MAKE) $(AM_MAKEFLAGS) -C src msi-signed
msi-upload:
$(MAKE) $(AM_MAKEFLAGS) -C src msi-upload
diff --git a/patches-appimage/gnupg-2.3.7/0001-dirmngr-Fix-NTBTLS-include-for-test.patch b/patches-appimage/gnupg-2.3.7/0001-dirmngr-Fix-NTBTLS-include-for-test.patch
new file mode 100755
index 00000000..9af9e18a
--- /dev/null
+++ b/patches-appimage/gnupg-2.3.7/0001-dirmngr-Fix-NTBTLS-include-for-test.patch
@@ -0,0 +1,46 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From bca00f1fba02bb738cb81b80784dd8fdd68b6629 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke
+Date: Tue, 16 Aug 2022 16:28:45 +0200
+Subject: [PATCH GnuPG] dirmngr: Fix NTBTLS include for test
+
+* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add NTBTLS.
+
+--
+This fixes the build in case every lib is installed into its
+own prefix.
+---
+ dirmngr/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
+index 5221a5d71..f346e693e 100644
+--- a/dirmngr/Makefile.am
++++ b/dirmngr/Makefile.am
+@@ -167,7 +167,8 @@ t_ldap_parse_uri_SOURCES = \
+ $(ldap_url) $(t_common_src)
+ t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \
+ $(LIBGCRYPT_CFLAGS) \
+- $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
++ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) \
++ $(NTBTLS_CFLAGS)
+ t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
+
+ t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
+--- a/dirmngr/Makefile.in 2022-07-11 12:30:34.000000000 +0200
++++ b/dirmngr/Makefile.in 2022-08-16 19:36:04.413283025 +0200
+@@ -794,7 +794,8 @@
+
+ t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \
+ $(LIBGCRYPT_CFLAGS) \
+- $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
++ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) \
++ $(NTBTLS_CFLAGS)
+
+ t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
+ t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
+--
+2.30.2
diff --git a/patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch b/patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch
index 3c08f20e..d926836d 100755
--- a/patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch
+++ b/patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch
@@ -1,17 +1,24 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bed53d1..87f976c 100644
---- CMakeLists.txt.orig 2018-02-28 08:33:32.052419561 +0100
-+++ CMakeLists.txt 2018-02-28 08:35:44.523986191 +0100
-@@ -39,7 +39,7 @@
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake"
- SOVERSION 5)
+--- a/CMakeLists.txt.orig 2022-08-11 16:55:07.647126624 +0200
++++ b/CMakeLists.txt 2022-08-16 17:31:31.609503511 +0200
+@@ -26,7 +26,7 @@
+ set(REQUIRED_QT_VERSION 5.15.2)
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
-if (NOT ANDROID)
-+if (FALSE)
- find_package(KF5Auth ${KF_DEP_VERSION} REQUIRED)
++if (NOT ANDROID AND NOT WIN32)
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus)
endif()
- find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED)
+
+@@ -44,7 +44,7 @@
+ cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+
+-if (NOT ANDROID AND NOT WIN32)
++if (FALSE)
+ option(WITH_KAUTH "Build with KAuth support" ON)
+ else()
+ set(WITH_KAUTH OFF)
diff --git a/patches-appimage/kleopatra/set-cxx-standard.patch b/patches-appimage/kleopatra/set-cxx-standard.patch
deleted file mode 100755
index c4318438..00000000
--- a/patches-appimage/kleopatra/set-cxx-standard.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7d1cfc9..05e750ac 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif()
- add_definitions(-DQT_NO_EMIT)
- remove_definitions(-DQT_NO_FOREACH)
-+set(CMAKE_CXX_STANDARD 17)
-
- kde_enable_exceptions()
- option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)