Merge branch 'gpg4win-5-branch'
14ee2719e291
Actions

Description

Merge branch 'gpg4win-5-branch'

master is now the gpg4win-5-branch. The old master is available
as gpg4win-4-branch.

These conflicts were fresolved by deleting the files to match their
deleted status in gpg4win-5-branch:
packages/kleopatra-24.05-de-full-translation.po
packages/packages.3
packages/packages.4

Merge branch 'gpg4win-5-branch'14ee2719e291Actions

Description

Details

Event Timeline

Merged Changes

Changes (547)Show All Changes

Very Large Commit

rW14ee2719e291

.gitignore

Makefile.am

README

acinclude.m4

autogen.rc

autogen.sh

build-aux/authenticode-sign.sh

build-aux/gpg-authcode-sign.sh

build-aux/install-sh

build-aux/missing

build.sh

configure.ac

doc/pkg-copyright.txt

docker/appimage/Dockerfile

docker/appimage/Dockerfile-CentOS7

docker/build-appimage-docker-image.sh

docker/build-gpg4win-docker-image.sh

docker/gpg4win-bookworm/Dockerfile

docker/gpg4win-bullseye

docker/gpg4win-bullseye/Dockerfile

docker/run-appimage-build.sh

docker/run-gpg4win-build.sh

m4/appimage.m4

m4/gpg4win.m4

packages/BUILDTYPE

packages/Makefile.am

packages/distsigkey.gpg

packages/download.sh

packages/gen-frameworks.sh

packages/gen-gnupg.sh

packages/gen-kde-gears.sh

packages/gen-tarball.sh

packages/get-gpg-package.sh

packages/kde-release-keys.gpg

packages/kleopatra-24.05-de-full-translation.po

packages/packages.3

packages/packages.4

packages/packages.common

patches-appimage/breeze

patches-appimage/extra-cmake-modules

patches-appimage/gpgme

patches-appimage/kcalendarcore

patches-appimage/kcoreaddons

patches-appimage/kcrash/0001-Add-option-to-disable-OpenGL-support.patch

patches-appimage/kjobwidgets

patches-appimage/kwidgetsaddons

patches-appimage/okular-202503101125

patches-appimage/okular/0001-Add-support-to-customize-about-data.patch

patches-appimage/okular/0001-Make-KF5Pty-dependency-optional.patch

patches-appimage/okular/0001-Make-KF6Pty-dependency-optional.patch

patches-appimage/poppler

patches-appimage/poppler/fix-gpg-error-include.patch

patches-appimage/qtsvg

patches-appimage/qtwayland-5.15.0

patches-appimage/qtwayland-5.15.0/00-disable-wayland-server.patch

patches/breeze-icons/0001-Add-folder-edit-sign-encrypt-icon.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/add-the-nose.patch

patches/breeze-icons/azz-Make-all-breeze-icons-available-in-breeze-dark.patch

patches/breeze-icons/remove-kleopatra-icons.patch

patches/breeze-icons/subset-crossbuild.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/gpgol-2.6.0/0001-Fix-fixing-T6646.patch

patches/gpgol-2.6.0/0002-ribbon_status_icon_fix-050508.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

Merge branch 'gpg4win-5-branch'
14ee2719e291
Actions

Changes (547)
Show All Changes