Page MenuHome GnuPG
Files F26446322

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index ccf45f04..19332f74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,188 +1,189 @@
# 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-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
# git ls-files patches | sed 's/$/ \\/' | sed 's/^/ /'
# git ls-files patches-appimage | sed 's/$/ \\/' | sed 's/^/ /'
EXTRA_DIST = build.sh autogen.rc autogen.sh VERSION README.GIT ONEWS \
doc/license-page doc/GPLv3 build.sh \
build-aux/git-log-footer build-aux/git-log-fix \
build-aux/gpg-authcode-sign.sh \
docker/appimage/Dockerfile \
docker/appimage/Dockerfile-CentOS7 \
docker/gpg4win-bookworm/Dockerfile \
patches/breeze-icons/0001-Add-16x16-variant-of-data-success.patch \
patches/breeze-icons/0002-Add-nicer-16x16-variant-of-dialog-question.patch \
patches/breeze-icons/0003-Add-data-question-status-icon-similar-to-other-data-.patch \
patches/breeze-icons/0004-Add-symbolic-variants-of-status-icons-for-usage-with.patch \
patches/breeze-icons/0001-Allow-to-disable-building-of-the-icon-library-native.patch \
patches/breeze-icons/0001-Draft-Handle-cross-compiling-for-tools.patch \
patches/breeze-icons/remove-kleopatra-icons.patch \
patches/breeze/0001-Do-not-alias-QtOpenGL-and-QtNetwork.patch \
patches/breeze/0001-Fix-toolbar-colors-in-high-contrast-mode.patch \
patches/breeze/0002-fix-ifdef-windows-qmenu.patch \
patches/breeze/0002-kstyle-Support-registering-QMainWindow-in-tools-area.patch \
patches/breeze/0003-Add-helper-for-checking-if-high-contrast-color-schem.patch \
patches/breeze/0004-For-high-contrast-draw-hovered-menu-bar-items-like-s.patch \
patches/breeze/0005-For-high-contrast-draw-hovered-menu-items-like-selec.patch \
patches/extra-cmake-modules/0001-Do-not-abort-without-QML-native.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/jpeg/fix-redefine.patch \
patches/kcalendarcore/0001-Add-option-to-build-without-QML.patch \
patches/kcolorscheme/0001-Add-support-for-high-contrast-color-themes-on-Window.patch \
patches/kcolorscheme/0002-Initialize-color-scheme-from-system-palette-if-high-.patch \
patches/kcolorscheme/0003-Remove-assert-in-createApplicationPalette.patch \
patches/kconfig-6.11.0/0001-Fix-double-unescaping-of-config-keys.patch \
+ patches/kconfig-6.11.0/0002-Fix-reading-of-localized-config-values-on-Windows-an.patch \
patches/kcoreaddons/0001-Fix-MINGW-build.patch \
patches/kguiaddons/0001-Add-support-for-high-contrast-mode-on-Windows.patch \
patches/kguiaddons/0002-DRAFT-There-is-no-dark-mode-on-old-Windows.patch \
patches/ki18n/0001-Undef-snprintf-for-windows.patch \
patches/kiconthemes/0001-Remove-code-for-Qt-older-than-6.8.patch \
patches/kiconthemes/0001-Add-helper-for-checking-if-high-contrast-color-schem.patch \
patches/kiconthemes/0002-Use-symbolic-icons-if-high-contrast-color-scheme-is-.patch \
patches/kjobwidgets/0001-Remove-knotification.patch \
patches/knotifications/0001-Fix-build-wihout-QDbus.patch \
patches/kwidgetsaddons/0001-Add-helper-for-checking-if-high-contrast-color-schem.patch \
patches/kwidgetsaddons/0002-KMessageWidget-Don-t-draw-background-if-high-contras.patch \
patches/kwidgetsaddons/0003-KPageView-Use-correct-icon-mode-if-high-contrast-col.patch \
patches/libical/workaround-weird-mingw-10.0.0-issue.patch \
patches/libkleo/0001-Revert-Explicitly-use-Boost-s-cmake-config-file-for-.patch \
patches/mimetreeparser-25.04.2/fix-multiple-connect.patch \
patches/okular/0001-Add-GnuPG-specific-manifest-to-okular.patch \
patches/okular/0001-Add-support-to-customize-about-data.sik \
patches/okular/lower-cmake-requirement.patch \
patches/okular/pgp-default-true.patch \
patches/pcre2/cross-build-cmake.patch \
patches/qtbase-6.7.3/0001-QIcon-enable-icon-engine-plugins-to-implement-themes.patch \
patches/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \
patches/qtbase/0001-Make-queryHighContrast-a-file-static.patch \
patches/qtbase/0002-Use-correct-tool-tip-colors-for-high-contrast-modes.patch \
patches/qtbase/0003-Use-system-colors-if-high-contrast-mode-is-active.patch \
patches/qtbase/add-kleopatras-mime-types.patch \
patches/qtbase/configurable-windowstheme.patch \
patches/qtbase/qt_use_share_instead_of_data.patch \
patches/qthttpserver/originAuthenticationRequired.patch \
patches-appimage/breeze/0001-Do-not-alias-QtOpenGL-and-QtNetwork.patch \
patches-appimage/breeze/0002-fix-ifdef-windows-qmenu.patch \
patches-appimage/extra-cmake-modules/0001-Do-not-abort-without-QML-native.patch \
patches-appimage/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches-appimage/kcalendarcore/0001-Add-option-to-build-without-QML.patch \
patches-appimage/kcrash/0001-Add-option-to-disable-OpenGL-support.patch \
patches-appimage/kjobwidgets/0001-Remove-knotification.patch \
patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch \
patches-appimage/okular/lower-cmake-requirement.patch \
patches-appimage/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \
patches-appimage/qtbase/add-kleopatras-mime-types.patch \
patches-appimage/qtbase/configurable-windowstheme.patch \
patches-appimage/qtbase/qt_use_share_instead_of_data.patch
dist-hook: gen-ChangeLog pack_packages_tarballs
if BUILD_W64_COND
w64_extraargs=" --w64"
endif
distcheck-hook:
set -e; ( \
pref="#+macro: gpg4win_" ;\
reldate="$$(date -u +%Y-%m-%d)" ;\
echo "$${pref}ver $(PACKAGE_VERSION)" ;\
echo "$${pref}date $${reldate}" ;\
list='$(DIST_ARCHIVES)'; for i in $$list; do \
case "$$i" in *.tar.bz2) \
echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
esac;\
done ) | tee $(distdir).swdb
# Names of to help the release target.
RELEASE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
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
# We also need to package all tarballs. Actually it would be better
# to pack only those which are listed in packages.current but for this
# wen need to extend the script and also handle the package list for
# appimages. Note further that we can't use ln(1) because /src and
# /build are on different partitions inside docker.
.PHONY: pack_packages_tarballs
pack_packages_tarballs:
(find $(top_srcdir)/packages -type f \
\( -name '*.tar.gz' -o -name '*.tar.bz2' \
-o -name '*.tar.xz' -o -name '*.zip' \
-o -name '*.exe' -o -name '*.wixlib' \
\) -print | xargs cp -t $(distdir)/packages/ )
download: packages/packages.list
(cd packages; ./download.sh)
vsd-versions: src/stamps/stamp-versions-all-signed
rebuild:
./build.sh --update-img --inplace $(w64_extraargs)
clean-local:
-rm -rf artifacts
-rm -f $(RELEASE_NAME).tar.xz files-to-commit.lst
distclean-local:
-rm -f $(RELEASE_NAME).swdb
msi:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi
msi-signed:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi-signed
msi-upload:
$(MAKE) $(AM_MAKEFLAGS) -C src \
TOPSRCDIR=/src PLAYGROUND=/build msi-upload
diff --git a/patches/kconfig-6.11.0/0002-Fix-reading-of-localized-config-values-on-Windows-an.patch b/patches/kconfig-6.11.0/0002-Fix-reading-of-localized-config-values-on-Windows-an.patch
new file mode 100644
index 00000000..57fcecdc
--- /dev/null
+++ b/patches/kconfig-6.11.0/0002-Fix-reading-of-localized-config-values-on-Windows-an.patch
@@ -0,0 +1,156 @@
+#! /bin/sh
+patch -p1 -f -l $* < $0
+exit $?
+
+From b85702bd17539b8374c9e4f3977e012036c01913 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Thu, 26 Jun 2025 17:02:01 +0200
+Subject: [PATCH] Fix reading of localized config values on Windows (and macOS)
+
+On Linux, this works already because QLocale respects LANGUAGE on Linux
+(and there's no separate "display language" like on Windows). On Windows
+(and macOS), we need to use the same workaround as in ki18n for handling
+LANGUAGE (which is used by kxmlgui to set the user-configured
+application-specific language override) and for preferring the configured
+display language over the system language (aka the default language of the
+Windows installation).
+---
+ autotests/CMakeLists.txt | 2 +-
+ autotests/kconfigtest.cpp | 41 +++++++++++++++++++++++++++++++++++++++
+ autotests/kconfigtest.h | 1 +
+ src/core/kconfig.cpp | 22 ++++++++++++++++++++-
+ 4 files changed, 64 insertions(+), 2 deletions(-)
+
+diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+index 0901c0c7..97e6e224 100644
+--- a/autotests/CMakeLists.txt
++++ b/autotests/CMakeLists.txt
+@@ -38,7 +38,7 @@ ecm_add_tests(
+ ksharedconfig_in_global_object.cpp
+ dbussanitizertest.cpp
+ NAME_PREFIX kconfigcore-
+- LINK_LIBRARIES KF6::ConfigCore Qt6::Test Qt6::Concurrent
++ LINK_LIBRARIES KF6::ConfigCore Qt6::Test Qt6::Concurrent Qt6::CorePrivate
+ )
+
+ add_dependencies(test_kconf_update kconf_update)
+diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
+index cd0bcaaf..32f905ba 100644
+--- a/autotests/kconfigtest.cpp
++++ b/autotests/kconfigtest.cpp
+@@ -21,6 +21,8 @@
+ #include <kconfigwatcher.h>
+ #include <ksharedconfig.h>
+
++#include <private/qlocale_p.h> // QSystemLocale
++
+ #ifdef Q_OS_UNIX
+ #include <utime.h>
+ #endif
+@@ -28,6 +30,8 @@
+ #include <unistd.h> // getuid
+ #endif
+
++using namespace Qt::StringLiterals;
++
+ KCONFIGGROUP_DECLARE_ENUM_QOBJECT(KConfigTest, Testing)
+ KCONFIGGROUP_DECLARE_FLAGS_QOBJECT(KConfigTest, Flags)
+
+@@ -1547,6 +1551,43 @@ void KConfigTest::testLocaleConfig()
+ QFile::remove(file);
+ }
+
++void KConfigTest::testLocaleConfigWithOverrideLanguage()
++{
++ // simulate usage of language override (kxmlgui);
++ // we need to create a new QSystemLocale to make Qt update the locale
++ qputenv("LANGUAGE", "ca");
++ QSystemLocale newSystemLocale{};
++
++ // Initialize the testdata
++ QDir().mkpath(m_testConfigDir);
++ const QString file = m_testConfigDir + QLatin1String("/localized.test");
++ QFile::remove(file);
++ QFile f(file);
++ QVERIFY(f.open(QIODevice::WriteOnly));
++ QTextStream ts(&f);
++ ts << "[Test]\n";
++ ts << "foo=4\n";
++ ts << "foo[ca]=5\n";
++ ts << "foostring=primary\n";
++ ts << "foostring[ca]=nice\n";
++ ts << "foobool=primary\n";
++ ts << "foobool[ca]=true\n";
++ f.close();
++
++ // Load the testdata
++ QVERIFY(QFile::exists(file));
++ KConfig config(file);
++ QVERIFY(config.locale().startsWith("ca"_L1));
++
++ KConfigGroup cg2(&config, QStringLiteral("Test"));
++ QCOMPARE(cg2.readEntry("foo", 3), 5);
++ QCOMPARE(cg2.readEntry("foostring"), QStringLiteral("nice"));
++ QCOMPARE(cg2.readEntry("foobool", false), true);
++
++ // Clean up after the testcase
++ QFile::remove(file);
++}
++
+ void KConfigTest::testDeleteWhenLocalized()
+ {
+ // Initialize the testdata
+diff --git a/autotests/kconfigtest.h b/autotests/kconfigtest.h
+index e7d7a47f..fa1474e5 100644
+--- a/autotests/kconfigtest.h
++++ b/autotests/kconfigtest.h
+@@ -78,6 +78,7 @@ private Q_SLOTS:
+ void testSharedConfig();
+ void testOptionOrder();
+ void testLocaleConfig();
++ void testLocaleConfigWithOverrideLanguage();
+ void testDirtyAfterRevert();
+ void testKdeGlobals();
+ void testLocalDeletion();
+diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
+index 7618ea8a..e25e751e 100644
+--- a/src/core/kconfig.cpp
++++ b/src/core/kconfig.cpp
+@@ -68,6 +68,26 @@ static const Qt::CaseSensitivity sPathCaseSensitivity = Qt::CaseSensitive;
+ static const Qt::CaseSensitivity sPathCaseSensitivity = Qt::CaseInsensitive;
+ #endif
+
++static QString getDefaultLocaleName()
++{
++#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
++ if (QLocale() == QLocale::system()) {
++ // If the default locale hasn't been changed then
++ // On Windows and Apple OSs, we cannot use QLocale::system() if an application-specific
++ // language was set by kxmlgui because Qt ignores LANGUAGE on Windows and Apple OSs.
++ if (const auto languages = qEnvironmentVariable("LANGUAGE").split(u':', Qt::SkipEmptyParts); !languages.isEmpty()) {
++ return languages.front();
++ }
++ // Also prefer the configured display language over the system language
++ if (const auto languages = QLocale::system().uiLanguages(); !languages.isEmpty()) {
++ // uiLanguages() uses dashes as separator, but KConfig assumes underscores
++ return languages.value(0).replace(u'-', u'_');
++ }
++ }
++#endif
++ return QLocale().name();
++}
++
+ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStandardPaths::StandardLocation resourceType)
+ : openFlags(flags)
+ , resourceType(resourceType)
+@@ -118,7 +138,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStandardPaths::Standar
+ // mappingsRegistered = true;
+ // }
+
+- setLocale(QLocale().name());
++ setLocale(getDefaultLocaleName());
+ }
+
+ bool KConfigPrivate::lockLocal()
+--
+2.50.0

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 17, 12:51 AM (1 d, 13 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
7e/3c/b2f5f211ce1224e5750a25980a8d

Event Timeline