Page MenuHome GnuPG
Files F34134496

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
index dfc3b0ef..843a10c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,192 +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/gpgol-2.6.1/0001-Use-gpgme_off_t-and-gpgme_ssize_t-everywhere-for-Gpg.patch \
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/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-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/qthttpserver/originAuthenticationRequired.patch \
- patches/qgpgme-2.0.0-beta28/propagate-encryption-flags.patch \
- patches/gpgmepp-2.0.0-beta26/add-recipients-encryption-flags.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.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/gpgmepp-2.0.0-beta26/add-recipients-encryption-flags.patch b/patches/gpgmepp-2.0.0-beta26/add-recipients-encryption-flags.patch
deleted file mode 100644
index 541c57d7..00000000
--- a/patches/gpgmepp-2.0.0-beta26/add-recipients-encryption-flags.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-commit 7a82afe66309cb7aa9956586d11749be6c6dd6e5
-Author: Carl Schwan <carl@carlschwan.eu>
-Date: Tue Mar 18 15:43:22 2025 +0100
-
- Add missing Context::EncryptionFlags
-
- * src/context.cpp: Add AddRecipient and ChangeRecipient enum value
- --
-
-diff --git a/NEWS b/NEWS
-index c25fa14..10e3ddb 100644
---- a/NEWS
-+++ b/NEWS
-@@ -15,21 +15,25 @@ Noteworthy changes in version 2.0.0 (unreleased)
- * New function Context::generateRandomValue to get a cryptographically
- strong unsigned integer random value. [T6694]
-
-+ * New flag to re-encrypt OpenPGP data (requires GnuPG 2.5.1). [D607]
-+
- * Removed the TrustItem listing functionality which used GpgME's trustlist
- feature which worked only for a short period in 2003. [T4834]
-
- * Interface changes relative to the 1.24 branch of gpgme:
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- Context::RandomMode NEW.
-- Context::generateRandomBytes NEW.
-- Context::generateRandomValue NEW.
-- RandomBytesResult NEW.
-- RandomValueResult NEW.
-- Context::startTrustItemListing REMOVED.
-- Context::nextTrustItem REMOVED.
-- Context::endTrustItemListing REMOVED.
-- EventLoopInteractor::nextTrustItemEvent REMOVED.
-- TrustItem REMOVED.
-+ Context::RandomMode NEW.
-+ Context::generateRandomBytes NEW.
-+ Context::generateRandomValue NEW.
-+ Context::EncryptionFlags::AddRecipient NEW.
-+ Context::EncryptionFlags::ChangeRecipient NEW.
-+ RandomBytesResult NEW.
-+ RandomValueResult NEW.
-+ Context::startTrustItemListing REMOVED.
-+ Context::nextTrustItem REMOVED.
-+ Context::endTrustItemListing REMOVED.
-+ EventLoopInteractor::nextTrustItemEvent REMOVED.
-+ TrustItem REMOVED.
-
-
- Noteworthy changes in earlier versions can be found in the NEWS file of
-diff --git a/src/context.cpp b/src/context.cpp
-index 5ee1b84..0bd6aeb 100644
---- a/src/context.cpp
-+++ b/src/context.cpp
-@@ -1354,6 +1354,12 @@ static gpgme_encrypt_flags_t encryptflags2encryptflags(Context::EncryptionFlags
- if (flags & Context::EncryptFile) {
- result |= GPGME_ENCRYPT_FILE;
- }
-+ if (flags & Context::AddRecipient) {
-+ result |= GPGME_ENCRYPT_ADD_RECP;
-+ }
-+ if (flags & Context::ChangeRecipient) {
-+ result |= GPGME_ENCRYPT_CHG_RECP;
-+ }
- return static_cast<gpgme_encrypt_flags_t>(result);
- }
-
-diff --git a/src/context.h b/src/context.h
-index 151ea8c..818ae88 100644
---- a/src/context.h
-+++ b/src/context.h
-@@ -469,7 +469,9 @@ public:
- EncryptWrap = 128,
- WantAddress = 256,
- EncryptArchive = 512,
-- EncryptFile = 1024
-+ EncryptFile = 1024,
-+ AddRecipient = 2048,
-+ ChangeRecipient = 4096,
- };
- EncryptionResult encrypt(const std::vector<Key> &recipients, const Data &plainText, Data &cipherText, EncryptionFlags flags);
- GpgME::Error encryptSymmetrically(const Data &plainText, Data &cipherText);
diff --git a/patches/okular-202503101125/qtpolicy-mr-1143.patch b/patches/okular-202503101125/qtpolicy-mr-1143.patch
deleted file mode 100644
index 609082fb..00000000
--- a/patches/okular-202503101125/qtpolicy-mr-1143.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-patch -p1 -f -l $* < $0
-exit $?
-
-From fc2c9e2c77b6027a1b772e51b410a4965848a37b Mon Sep 17 00:00:00 2001
-From: Carl Schwan <carl.schwan@gnupg.com>
-Date: Tue, 11 Mar 2025 11:21:21 +0100
-Subject: [PATCH] Fix build without QML
-
-QTP0001 is declared in Qt Declarative and is only needed for the QML
-version, so put it in the if BUILD_MOBILE block.
-
-The error was:
-QTP0001 is not a known Qt policy. Did you include the necessary Qt module?
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c443d2469..7e9d429a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,8 +147,6 @@ else()
- set(HAVE_JS 0)
- endif()
-
--qt_policy(SET QTP0001 NEW)
--
- if (BUILD_DESKTOP)
- # shall we use DBus?
- # enabled per default on Linux & BSD systems
-@@ -198,6 +196,8 @@ if (BUILD_MOBILE)
- PURPOSE "Required at runtime by the mobile app"
- TYPE RUNTIME
- )
-+
-+ qt_policy(SET QTP0001 NEW)
- endif()
-
- if(NOT WIN32 AND NOT ANDROID AND NOT APPLE AND NOT HAIKU)
---
-GitLab

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 8, 7:49 AM (12 h, 39 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
cd/b2/b0d65a0b1237f8ca49a4a0b88443

Event Timeline