Page MenuHome GnuPG
Files F23020683

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index b34efb4e..e3bb3f6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,175 +1,177 @@
# 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/gpgol-2.6.0/0001-Fix-fixing-T6646.patch \
+ patches/gpgol-2.6.0/0002-ribbon_status_icon_fix-050508.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/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/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/kjobwidgets/0001-Remove-knotification.patch \
patches/knotifications/0001-Fix-build-wihout-QDbus.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/okular-202503101125/qtpolicy-mr-1143.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/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-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/okular-202503101125/qtpolicy-mr-1143.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.common
(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/gpgol-2.6.0/0001-Fix-fixing-T6646.patch b/patches/gpgol-2.6.0/0001-Fix-fixing-T6646.patch
new file mode 100755
index 00000000..2fd8f75f
--- /dev/null
+++ b/patches/gpgol-2.6.0/0001-Fix-fixing-T6646.patch
@@ -0,0 +1,32 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+ Fixes-commit: a95d340e478f8fb9529b49b0518a0fafa4d00bfe
+ GnuPG-bug-id: 6646
+
+
+diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
+index 06af440..32d5c87 100644
+--- a/src/ribbon-callbacks.cpp
++++ b/src/ribbon-callbacks.cpp
+@@ -556,12 +556,15 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
+ if (ret==NULL)
+ {
+ auto retV = Mail::searchMailsByUUID(uid);
+- if (retV.empty())
++ if (!retV.empty())
++ {
++ ret = retV.front();
++ }
++ else
+ {
+ log_error ("%s:%s: Failed to find mail %p in map.",
+ SRCNAME, __func__, mailitem);
+ }
+- ret = retV.front();
+ }
+ xfree (uid);
+
+--
+2.39.2
diff --git a/patches/gpgol-2.6.0/0002-ribbon_status_icon_fix-050508.patch b/patches/gpgol-2.6.0/0002-ribbon_status_icon_fix-050508.patch
new file mode 100755
index 00000000..217fc407
--- /dev/null
+++ b/patches/gpgol-2.6.0/0002-ribbon_status_icon_fix-050508.patch
@@ -0,0 +1,74 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+
+diff --git a/src/explorer-events.cpp b/src/explorer-events.cpp
+index 3389bf6..9f7c7d8 100644
+--- a/src/explorer-events.cpp
++++ b/src/explorer-events.cpp
+@@ -110,11 +110,37 @@ hasSelection (LPDISPATCH explorer)
+ }
+
+ int count = get_oom_int (selection, "Count");
+- gpgol_release (selection);
+
+ if (count)
+ {
+- return true;
++ LPDISPATCH selectitem = NULL, mailitem = NULL;
++ bool selected = true;
++ if (count == 1)
++ {
++ // If we call this on a selection with more items
++ // Outlook sends an ItemLoad event for each mail
++ // in that selection.
++ selectitem = get_oom_object (selection, "Item(1)");
++ mailitem = get_object_by_id (selectitem, IID_MailItem);
++ if (!mailitem)
++ {
++ log_debug ("%s:%s: New selection is no mail.",
++ SRCNAME, __func__);
++ selected = false;
++ }
++
++ gpgol_release (mailitem);
++ gpgol_release (selectitem);
++ }
++ else
++ {
++ selected = false; // We can't show the security level for more than one => show insecure
++ }
++
++ gpgol_release (selection);
++ return selected;
+ }
++
++ gpgol_release (selection);
+ return false;
+ }
+diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
+index 8bfa2ce..09a8298 100644
+--- a/src/ribbon-callbacks.cpp
++++ b/src/ribbon-callbacks.cpp
+@@ -562,15 +562,18 @@ get_mail_from_control (LPDISPATCH ctrl, bool *none_selected)
+ }
+ else
+ {
+- log_error ("%s:%s: Failed to find mail %p in map.",
++ log_debug ("%s:%s: Failed to find mail %p in map.",
+ SRCNAME, __func__, mailitem);
+ }
++ TRACEPOINT;
+ }
++ TRACEPOINT;
+ xfree (uid);
+-
++ TRACEPOINT;
+ /* This release may have killed the Mail object we obtained earlier
+ * if it was just a leftover mail in the ribbon. */
+ gpgol_release (mailitem);
++ TRACEPOINT;
+ if (!Mail::isValidPtr (ret))
+ {
+ log_err ("Mail was only valid for this context.");

File Metadata

Mime Type
text/x-diff
Expires
Mon, May 12, 6:32 PM (1 d, 16 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
47/a6/6b9f8d8ccf8751447acee420ef99

Event Timeline