diff --git a/Makefile.am b/Makefile.am
index bb94e0e0..edc89764 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,128 +1,128 @@
# 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-xz 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/build-gpg4win-docker-image.sh \
docker/gpg4win-bullseye/Dockerfile \
docker/run-appimage-build.sh \
docker/run-gpg4win-build.sh \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.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.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/kcoreaddons/0001-Fix-MINGW-build.patch \
patches/ki18n/0001-Undef-snprintf-for-windows.patch \
patches/kio/Fix-cross-build.patch \
patches/kservice/0001-Remove-unused-include.patch \
patches/okular/0001-WIP-Buildfix-with-reduced-depdencies.patch \
- patches/poppler/0001-Explicitly-set-pthread-for-gcc-windows-builds.patch \
+ patches/poppler/0001-Explicitly-take-posix-variant-for-mingw-gcc-cross.patch \
patches/kparts/0001-Dirty-hack-to-remove-KTextWidgets.patch \
patches-appimage/kconfigwidgets/0001-build-without-KF5Auth.patch \
patches-appimage/kconfigwidgets/fake-version.patch \
patches-appimage/qtwayland-5.15.0/00-disable-wayland-server.patch \
patches-appimage/libkleo/set-cxx-standard.patch \
patches-appimage/kmime/set-cxx-standard.patch \
patches-appimage/gnupg-2.3.7/0001-dirmngr-Fix-NTBTLS-include-for-test.patch \
patches-appimage/kleopatra/0001-po-Update-German-translation-for-3.1.26.patch \
patches-appimage/libkleo/0001-po-Update-German-translation-for-kleopatra-3.1.26.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/poppler/0001-Explicitly-set-pthread-for-gcc-windows-builds.patch b/patches/poppler/0001-Explicitly-set-pthread-for-gcc-windows-builds.patch
deleted file mode 100755
index 288ec918..00000000
--- a/patches/poppler/0001-Explicitly-set-pthread-for-gcc-windows-builds.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From d15297a555d9358655d0687249261de284ece3fc Mon Sep 17 00:00:00 2001
-From: Andre Heinecke
-Date: Thu, 27 Apr 2023 17:18:25 +0200
-Subject: [PATCH] Explicitly set -pthread for gcc windows builds
-
-We need pthread on windows explicity on windows if
-gcc-win32 is used and not gcc-posix.
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5d81fb47..bde58a22 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -580,6 +580,11 @@ if(WIN32)
- add_definitions(-DWIN32_LEAN_AND_MEAN)
- # gdi32 is needed under win32
- set(poppler_LIBS ${poppler_LIBS} gdi32)
-+ if (CMAKE_SYSTEM_NAME STREQUAL GNU)
-+ # we need pthread on windows explicity on windows if
-+ # gcc-win32 is used and not gcc-posix
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
-+ endif()
- endif()
- if(PNG_FOUND)
- set(poppler_LIBS ${poppler_LIBS} PNG::PNG)
---
-2.40.0
diff --git a/patches/poppler/0001-Explicitly-take-posix-variant-for-mingw-gcc-cross.patch b/patches/poppler/0001-Explicitly-take-posix-variant-for-mingw-gcc-cross.patch
new file mode 100755
index 00000000..5bb2ea18
--- /dev/null
+++ b/patches/poppler/0001-Explicitly-take-posix-variant-for-mingw-gcc-cross.patch
@@ -0,0 +1,51 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 13e3852bd004c0e9608dab4d892d63997e67bae6 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke
+Date: Thu, 27 Apr 2023 17:18:25 +0200
+Subject: [PATCH] Explicitly take posix variant for mingw-gcc cross
+
+We need pthread on windows explicity on windows if
+gcc-win32 is used and not gcc-posix.
+
+Due to some changes we might have accidentally made on the
+build system it seems that -win32 is forced there and the
+-pthreads flags set in the CMake Way are ignored. So we just
+do a brutal:
+ set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
+
+For now to get it to compile before we can investigate the
+issue further.
+---
+ CMakeLists.txt | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d81fb47..cee95933 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -580,6 +580,20 @@ if(WIN32)
+ add_definitions(-DWIN32_LEAN_AND_MEAN)
+ # gdi32 is needed under win32
+ set(poppler_LIBS ${poppler_LIBS} gdi32)
++ # we need pthread on windows explicity on windows if
++ # gcc-win32 is used and not gcc-posix
++ if (CMAKE_HOST_SYSTEM_NAME STREQUAL Linux)
++
++ # XXX: Find out if the line below this comment was caused
++ # by us changing update alternatives explicitly for the compiler
++ set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++-posix)
++
++ # This is probably the correct solution
++ set(CMAKE_THREAD_PREFER_THREAD PTHREAD)
++ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
++ find_package(Threads REQUIRED)
++ set(poppler_LIBS ${poppler_LIBS} Threads::Threads)
++ endif()
+ endif()
+ if(PNG_FOUND)
+ set(poppler_LIBS ${poppler_LIBS} PNG::PNG)
+--
+2.40.0