diff --git a/Makefile.am b/Makefile.am
index 19477f6b..a3117675 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,131 +1,132 @@
# 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/kcoreaddons/0001-Add-KSharedDataCache-for-Windows.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/kleopatra/set-windows-registry.patch \
+ patches/kleopatra/0001-Revert-new-dependency-to-KCMUtils.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/0001-WIP-Remove-dependency-to-dbus.patch \
patches/kservice/0001-Remove-unused-include.patch \
patches/okular/0001-WIP-Buildfix-with-reduced-depdencies.patch \
patches/poppler/0001-Explicitly-take-posix-variant-for-mingw-gcc-cross.patch \
patches/poppler/0001-Use-central-function-to-find-Font-for-signing.patch \
patches/kparts/0001-Dirty-hack-to-remove-KTextWidgets.patch \
patches/jpeg/fix-redefine.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/packages/packages.common b/packages/packages.common
index 4506b6a6..596cc8df 100644
--- a/packages/packages.common
+++ b/packages/packages.common
@@ -1,523 +1,523 @@
# packages.common - list of packages for use with gpg4win -*- sh -*-
#
# The download script processes the statements here to
# actually download the packages. The syntax is trivial:
#
# If the first non whitespace character of a line is #, the line is
# considered a comment. If the first word of a line is "server", the
# rest of the line will be taken as the base URL for following file
# commands. If the first word of a line is "file" the rest of the
# line will be appended to the current base URL (with a / as
# delimiter). The statement "chk" is followed by the SHA256 checksum of
# the last file.
#
# zlib
#
server https://gnupg.org/ftp/gcrypt
# last-changed: 2022-04-07
# by: wk
# verified: swdb
file zlib/zlib-1.2.12.tar.gz
chk 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
#
# GNU
#
server ftp://ftp.gnu.org/pub/gnu
# last-changed: 2017-02-15
# by: ah
# verified: Sig 68D9 4D8A AEEA D48A E7DC 5B90 4F49 4A94 2E46 16C2
file libiconv/libiconv-1.15.tar.gz
chk ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
# last-changed: 2021-08-17
# by: ah (checksum added by ik)
# verified: Sig 9001 B85A F9E1 B83D F1BD A942 F5BE 8B26 7C6A 406D
file gettext/gettext-0.21.tar.xz
chk d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
# last-changed: 2023-05-03
# by ah
# verified: verification of checksum from both sf and libpng.org
server https://downloads.sourceforge.net
file libpng/libpng16/1.6.39/libpng-1.6.39.tar.xz
chk 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
# verified: verification of checksum from multiple sources
server https://www.ijg.org
name jpeg-9e.tar.gz
file files/jpegsrc.v9e.tar.gz
chk 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
# last-changed: 2023-05-03
# by ah
# verified: verification of checksum from multiple sources e.g. homebrew
server https://github.com/uclouvain/openjpeg/archive/refs/tags/
name openjpeg-2.5.0.tar.gz
file v2.5.0.tar.gz
chk 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
# last-changed: 2023-05-03
# by ah
# verified: SIG B1FA7D81EEB8E66399178B9733EBBFC47B3DD87D
server https://download.osgeo.org
file libtiff/tiff-4.5.0.tar.xz
chk dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c
#
# GIMP stuff for W32
#
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2012-03-28 wk - Not updated - not a security problem
name pkgconfig-0.23.tar.gz
file pkg-config-0.23.tar.gz
chk 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
name pkgconfig-0.23.zip
file pkg-config_0.23-3_win32.zip
chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278
server https://download.savannah.gnu.org/releases/
# last-changed: 2023-04-19
# by: ah
# verified: SIG E30674707856409FF1948010BE6C3AAC63AD8E3F
file freetype/freetype-2.13.0.tar.xz
chk 5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
#
# SQLite
#
server https://www.sqlite.org
# last changed: 2021-09-20
# by: ik
# verified: SHA1 checksum on https://web.archive.org/web/20190228201545/https://www.sqlite.org/download.html
name sqlite-3.27.2.tar.gz
file 2019/sqlite-autoconf-3270200.tar.gz
chk 50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e
#
# Stripped down version of BZIP2
# (full source at http://bzip.org)
#
server ftp://ftp.g10code.com/g10code/bzip2
# checked: 2014-07-16 ah
file bzip2-1.0.6-g10.tar.gz
chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
#
# GnuPG et al.
#
# All tarballs from this server are verified with an openpgp
# signature made by "Werner Koch (dist sig)" or one of the other
# gnupg main contributors.
# Server changed from ftp to https by wk 2021-09-22
server https://gnupg.org/ftp/gcrypt
# last changed 2023-04-11
# by wk
# verified: swdb
file libgpg-error/libgpg-error-1.47.tar.bz2
chk 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
# last-changed: 2021-04-21
# by: ah
# verified: distsigkey.gpg
file libassuan/libassuan-2.5.5.tar.bz2
chk 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
# last changed 2021-09-20
# by ik
# verified: distsigkey.gpg
file npth/npth-1.6.tar.bz2
chk 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1
# last changed 2022-12-19
# by ah
# verified: Signature from: 6DAA6E64A76D2840571B4902528897B826403ADA
file libksba/libksba-1.6.3.tar.bz2
chk 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
# last changed 2022-04-07
# by wk
# verified: swdb
file ntbtls/ntbtls-0.3.1.tar.bz2
chk 8922181fef523b77b71625e562e4d69532278eabbd18bc74579dbe14135729ba
#name gnupg-msi-2.3.1-beta18-20210420-src.tar.xz
#file binary/gnupg-w32-2.3.1_20210420.tar.xz
#chk e1a2dc705c940938b7bf7a17f521a41b1ef14139acd8860b2fd59aed2750aa3b
#name gnupg-msi-2.3.1-20210420-bin.wixlib
#file binary/gnupg-w32-2.3.1_20210420.wixlib
#chk 133817a4c4d11996956676c5c200222839ee5dc16e9476bd682d4e68b33ef73e
# pinentry
# last changed: 2022-08-24
# by: wk
# verified: swdb
file pinentry/pinentry-1.2.1.tar.bz2
chk 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
# last changed 2023-04-20
# by wk
# verified: [build tree]
file gpgme/gpgme-1.20.0.tar.bz2
chk 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
# last changed: 2021-01-07
# by: ah
file scute/scute-1.7.0.tar.bz2
chk 437fe758b27c243a5ee2535c6b065ea1d09f2c9a02d83567d2f934bb6395c249
# GpgOL
# last-changed: 2022-12-19
# by: ah
# verified: build tree
file gpgol/gpgol-2.5.6.tar.bz2
chk f4d05b53e57fc362437236aab71c50d8e3bd441cf48986512d04dfc89faaa3c1
#
# GpgEX
#
# last-changed: 2022-11-18
# by: ah
# verified: distsigkey.gpg
#file gpgex/gpgex-1.0.10-beta5.tar.bz2
#chk f7e4c619aefed02dfbb07363a4435878a50999b290c60779e670fceb826e283e
#
# GnuPG utilities
#
server http://www.jabberwocky.com/software/paperkey
# last-changed: 2017-12-05
# by: ah
# verified: SIG 7D92 FD31 3AB6 F373 4CC5 9CA1 DB69 8D71 9924 2560
file paperkey-1.5.tar.gz
chk c4737943083ce92e41faf13c27a9d608105b6285c0840dfb684a7ee294142ddf
#
# Kleopatra and dependencies
#
# Qt base
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz.sha256
server http://download.qt.io/official_releases/qt/
name qtbase-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz
chk 909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
# Qt Tools
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256
name qttools-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz
chk c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
# Qt Winextras
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz.sha256
name qtwinextras-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz
chk 65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e
# Qt X11 extras
# last changed: 2021-09-20
# by: ik
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz.sha256
name qtx11extras-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz
chk 7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e
# Qt WaylandClient
# last changed: 2021-09-21
# by: ik
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz.sha256
name qtwayland-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz
chk 193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5
# Qt svg
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz.sha256
name qtsvg-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz
chk 8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e
# Qt translations
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz.sha256
name qttranslations-5.15.2.tar.xz
file 5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz
chk d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
# KDE Frameworks generated by gen-frameworks.sh
# When outdated activate this link:
#server https://download.kde.org/Attic/frameworks/
server https://download.kde.org/stable/frameworks
##### Paste Here #####
#
# Don't forget to update gpg4win.mk.in with new version numbers
#
# extra-cmake-modules
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/extra-cmake-modules-5.104.0.tar.xz
chk e49eb21fdb66634b84cccbf6ba65eae3f8e0eee0dc72d50f627280f49df585d9
# kconfig
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kconfig-5.104.0.tar.xz
chk b8e7a6b7b0e78e3eb01755a965d893bd95c231befeff10479243e5a182ec2938
# ki18n
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/ki18n-5.104.0.tar.xz
chk fe815b9e28c680fa472c7ab56e4d7934a8915f19409734a13433797a4be14ee1
# kwidgetsaddons
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kwidgetsaddons-5.104.0.tar.xz
chk 4abbb552cd43e51ad2070d8780ca7112e2c9771c2258734ae4a97712b9123120
# kcompletion
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kcompletion-5.104.0.tar.xz
chk b0ed0246871283df04c62f0df2b221e32911cb4d292d5ae42f860958032eb510
# kwindowsystem
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kwindowsystem-5.104.0.tar.xz
chk 6b10ee354ebb7d2dfd6baa1374929d30811f8169c8233e55849e31e38e6af81a
# kcoreaddons
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kcoreaddons-5.104.0.tar.xz
chk ed760d4a7fed6c03480dcc3cfe621a49ac5ca9853c846080afe393f7ce794e40
# kcodecs
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kcodecs-5.104.0.tar.xz
chk 7ec909f6865eba87a99b046a9aeaa6a83c01308ad1dda87be3f69e91a7909d6b
# kconfigwidgets
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kconfigwidgets-5.104.0.tar.xz
chk eb9014b813a1c8a18c78ef11be296964b31338e5237080a74234bf97ead64522
# kdbusaddons
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kdbusaddons-5.104.0.tar.xz
chk 4c6add0481c407bc3768729e27e8644feba748c333872e62aaa3260338fd56b4
# kxmlgui
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kxmlgui-5.104.0.tar.xz
chk f45d5a5411b3ca0197c1e4720c27c7d85e351aeee03aca861066e8db3c7c93e6
# kguiaddons
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kguiaddons-5.104.0.tar.xz
chk fb8d8de25b684af6f9e9e893912664a18231486ac995d2522676018c3e93840d
# kitemviews
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kitemviews-5.104.0.tar.xz
chk 94920dc68c187319fa79c64e194e9ebecaef8c97fc4bd6aba342c18bc75a48bc
# kitemmodels
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kitemmodels-5.104.0.tar.xz
chk 0bac2fe2fc607443e3332911655ced5dd309e346f2f6a2ff3f29b2f45b7b18d7
# kiconthemes
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kiconthemes-5.104.0.tar.xz
chk 70f4d9f950acdaa28b539838226ed1cff7e70cdcf177272185bac7c75a6cccdf
# breeze-icons
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/breeze-icons-5.104.0.tar.xz
chk ff2dacc3fb6f1c7acd378638329f2e5b5fc4fdb3dab1321716d2d54b32eaae6a
# karchive
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/karchive-5.104.0.tar.xz
chk b62f3dfe68691ad2917d0592d66ffc02cfbcc7571b7d1fb1d3fadd695534fd2e
# kcrash
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kcrash-5.104.0.tar.xz
chk 12d6004f9e2e51a9d74f044462753dd7410e10a40a1f6b07727dcd5b52a7ea96
# kio
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kio-5.104.0.tar.xz
chk 5a8b93a5de72406fc4cc7b9aa4715be6d1d5264e617b26be257f5d0e26dde310
# kbookmarks
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kbookmarks-5.104.0.tar.xz
chk 85e565590233cfc6dc8c3459717c327961e79c74199d4d1c2741b40946936354
# kservice
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kservice-5.104.0.tar.xz
chk 215b109738ea5a10f97c4abbd3c9b9da58c826127708eddd34af345b4e8ad8a3
# solid
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/solid-5.104.0.tar.xz
chk 2a9a33bc71b4cafec35b9692bd7681a736eeb4e4b81c25f5bd87dbec38c143cf
# kjobwidgets
# last changed: 2023-03-22
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kjobwidgets-5.104.0.tar.xz
chk 3b254124d3bf20666a514710fef8990325da2ade14f49368b1bed1256eb8fea1
# threadweaver
# last changed: 2023-04-19
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/threadweaver-5.104.0.tar.xz
chk 963decfdf0cf780406eb585efdb213539a00cd16ae4dff2b2ffe8822a609a647
# kparts
# last changed: 2023-04-19
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.104/kparts-5.104.0.tar.xz
chk 66a40646cc4890669991cc63d33803ec335b0c08b7aeb0476b2a852951e700cd
### END PASTE ###
server http://download.kde.org/stable/release-service/
# kmime
# last changed: 2022-02-01
# by: ah
# verified: PGP Sig D81C0CB38EB725EF6691C385BB463350D6EF31EF
#file 21.12.1/src/kmime-21.12.1.tar.xz
#chk c1f4c06c61f6b4ddde7395b1cfb1f2411a32638e09c6f0a58c6557a7dffe4120
#
# Snapshots stored on the GnuPG server
#
server https://gnupg.org/ftp/gcrypt/snapshots
# gpgex
# last changed: 2022-12-06
# by: aheinecke
# verified: Tarball created by aheinecke.
file gpgex/gpgex-1.0.10-beta5.tar.xz
chk 2c227634528ef76bcca7fd4b7fe5c38a535f6e68bbe5b2cdc6cc4a74810b2dba
# gpg4win-tools
# last changed: 2022-08-29
# by: aheinecke
# verified: Tarball created by aheinecke.
file gpg4win-tools/gpg4win-tools-202208290924.tar.xz
chk fe20b69d84893618625d76e55f772477a80628da98411c8bb9c1a5e01028b3f9
# kmime
# last changed: 2023-03-22
# by: aheinecke
# verified: Tarball created by aheinecke.
file kmime/kmime-202303221649.tar.xz
chk 0a26c6b7a1b921191e52ee17d8d131f606a1def9ed09e31074a1c7aed5c4c6b7
# libkleo
-# last changed: 2023-03-22
+# last changed: 2023-05-08
# by: aheinecke
# verified: Tarball created by aheinecke.
-file libkleo/libkleo-202303221217.tar.xz
-chk 0dfe1000d56242c95b54dd59be831e4a11f6bf19b194c922e719638c5eef98fa
+file libkleo/libkleo-202305081104.tar.xz
+chk f5cfb5527330abe428a90bbbec55cbcd1b8f503ea1f7c529b710715d4ff5eaef
# kleopatra
-# last changed: 2023-03-22
+# last changed: 2023-05-08
# by: aheinecke
# verified: Tarball created by aheinecke.
-file kleopatra/kleopatra-202303221715.tar.xz
-chk 8b78bc7d5487db5ae6fa1addc9756f24922a9af8386210f453c015e3f0e30eab
+file kleopatra/kleopatra-202305081143.tar.xz
+chk 33aa068d1e2349d8039a8fdd6b9b3ea0924f88df569f753152866d75997941a6
# Okular and dependencies
# poppler
# last changed: 2023-05-04
# by: aheinecke
# verified: Tarball created by aheinecke.
file poppler/poppler-202305041410.tar.xz
chk ba2e334f1f1a7285a5b4af6280094f0664ff2348f3c041f77bd3e721e472a131
# okular
# last changed: 2023-05-04
# by: aheinecke
# verified: Tarball created by aheinecke.
file okular/okular-202305041409.tar.xz
chk 1bc74f8b35cc5fae5937eeda387742249fab878ec06c2e573e00efe0f90c7339
diff --git a/patches/kleopatra/0001-Revert-new-dependency-to-KCMUtils.patch b/patches/kleopatra/0001-Revert-new-dependency-to-KCMUtils.patch
new file mode 100755
index 00000000..e3b07b3c
--- /dev/null
+++ b/patches/kleopatra/0001-Revert-new-dependency-to-KCMUtils.patch
@@ -0,0 +1,549 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 921618cd885d6006aa277fd599aee4af1ec04c2b Mon Sep 17 00:00:00 2001
+From: Andre Heinecke
+Date: Mon, 8 May 2023 12:27:43 +0200
+Subject: [PATCH] Revert new dependency to KCMUtils
+
+Might not be a problem but I don't have the time to package this
+for Gpg4win right now.
+
+Revert "Keep alphabetical order of required/linked modules
+
+This reverts commit 0a03443ccbba19698710e1bac226866d9b2a7813.
+
+Revert "Do not use a local include for the external kcmutils_version.h"
+
+This reverts commit 00dd596fb3c43aba67f185f89d9c59661cca4af2.
+
+Revert "Port to new api"
+
+This reverts commit e41c6de418b84951d0e3fe50577a4bb9bc4b6755.
+---
+ CMakeLists.txt | 1 -
+ src/conf/CMakeLists.txt | 4 +-
+ src/conf/appearanceconfigpage.cpp | 10 ----
+ src/conf/appearanceconfigpage.h | 6 +--
+ src/conf/cryptooperationsconfigpage.cpp | 12 +----
+ src/conf/cryptooperationsconfigpage.h | 6 +--
+ src/conf/dirservconfigpage.cpp | 51 -------------------
+ src/conf/dirservconfigpage.h | 8 +--
+ src/conf/gnupgsystemconfigurationpage.cpp | 13 -----
+ src/conf/gnupgsystemconfigurationpage.h | 6 +--
+ src/conf/kleopageconfigdialog.cpp | 7 +--
+ src/conf/smartcardconfigpage.cpp | 17 -------
+ src/conf/smartcardconfigpage.h | 8 +--
+ src/conf/smimevalidationconfigurationpage.cpp | 13 -----
+ src/conf/smimevalidationconfigurationpage.h | 7 +--
+ 15 files changed, 13 insertions(+), 156 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e2f3d8a..2fc9cfba 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -98,7 +98,6 @@ find_package(KF${KF_MAJOR_VERSION} ${KF5_WANT_VERSION}
+ I18n
+ IconThemes
+ ItemModels
+- KCMUtils
+ KIO
+ WidgetsAddons
+ WindowSystem
+diff --git a/src/conf/CMakeLists.txt b/src/conf/CMakeLists.txt
+index 6d1fd11a..21aa7cc7 100644
+--- a/src/conf/CMakeLists.txt
++++ b/src/conf/CMakeLists.txt
+@@ -60,10 +60,10 @@ set_property(TARGET kcm_kleopatra_static PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ target_link_libraries(kcm_kleopatra_static
+ KPim${KF_MAJOR_VERSION}::Libkleo
+- KF${KF_MAJOR_VERSION}::I18n
+ KF${KF_MAJOR_VERSION}::IconThemes
+- KF${KF_MAJOR_VERSION}::KCMUtils
++ KF${KF_MAJOR_VERSION}::I18n
+ KF${KF_MAJOR_VERSION}::WidgetsAddons
++ KF${KF_MAJOR_VERSION}::ConfigWidgets
+ ${_kcm_kleopatra_extra_libs}
+ ${_kleopatra_dbusaddons_libs}
+ ${_kcm_kleopatra_libkleopatraclient_extra_LIBS}
+diff --git a/src/conf/appearanceconfigpage.cpp b/src/conf/appearanceconfigpage.cpp
+index 87197369..e71e9d19 100644
+--- a/src/conf/appearanceconfigpage.cpp
++++ b/src/conf/appearanceconfigpage.cpp
+@@ -18,21 +18,11 @@
+ using namespace Kleo;
+ using namespace Kleo::Config;
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ AppearanceConfigurationPage::AppearanceConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule(parent, args)
+-#else
+-AppearanceConfigurationPage::AppearanceConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto lay = new QVBoxLayout(this);
+ mWidget = new AppearanceConfigWidget(this);
+-#else
+- auto lay = new QVBoxLayout(widget());
+- mWidget = new AppearanceConfigWidget(widget());
+-#endif
+ lay->addWidget(mWidget);
+
+ connect(mWidget, &AppearanceConfigWidget::changed, this, &Kleo::Config::AppearanceConfigurationPage::markAsChanged);
+diff --git a/src/conf/appearanceconfigpage.h b/src/conf/appearanceconfigpage.h
+index 7abff68d..fcd8d817 100644
+--- a/src/conf/appearanceconfigpage.h
++++ b/src/conf/appearanceconfigpage.h
+@@ -8,7 +8,7 @@
+ */
+
+ #pragma once
+-#include
++
+ #include
+ namespace Kleo
+ {
+@@ -24,11 +24,7 @@ class AppearanceConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ explicit AppearanceConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit AppearanceConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
+
+ public Q_SLOTS:
+ void load() override;
+diff --git a/src/conf/cryptooperationsconfigpage.cpp b/src/conf/cryptooperationsconfigpage.cpp
+index 4688a139..2f8c3463 100644
+--- a/src/conf/cryptooperationsconfigpage.cpp
++++ b/src/conf/cryptooperationsconfigpage.cpp
+@@ -18,22 +18,12 @@
+ using namespace Kleo;
+ using namespace Kleo::Config;
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ CryptoOperationsConfigurationPage::CryptoOperationsConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule(parent, args)
+-#else
+-CryptoOperationsConfigurationPage::CryptoOperationsConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto lay = new QVBoxLayout(this);
+- mWidget = new CryptoOperationsConfigWidget(this);
+-#else
+- auto lay = new QVBoxLayout(widget());
+- mWidget = new CryptoOperationsConfigWidget(widget());
+-#endif
+ lay->setContentsMargins(0, 0, 0, 0);
++ mWidget = new CryptoOperationsConfigWidget(this);
+ lay->addWidget(mWidget);
+ connect(mWidget, &CryptoOperationsConfigWidget::changed, this, &Kleo::Config::CryptoOperationsConfigurationPage::markAsChanged);
+ }
+diff --git a/src/conf/cryptooperationsconfigpage.h b/src/conf/cryptooperationsconfigpage.h
+index b6e95da6..5c0dcef6 100644
+--- a/src/conf/cryptooperationsconfigpage.h
++++ b/src/conf/cryptooperationsconfigpage.h
+@@ -8,7 +8,7 @@
+ */
+
+ #pragma once
+-#include
++
+ #include
+ namespace Kleo
+ {
+@@ -24,11 +24,7 @@ class CryptoOperationsConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ explicit CryptoOperationsConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit CryptoOperationsConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
+
+ public Q_SLOTS:
+ void load() override;
+diff --git a/src/conf/dirservconfigpage.cpp b/src/conf/dirservconfigpage.cpp
+index 9925fc59..4862c0dc 100644
+--- a/src/conf/dirservconfigpage.cpp
++++ b/src/conf/dirservconfigpage.cpp
+@@ -112,11 +112,7 @@ private:
+ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurationPage *q)
+ {
+ mConfig = QGpgME::cryptoConfig();
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto glay = new QGridLayout(q);
+-#else
+- auto glay = new QGridLayout(q->widget());
+-#endif
+ glay->setContentsMargins(0, 0, 0, 0);
+
+ // OpenPGP keyserver
+@@ -125,11 +121,7 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
+ auto l = new QHBoxLayout{};
+ l->setContentsMargins(0, 0, 0, 0);
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ mOpenPGPKeyserverEdit.createWidgets(q);
+-#else
+- mOpenPGPKeyserverEdit.createWidgets(q->widget());
+-#endif
+ mOpenPGPKeyserverEdit.label()->setText(i18n("OpenPGP keyserver:"));
+ l->addWidget(mOpenPGPKeyserverEdit.label());
+ l->addWidget(mOpenPGPKeyserverEdit.widget());
+@@ -142,19 +134,11 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
+ // X.509 servers
+ if (Settings{}.cmsEnabled()) {
+ ++row;
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto groupBox = new QGroupBox{i18n("X.509 Directory Services"), q};
+-#else
+- auto groupBox = new QGroupBox{i18n("X.509 Directory Services"), q->widget()};
+-#endif
+ auto groupBoxLayout = new QVBoxLayout{groupBox};
+
+ if (gpgme_check_version("1.16.0")) {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ mDirectoryServices = new Kleo::DirectoryServicesWidget(q);
+-#else
+- mDirectoryServices = new Kleo::DirectoryServicesWidget(q->widget());
+-#endif
+ if (QLayout *l = mDirectoryServices->layout()) {
+ l->setContentsMargins(0, 0, 0, 0);
+ }
+@@ -164,15 +148,8 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
+ } else {
+ // QGpgME does not properly support keyserver flags for X.509 keyservers (added in GnuPG 2.2.28);
+ // disable the configuration to prevent the configuration from being corrupted
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ groupBoxLayout->addWidget(new QLabel{i18n("Configuration of directory services is not possible "
+ "because the used gpgme libraries are too old."), q});
+-#else
+- groupBoxLayout->addWidget(new QLabel{i18n("Configuration of directory services is not possible "
+- "because the used gpgme libraries are too old."),
+- q->widget()});
+-
+-#endif
+ }
+
+ glay->addWidget(groupBox, row, 0, 1, 3);
+@@ -180,11 +157,7 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
+
+ // LDAP timeout
+ ++row;
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ mTimeout.createWidgets(q);
+-#else
+- mTimeout.createWidgets(q->widget());
+-#endif
+ mTimeout.label()->setText(i18n("LDAP &timeout (minutes:seconds):"));
+ mTimeout.widget()->setDisplayFormat(QStringLiteral("mm:ss"));
+ connect(mTimeout.widget(), &QTimeEdit::timeChanged,
+@@ -194,11 +167,7 @@ DirectoryServicesConfigurationPage::Private::Private(DirectoryServicesConfigurat
+
+ // Max number of items returned by queries
+ ++row;
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ mMaxItems.createWidgets(q);
+-#else
+- mMaxItems.createWidgets(q->widget());
+-#endif
+ mMaxItems.label()->setText(i18n("&Maximum number of items returned by query:"));
+ mMaxItems.widget()->setMinimum(0);
+ #if QT_DEPRECATED_SINCE(5, 14)
+@@ -472,41 +441,21 @@ CryptoConfigEntry *DirectoryServicesConfigurationPage::Private::configEntry(cons
+ CryptoConfigEntry *const entry = Kleo::getCryptoConfigEntry(mConfig, componentName, entryName);
+ if (!entry) {
+ if (showError == DoShowError) {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ KMessageBox::error(q, i18n("Backend error: gpgconf does not seem to know the entry for %1/%2", QLatin1String(componentName), QLatin1String(entryName)));
+-#else
+- KMessageBox::error(
+- q->widget(),
+- i18n("Backend error: gpgconf does not seem to know the entry for %1/%2", QLatin1String(componentName), QLatin1String(entryName)));
+-#endif
+ }
+ return nullptr;
+ }
+ if (entry->argType() != argType || entry->isList() != bool(multiplicity)) {
+ if (showError == DoShowError) {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ KMessageBox::error(q, i18n("Backend error: gpgconf has wrong type for %1/%2: %3 %4", QLatin1String(componentName), QLatin1String(entryName), entry->argType(), entry->isList()));
+-#else
+- KMessageBox::error(q->widget(),
+- i18n("Backend error: gpgconf has wrong type for %1/%2: %3 %4",
+- QLatin1String(componentName),
+- QLatin1String(entryName),
+- entry->argType(),
+- entry->isList()));
+-#endif
+ }
+ return nullptr;
+ }
+ return entry;
+ }
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule{parent, args}
+-#else
+-DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ , d{new Private{this}}
+ {
+ }
+diff --git a/src/conf/dirservconfigpage.h b/src/conf/dirservconfigpage.h
+index 254da70d..da9377a2 100644
+--- a/src/conf/dirservconfigpage.h
++++ b/src/conf/dirservconfigpage.h
+@@ -8,7 +8,7 @@
+ */
+
+ #pragma once
+-#include
++
+ #include
+
+ #include
+@@ -22,11 +22,7 @@ class DirectoryServicesConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+- explicit DirectoryServicesConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit DirectoryServicesConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
++ explicit DirectoryServicesConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = {});
+ ~DirectoryServicesConfigurationPage() override;
+
+ public Q_SLOTS:
+diff --git a/src/conf/gnupgsystemconfigurationpage.cpp b/src/conf/gnupgsystemconfigurationpage.cpp
+index cac84525..5fe36d63 100644
+--- a/src/conf/gnupgsystemconfigurationpage.cpp
++++ b/src/conf/gnupgsystemconfigurationpage.cpp
+@@ -18,30 +18,17 @@
+
+ using namespace Kleo::Config;
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ GnuPGSystemConfigurationPage::GnuPGSystemConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule(parent, args)
+-#else
+-GnuPGSystemConfigurationPage::GnuPGSystemConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto lay = new QVBoxLayout(this);
+-#else
+- auto lay = new QVBoxLayout(widget());
+-#endif
+ lay->setContentsMargins(0, 0, 0, 0);
+
+ QGpgME::CryptoConfig *const config = QGpgME::cryptoConfig();
+
+ mWidget = new CryptoConfigModule(config,
+ CryptoConfigModule::TabbedLayout,
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ this);
+-#else
+- widget());
+-#endif
+ lay->addWidget(mWidget);
+
+
+diff --git a/src/conf/gnupgsystemconfigurationpage.h b/src/conf/gnupgsystemconfigurationpage.h
+index 4ea4e4af..481df410 100644
+--- a/src/conf/gnupgsystemconfigurationpage.h
++++ b/src/conf/gnupgsystemconfigurationpage.h
+@@ -7,7 +7,7 @@
+ SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ #pragma once
+-#include
++
+ #include
+ namespace Kleo
+ {
+@@ -23,11 +23,7 @@ class GnuPGSystemConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ explicit GnuPGSystemConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit GnuPGSystemConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
+ ~GnuPGSystemConfigurationPage() override;
+
+ public Q_SLOTS:
+diff --git a/src/conf/kleopageconfigdialog.cpp b/src/conf/kleopageconfigdialog.cpp
+index 676ae0b1..57b1b527 100644
+--- a/src/conf/kleopageconfigdialog.cpp
++++ b/src/conf/kleopageconfigdialog.cpp
+@@ -22,8 +22,6 @@
+
+ #include "kleopageconfigdialog.h"
+
+-#include
+-
+ #include
+ #include
+ #include
+@@ -193,11 +191,8 @@ void KleoPageConfigDialog::slotHelpClicked()
+ void KleoPageConfigDialog::addModule(const QString &name, const QString &docPath, const QString &icon, KCModule *module)
+ {
+ mModules << module;
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
++
+ KPageWidgetItem *item = addPage(module, name);
+-#else
+- KPageWidgetItem *item = addPage(module->widget(), name);
+-#endif
+ item->setIcon(QIcon::fromTheme(icon));
+ #if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ connect(module, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
+diff --git a/src/conf/smartcardconfigpage.cpp b/src/conf/smartcardconfigpage.cpp
+index 7e160213..b8a4260d 100644
+--- a/src/conf/smartcardconfigpage.cpp
++++ b/src/conf/smartcardconfigpage.cpp
+@@ -40,11 +40,7 @@ public:
+ };
+
+ SmartCardConfigurationPage::Private::Private(SmartCardConfigurationPage *qq)
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ : mReaderPort{new ReaderPortSelection{qq}}
+-#else
+- : mReaderPort{new ReaderPortSelection{qq->widget()}}
+-#endif
+ {
+ }
+
+@@ -57,31 +53,18 @@ CryptoConfigEntry *SmartCardConfigurationPage::Private::readerPortConfigEntry(co
+ return Kleo::getCryptoConfigEntry(config, "scdaemon", "reader-port");
+ }
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ SmartCardConfigurationPage::SmartCardConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule{parent, args}
+-#else
+-SmartCardConfigurationPage::SmartCardConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ , d{std::make_unique(this)}
+ {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto mainLayout = new QVBoxLayout{this};
+-#else
+- auto mainLayout = new QVBoxLayout{widget()};
+-#endif
+ mainLayout->setContentsMargins(0, 0, 0, 0);
+
+ {
+ auto l = new QHBoxLayout{};
+ l->setContentsMargins(0, 0, 0, 0);
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto label = new QLabel{i18n("Smart card reader to use:"), this};
+-#else
+- auto label = new QLabel{i18n("Smart card reader to use:"), widget()};
+-#endif
+ label->setBuddy(d->mReaderPort);
+
+ l->addWidget(label);
+diff --git a/src/conf/smartcardconfigpage.h b/src/conf/smartcardconfigpage.h
+index aa38f152..d7954f80 100644
+--- a/src/conf/smartcardconfigpage.h
++++ b/src/conf/smartcardconfigpage.h
+@@ -9,7 +9,7 @@
+ */
+
+ #pragma once
+-#include
++
+ #include
+
+ #include
+@@ -23,11 +23,7 @@ class SmartCardConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+- explicit SmartCardConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit SmartCardConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
++ explicit SmartCardConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = {});
+ ~SmartCardConfigurationPage() override;
+
+ void load() override;
+diff --git a/src/conf/smimevalidationconfigurationpage.cpp b/src/conf/smimevalidationconfigurationpage.cpp
+index 3ec893a9..b0e690cf 100644
+--- a/src/conf/smimevalidationconfigurationpage.cpp
++++ b/src/conf/smimevalidationconfigurationpage.cpp
+@@ -15,26 +15,13 @@
+
+ using namespace Kleo::Config;
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ SMimeValidationConfigurationPage::SMimeValidationConfigurationPage(QWidget *parent, const QVariantList &args)
+ : KCModule(parent, args)
+-#else
+-SMimeValidationConfigurationPage::SMimeValidationConfigurationPage(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
+- : KCModule(parent, data, args)
+-#endif
+ {
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ auto lay = new QVBoxLayout(this);
+-#else
+- auto lay = new QVBoxLayout(widget());
+-#endif
+ lay->setContentsMargins(0, 0, 0, 0);
+
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ mWidget = new SMimeValidationConfigurationWidget(this);
+-#else
+- mWidget = new SMimeValidationConfigurationWidget(widget());
+-#endif
+ lay->addWidget(mWidget);
+
+ connect(mWidget, &SMimeValidationConfigurationWidget::changed, this, &Kleo::Config::SMimeValidationConfigurationPage::markAsChanged);
+diff --git a/src/conf/smimevalidationconfigurationpage.h b/src/conf/smimevalidationconfigurationpage.h
+index e53ebe85..eaa0344d 100644
+--- a/src/conf/smimevalidationconfigurationpage.h
++++ b/src/conf/smimevalidationconfigurationpage.h
+@@ -7,7 +7,7 @@
+ SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ #pragma once
+-#include
++
+ #include
+ namespace Kleo
+ {
+@@ -20,11 +20,8 @@ class SMimeValidationConfigurationPage : public KCModule
+ {
+ Q_OBJECT
+ public:
+-#if KCMUTILS_VERSION < QT_VERSION_CHECK(5, 240, 0)
+ explicit SMimeValidationConfigurationPage(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
+-#else
+- explicit SMimeValidationConfigurationPage(QObject *parent, const KPluginMetaData &data = {}, const QVariantList &args = QVariantList());
+-#endif
++
+ public Q_SLOTS:
+ void load() override;
+ void save() override;
+--
+2.40.1