diff --git a/Makefile.am b/Makefile.am
index 03114af0..8baddaa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,99 +1,102 @@
# 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-bzip2 no-dist-gzip
DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
SUBDIRS = po packages doc src
# find patches -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 \
patches/boost/boost-1-fixes.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib/glib-1-fixes.patch \
patches/glib/glib-2-fixes.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/kxmlgui/0001-make-qdbus-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/qtbase/0001-Fix-build-without-std-thread.patch \
patches/qtbase/0002-Gpg4win-theme-names-and-relpaths.patch \
patches/qtbase/0001-Gpg4win-qstandardpaths-patch.patch \
patches/qttools/disable-most-tools.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch \
patches/libkleo/lower-cmake-requirement.patch \
patches/libkleo/0001-Revert-Use-more-target-centric-cmake-code.patch \
+ patches/libkleo/set-cxx-standard.patch \
+ patches/kleopatra/set-cxx-standard.patch \
patches/kleopatra/lower-cmake-requirement.patch \
+ patches/kleopatra/build-fixes.patch \
patches/gpgme/0001-cpp-Use-keyID-as-fallback-for-primaryFingerprint.patch \
patches/gpgol/0001-Enable-sync-encryption-again.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.current
(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.current b/packages/packages.current
index f209f9e1..fbdcd3a3 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -1,601 +1,601 @@
# packages.current - list of current 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 SHA1 checksum of
# the last file.
#
# zlib
#
server http://zlib.net
# last-changed: 2017-01-23
# by: ah
# verified: Sig 5ED4 6A67 21D3 6558 7791 E2AA 783F CD8E 58BC AFBA
file zlib-1.2.11.tar.gz
chk c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
#
# 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
# verified: Sig 9001 B85A F9E1 B83D F1BD A942 F5BE 8B26 7C6A 406D
file gettext/gettext-0.21.tar.xz
# Glib needs PCRE
# last-changed: 2021-09-02
# verified: Sig: 45F6 8D54 BBE2 3FB3 039B 46E5 9766 E084 FB0F 43D8
server https://ftp.pcre.org/pub/pcre/
file pcre-8.44.tar.gz
#
# GLIB
#
# The GTK boyz seem to think that sha256sum files on the server
# magically get them a lot of additional security karma.
#
# And it's plain to see
# You were meant for me
# Yeah I'm your .sig
# Your 21th Century sig
# 21th Century sig, I wanna be your file
#
server http://ftp.gnome.org/pub/gnome/sources/glib/2.50
# last-changed: 2021-09-02
# by: ah
file glib-2.50.2.tar.xz
chk be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5
#
# GDK-PIXBUF
#
server http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/
# checked: 2015-06-05
# by: ah
# There is a 2.31 series but afaik no security problems with 2.30
# verified: with linuxfromscratch and frugalware checksums
file gdk-pixbuf-2.30.8.tar.xz
chk 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be
#
# ATK
#
server http://ftp.gnome.org/pub/gnome/sources/atk/1.32
# checked: 2013-04-29 wk (1.32.0 still the latest in 1.32)
file atk-1.32.0.tar.bz2
chk e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e
server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32
# checked: 2013-04-29 wk
name atk-1.32.0.zip
file atk_1.32.0-2_win32.zip
chk cadc6d52f2af21996a6dcba7b1fac27ce66721e14d1c4ab21fde7bc9965f5037
# checked: 2013-04-29 wk
name atk-dev-1.32.0.zip
file atk-dev_1.32.0-2_win32.zip
chk 5021d64043d270350d6a8d50b91db691a7421a68ca0bfa4eeb0c8804a176ac44
#
# PANGO
#
server http://ftp.gnome.org/pub/gnome/sources/pango/1.29
# fixme: 2013-04-29 wk - There is a 1.29.5 but no 1.29.5 binaries
# What shall we do: Update to 1.32? There are no
# 1.32 binaries either.
file pango-1.29.4.tar.bz2
chk f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b
server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29
name pango-1.29.4.zip
file pango_1.29.4-1_win32.zip
chk e1b865ae2e4054388c598f92b34593b3d24d7fd15e6308c8926ee634717c21ce
name pango-dev-1.29.4.zip
file pango-dev_1.29.4-1_win32.zip
chk 0d7fb255e65ed4bd43acedab4405986e4877b87ba8227d5fa22b38330485e3cb
#
# CAIRO
#
server http://cairographics.org/releases
# checked: 2013-04-29 wk - 1.10.2 is the latest in the 1.10 series.
file cairo-1.10.2.tar.gz
chk 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-07-16 ah most recent package on that server is from
# 2012-09-27 TODO -> Move to another source / source build of those
# dependencies
# checked: 2013-04-29 wk
name cairo-1.10.2.zip
file cairo_1.10.2-2_win32.zip
chk e6c361ec1df4ccb23edbe5b68db16329d563a19eeee7fa70d583dda3d2358f4e
name cairo-dev-1.10.2.zip
file cairo-dev_1.10.2-2_win32.zip
chk b86f875bf776bbf578e3fa8c46866b84c93200b962b30d03cf795f82157e3167
# checked: 2013-04-29 wk
file freetype-2.4.2.tar.bz2
chk 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
name freetype-2.4.2.zip
file freetype_2.4.2-1_win32.zip
chk bdf67e6573363fd2256a58295931cc1186382fd0ad1fe420059d6ffdb5fba7c0
name freetype-dev-2.4.2.zip
file freetype-dev_2.4.2-1_win32.zip
chk eed58c2807b65d5e0ec78031e89f1628577ad76bf47f02eaecde432c0b99eae9
server http://www.fontconfig.org/release
# checked: 2013-04-29 wk - 2.8.0 still the latest in 2.8
file fontconfig-2.8.0.tar.gz
chk fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-04-29 wk
name fontconfig-2.8.0.zip
file fontconfig_2.8.0-2_win32.zip
chk 9d6bcaeed0eced43a649953132d9f2b3e15b98c7bb9e4a207872dfeade818204
name fontconfig-dev-2.8.0.zip
file fontconfig-dev_2.8.0-2_win32.zip
chk 2f15af3d27ca507dad2a208e58409f484aa7e7c7eac10b49edca079b31ae7073
server ftp://ftp.g10code.com/g10code/misc
# checked: 2013-04-29 wk - 2.0.1 still the latest in 2.0
file expat-2.0.1.tar.gz
chk 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-04-29 wk
name expat-2.0.1.zip
file expat_2.0.1-1_win32.zip
chk 77b88ab780e698d6590426b26a877878584b9f8b6357909699674fb5045737bd
name expat-dev-2.0.1.zip
file expat-dev_2.0.1-1_win32.zip
chk 67b92b7f3441fee077bdc0094bf4dd673870acdf51899e32e199246801538162
#
# GTK+
#
server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24
# last-changed: 2015-06-05
# by: ah
# verified: chk from https://download.gnome.org/core/3.17/3.17.2/sources/SHA256SUMS-for-xz
file gtk+-2.24.28.tar.xz
chk b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
#
# 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
# PNG
# last changed: 2017-08-28
# by: js
# verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F
server ftp://ftp.simplesystems.org/pub/png/src
file libpng14/libpng-1.4.22.tar.xz
chk 8d419a8b2a5edddda5cbcb897ded92205344a3249fa7a00d6384ea23ac3ccbd8
#
# LibFFI
#
server ftp://sourceware.org/pub/libffi
# checked: 2013-04-29 wk - updated from 3.0.10.
# checked: 2014-07-16 ah - only rc availble from 3.0.14
file libffi-3.0.13.tar.gz
chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
#
# GpgOL
#
server http://files.gpg4win.org/src
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
file gpgol/gpgol-2.5.0.tar.bz2
chk 76cb742ae53cf54f2d42d258f6ba657d2b98c752d2c742b1e4f04b26a6baf0df
# for beta
#server http://files.intevation.de/projects/gpg4all
#file gpgol/gpgol-2.5.0-beta36.tar.bz2
#chk cf3431d9ffb06f6c86af4aaa35fd69f343a18854016ab7d4145844a9be8346cf
#
# GpgEX
#
server http://files.gpg4win.org/src
# last-changed: 2021-01-26
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
file gpgex/gpgex-1.0.7.tar.bz2
chk ff6b9cce03d835bbf0fbfd5fbe986ed42813ababa4a98a791da8b57d745b5848
#
# Pth emulation
#
server ftp://ftp.g10code.com/g10code/w32pth
# checked: 2014-07-16 ah
file w32pth-2.0.5.tar.bz2
chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06
#
# 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)".
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
# last changed 2021-04-21
# by ah
# verified: distsigkey.gpg
server ftp://ftp.gnupg.org/gcrypt
file libgpg-error/libgpg-error-1.42.tar.bz2
chk fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
# last-changed: 2021-04-21
# by: ah
# verified: distsigkey.gpg
file libassuan/libassuan-2.5.5.tar.bz2
chk 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
# last changed: 2021-08-27
# by: ah
# verified: distsigkey.gpg
name gnupg-w32-2.2.30-20210826-bin.exe
file binary/gnupg-w32-2.2.30_20210826.exe
chk 646833b59645a6dd1138b1a93ae384f702ee4b55b72a26b5d42a185d9b6523c4
name gnupg-w32-2.2.30-20210826-src.tar.xz
file binary/gnupg-w32-2.2.30_20210826.tar.xz
chk 0d30b30c207a1ecb0472b65f167e651d161d096d629589722ec72742d50b8b04
name gnupg-msi-2.2.30-20210826-src.tar.xz
file binary/gnupg-w32-2.2.30_20210826.tar.xz
chk 0d30b30c207a1ecb0472b65f167e651d161d096d629589722ec72742d50b8b04
name gnupg-msi-2.2.30-20210826-bin.wixlib
file binary/gnupg-w32-2.2.30_20210826.wixlib
chk 93e05470f126c64964d67d5789c74903c4f0190e44ccfa1187db1ede3fa3931f
server ftp://ftp.gnupg.org/gcrypt
# last changed: 2021-04-21
# by: ah
file pinentry/pinentry-1.2.0.tar.bz2
chk 10072045a3e043d0581f91cd5676fcac7ffee957a16636adedaa4f583a616470
# last changed: 2021-01-08
# by: wk
# verified: swdb.mac
#cd file gpgme/gpgme-1.15.1.tar.bz2
#chk eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad
# last changed: 2018-10-17
# by: ah
file gpa/gpa-0.10.0.tar.bz2
chk 95dbabe75fa5c8dc47e3acf2df7a51cee096051e5a842b4c9b6d61e40a6177b1
# last changed: 2021-01-07
# by: ah
file scute/scute-1.7.0.tar.bz2
chk 437fe758b27c243a5ee2535c6b065ea1d09f2c9a02d83567d2f934bb6395c249
#
# 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
#
# Boost
# last changes: 2016-01-21
# by: ah
# verified: Second source https://github.com/mxe/mxe/commit/fdd5b9f7aa8bf0e40c1f1f8119701af96e51457e
server http://downloads.sourceforge.net/project/boost/boost/
name boost-1.60.0.tar.bz2
file 1.60.0/boost_1_60_0.tar.bz2
chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b
# Qt base
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz.sha256
server http://download.qt.io/official_releases/qt/
name qtbase-5.15.0.tar.xz
file 5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
chk 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
# Qt Tools
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz.sha256
name qttools-5.15.0.tar.xz
file 5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
chk ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
# Qt Winextras
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz.sha256
name qtwinextras-5.15.0.tar.xz
file 5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz
chk d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
# Qt svg
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz.sha256
name qtsvg-5.15.0.tar.xz
file 5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz
chk ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
# Qt translations
# last changed: 2020-07-22
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz.sha256
name qttranslations-5.15.0.tar.xz
file 5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz
chk 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
# 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: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/extra-cmake-modules-5.77.0.tar.xz
chk 42f071f628b192122894026de20097cb0b3de411cb41c6935b48eb86ce992a65
# kconfig
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kconfig-5.77.0.tar.xz
chk 30e81a7d00cc862e9d07d0e6d0fa55b561641850b7aaffcf51d4b390f1eff981
# ki18n
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/ki18n-5.77.0.tar.xz
chk b2e1b74dedc1a3af88f04c470922d1fafb892d5846ea91ad139d421070cff357
# kwidgetsaddons
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kwidgetsaddons-5.77.0.tar.xz
chk c72094fdad6740280513ff27477003839f20555071817337d3bf5c95761d7ae4
# kcompletion
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kcompletion-5.77.0.tar.xz
chk 2ed7c90a575de468fd025688e7aa566b30003f4e43b1d7ed0c5dacafa0abf3d4
# kwindowsystem
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kwindowsystem-5.77.0.tar.xz
chk 064d31310a8568fb1900c19b955176e245d96f0b42061c15c20bc2e2a7ab4f82
# kcoreaddons
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kcoreaddons-5.77.0.tar.xz
chk 238e4cc422a62a2c3cb12915dbb52ad1a04be2ed13f59bfe3d1959266f08471d
# kcodecs
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kcodecs-5.77.0.tar.xz
chk c1b34aac21f6ab21e91e0e11f620949574678146f4407c853516c0f456e81fc4
# kconfigwidgets
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kconfigwidgets-5.77.0.tar.xz
chk 5f4a6897ef58992d38e820e8b0112069aec2ef0e7b943eb14265482c4fb22cd1
# kxmlgui
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kxmlgui-5.77.0.tar.xz
chk ae6df2146464ea403d33e8b0e4b69579428bf76c1e13f5fffb8634a65da930f1
# kguiaddons
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kguiaddons-5.77.0.tar.xz
chk df674a64142d494345daed77cb64ab5b27960ebeda94ae30287bf311acaef63c
# kitemviews
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kitemviews-5.77.0.tar.xz
chk 1013c09c47b87c51b21e6cfe5a6ed112ba43ab9b18b8d41fe7ffe2214faf1b23
# kitemmodels
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kitemmodels-5.77.0.tar.xz
chk decc3f607a0b2e9e6d585188eb6664a2cf06646db50d4d60dce83d96a0456534
# kiconthemes
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kiconthemes-5.77.0.tar.xz
chk 735834671bd32f26da075d25f4209faac04fcc6af2f4090f99d055a3a277dc79
# breeze-icons
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/breeze-icons-5.77.0.tar.xz
chk 96ad021edd6999e632991bff286f13601b898dc623388e52e82b68b5ac0a0f82
# karchive
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/karchive-5.77.0.tar.xz
chk 2239af811b9205d9f4486791f4b25ff5ea299b3873021a646e1c8b9d44c2be36
# kcrash
# last changed: 2021-01-06
# by: ah
# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
file 5.77/kcrash-5.77.0.tar.xz
chk bda5567aca769590fbdd96d82d64ef6200350e3c88029d26c7a3603ce880a84e
##### End Paste #####
# KDE Applications
# For older releases check here:
server https://download.kde.org/Attic/applications
# server http://download.kde.org/stable/applications/
# kmime
# last changed: 2020-11-12
# by: ah
# verified: PGP Sig F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
file 19.08.3/src/kmime-19.08.3.tar.xz
chk e659e1154fbc11db624f1b76bc1a8e5cf8c7f6731cef7b4ff6fad9ccf90580dd
# Snapshots which contain unreleased fixes important for Gpg4win
server http://files.intevation.de/projects/gpg4all
#by ah
#file scute/scute-1.6.0-beta187.tar.bz2
#chk 8d2a56dff6e6c12d628dd32075497326e8345c0096dec1280f7ab2c737410837
# by: ah
# file pinentry/pinentry-1.1.1-beta44.tar.bz2
# chk c2091536687cd83569c9919d6d9fc8c3a53e74d8419320bcbb8b7dc36019c677
# by: ah
file gpgme/gpgme-1.16.1-beta16.tar.bz2
chk 2aebf01c533a68372ce4b95ffaa6cd5144aa147c143f1125a947dff5d4dda6c9
# Libkleo
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
file libkleo/libkleo-202108261518.tar.gz
chk aa5e5da428075f61a3bb62e8e0065efd8756cf535558c254d1de94e6efce1ff1
# KDE-L10n
# last changed: see package date.
# by: ah
# verified: Tarball created by ah with script kde-l10n.sh
file kde-l10n/kde-l10n-202106110943-bin.tar.xz
chk 25f7fdcf28b099f4468a1b284e5b91d4bde6ad82341d8267b2258625a660bc4f
file kde-l10n/kde-l10n-202106110943-src.tar.xz
chk 2bbd748c5bd4ed6b9389ed9d05eeb9d0f543104ef916c09a1d89b1633632f2a4
# Gpg4win-tools package
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
file gpg4win-tools/gpg4win-tools-202104211124.tar.gz
chk 79ea82ede46bbd02f70a64e4f003c6279e98cf4ad1e302eca753087c42fccdf3
# Kleopatra
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-202108261520.tar.gz
-chk 4440c6992acbf05a7283e8fb62fbe878cb3f38799d2d5f0985c3a80e2245027b
+file kleopatra/kleopatra-202109140933.tar.gz
+chk e05bfc40d99ca432c3c920d50ee8fd714ddcdfa4ed02430f2aee08d6b566c06a
diff --git a/patches/kleopatra/build-fixes.patch b/patches/kleopatra/build-fixes.patch
new file mode 100755
index 00000000..7e062f7e
--- /dev/null
+++ b/patches/kleopatra/build-fixes.patch
@@ -0,0 +1,34 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/src/dialogs/certificatedetailswidget.cpp b/src/dialogs/certificatedetailswidget.cpp
+index f7783583..68745236 100644
+--- a/src/dialogs/certificatedetailswidget.cpp
++++ b/src/dialogs/certificatedetailswidget.cpp
+@@ -172,11 +172,11 @@ private:
+ hboxLayout_1->addWidget(trustChainDetailsBtn);
+
+ genRevokeBtn = new QPushButton(i18n("Generate revocation certificate"), parent);
+- genRevokeBtn->setToolTip(u"" +
++ genRevokeBtn->setToolTip(QStringLiteral("") +
+ i18n("A revocation certificate is a file that serves as a \"kill switch\" to publicly "
+ "declare that a key shall not anymore be used. It is not possible "
+ "to retract such a revocation certificate once it has been published.") +
+- u"");
++ QStringLiteral(""));
+
+ hboxLayout_1->addWidget(genRevokeBtn);
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 4a312855..5ae755e1 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -167,7 +167,7 @@ public:
+ }
+ void editKeybindings()
+ {
+- KShortcutsDialog::showDialog(q->actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, q);
++ KShortcutsDialog::configure(q->actionCollection(), KShortcutsEditor::LetterShortcutsAllowed);
+ updateSearchBarClickMessage();
+ }
diff --git a/patches/kleopatra/lower-cmake-requirement.patch b/patches/kleopatra/lower-cmake-requirement.patch
index d5ac8b10..1e4f75ae 100755
--- a/patches/kleopatra/lower-cmake-requirement.patch
+++ b/patches/kleopatra/lower-cmake-requirement.patch
@@ -1,17 +1,14 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43562b94..2f6cb167 100644
+index d7d1cfc9..11163068 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- set(kleopatra_version 3.1.16)
- # The following is for Windows. Keep in line with kleopatra_version.
- set(kleopatra_fileversion 3,1,16,0)
+@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
- project(kleopatra VERSION ${kleopatra_version})
# The RELEASE_SERVICE_VERSION is used by Gpg4win to add the Gpg4win version
+ set(RELEASE_SERVICE_VERSION_MAJOR "21")
diff --git a/patches/kleopatra/set-cxx-standard.patch b/patches/kleopatra/set-cxx-standard.patch
new file mode 100755
index 00000000..c4318438
--- /dev/null
+++ b/patches/kleopatra/set-cxx-standard.patch
@@ -0,0 +1,16 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7d1cfc9..05e750ac 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -168,6 +168,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ add_definitions(-DQT_NO_EMIT)
+ remove_definitions(-DQT_NO_FOREACH)
++set(CMAKE_CXX_STANDARD 17)
+
+ kde_enable_exceptions()
+ option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
diff --git a/patches/libkleo/0001-Revert-Use-more-target-centric-cmake-code.patch b/patches/libkleo/0001-Revert-Use-more-target-centric-cmake-code.patch
index a1add24a..8a6c3189 100755
--- a/patches/libkleo/0001-Revert-Use-more-target-centric-cmake-code.patch
+++ b/patches/libkleo/0001-Revert-Use-more-target-centric-cmake-code.patch
@@ -1,115 +1,100 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
-From bf1f244a8b740636c8cbf5d4a81733acec6b3ff8 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke
-Date: Fri, 4 Jun 2021 14:27:30 +0200
-Subject: [PATCH] Revert "Use more target-centric cmake code"
-
-This reverts commit b45c40d99d864d43ad174702887b401e1bbdddaf.
----
- src/CMakeLists.txt | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index be67c45..258426e 100644
+index a14b52f..e2cc379 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,11 +15,9 @@ add_subdirectory( pics )
if (BUILD_TESTING)
add_subdirectory( tests )
endif()
-add_library(KF5Libkleo)
-add_library(KF5::Libkleo ALIAS KF5Libkleo)
########### next target ###############
-target_sources(KF5Libkleo PRIVATE
+set(libkleo_core_SRCS
kleo/checksumdefinition.cpp
kleo/debug.cpp
kleo/defaultkeyfilter.cpp
-@@ -50,13 +48,13 @@ target_sources(KF5Libkleo PRIVATE
+@@ -51,13 +49,13 @@ target_sources(KF5Libkleo PRIVATE
utils/cryptoconfig.cpp
utils/test.cpp
)
-ecm_qt_declare_logging_category(KF5Libkleo HEADER libkleo_debug.h IDENTIFIER LIBKLEO_LOG CATEGORY_NAME org.kde.pim.libkleo
+ecm_qt_declare_logging_category(libkleo_core_SRCS HEADER libkleo_debug.h IDENTIFIER LIBKLEO_LOG CATEGORY_NAME org.kde.pim.libkleo
DESCRIPTION "libkleo (kleo_core)"
EXPORT LIBKLEO
)
-target_sources(KF5Libkleo PRIVATE
+set(libkleo_ui_common_SRCS
ui/dnattributeorderconfigwidget.cpp
ui/kdhorizontalline.cpp
ui/filenamerequester.cpp
-@@ -68,14 +66,14 @@ target_sources(KF5Libkleo PRIVATE
- ui/auditlogviewer.cpp
+@@ -70,14 +68,14 @@ target_sources(KF5Libkleo PRIVATE
+ ui/editdirectoryservicedialog.cpp
)
-ecm_qt_declare_logging_category(KF5Libkleo HEADER kleo_ui_debug.h IDENTIFIER KLEO_UI_LOG CATEGORY_NAME org.kde.pim.kleo_ui
+ecm_qt_declare_logging_category(libkleo_ui_common_SRCS HEADER kleo_ui_debug.h IDENTIFIER KLEO_UI_LOG CATEGORY_NAME org.kde.pim.kleo_ui
DESCRIPTION "libkleo (kleo_ui)"
OLD_CATEGORY_NAMES log_kleo_ui
EXPORT LIBKLEO
)
-target_sources(KF5Libkleo PRIVATE # make this a separate lib.
+set(libkleo_ui_SRCS # make this a separate lib.
ui/keylistview.cpp
ui/keyselectiondialog.cpp
ui/keyrequester.cpp
-@@ -84,12 +82,14 @@ target_sources(KF5Libkleo PRIVATE # make this a separate lib.
+@@ -86,8 +84,10 @@ target_sources(KF5Libkleo PRIVATE # make this a separate lib.
ui/keyselectioncombo.cpp
)
--ki18n_wrap_ui(KF5Libkleo
-+ki18n_wrap_ui(libkleo_ui_common_SRCS
- ui/directoryserviceswidget.ui
- )
-
+set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_SRCS}
+ ${libkleo_ui_common_SRCS})
-target_link_libraries(KF5Libkleo PUBLIC QGpgme Gpgmepp PRIVATE Qt::Widgets
+set(kleo_LIB_LIBS PUBLIC QGpgme Gpgmepp PRIVATE Qt::Widgets
KF5::I18n
KF5::Completion
KF5::ConfigCore
-@@ -100,15 +100,19 @@ target_link_libraries(KF5Libkleo PUBLIC QGpgme Gpgmepp PRIVATE Qt::Widgets
+@@ -98,15 +98,19 @@ target_link_libraries(KF5Libkleo PUBLIC QGpgme Gpgmepp PRIVATE Qt::Widgets
if (KF5PimTextEdit_FOUND)
add_definitions(-DHAVE_PIMTEXTEDIT)
- target_link_libraries(KF5Libkleo PRIVATE KF5::PimTextEdit)
+ set(kleo_LIB_LIBS ${kleo_LIB_LIBS} PRIVATE KF5::PimTextEdit)
endif()
+add_library(KF5Libkleo ${kleo_LIB_SRCS})
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(KF5Libkleo PROPERTIES UNITY_BUILD ON)
endif()
generate_export_header(KF5Libkleo BASE_NAME kleo)
+add_library(KF5::Libkleo ALIAS KF5Libkleo)
if(WIN32)
- target_link_libraries(KF5Libkleo ${GPGME_VANILLA_LIBRARIES} )
+target_link_libraries(KF5Libkleo ${kleo_LIB_LIBS} ${GPGME_VANILLA_LIBRARIES} )
+else()
+target_link_libraries(KF5Libkleo ${kleo_LIB_LIBS} )
endif()
set_target_properties(KF5Libkleo PROPERTIES
-@@ -229,7 +233,7 @@ install(FILES
+@@ -229,9 +233,9 @@ install(FILES
if ( WIN32 )
- install ( FILES libkleopatrarc-win32.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
+install ( FILES libkleopatrarc-win32.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
else ()
- install ( FILES libkleopatrarc.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
+install ( FILES libkleopatrarc.desktop DESTINATION ${KDE_INSTALL_CONFDIR} RENAME libkleopatrarc )
endif ()
---
-2.20.1
+
+ if (BUILD_QCH)
diff --git a/patches/libkleo/lower-cmake-requirement.patch b/patches/libkleo/lower-cmake-requirement.patch
index 9afdfa81..80eb1a10 100755
--- a/patches/libkleo/lower-cmake-requirement.patch
+++ b/patches/libkleo/lower-cmake-requirement.patch
@@ -1,14 +1,14 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fea1af..feed360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
- set(PIM_VERSION "5.17.46")
+ set(PIM_VERSION "5.18.40")
project(libkleo VERSION ${PIM_VERSION})
diff --git a/patches/libkleo/set-cxx-standard.patch b/patches/libkleo/set-cxx-standard.patch
new file mode 100755
index 00000000..d05da254
--- /dev/null
+++ b/patches/libkleo/set-cxx-standard.patch
@@ -0,0 +1,30 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb34e0d..9faec4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,6 +73,8 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
+ add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600)
+ remove_definitions(-DQT_NO_FOREACH)
+ add_definitions(-DQT_NO_EMIT)
++set(CMAKE_CXX_STANDARD 17)
++
+ ########### CMake Config Files ###########
+ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Libkleo")
+
+diff --git a/src/ui/keyselectiondialog.cpp b/src/ui/keyselectiondialog.cpp
+index 6a2630e..28298d2 100644
+--- a/src/ui/keyselectiondialog.cpp
++++ b/src/ui/keyselectiondialog.cpp
+@@ -252,7 +252,7 @@ QString ColumnStrategy::toolTip(const GpgME::Key &key, int) const
+ QString keyStatusString;
+ if (!checkKeyUsage(key, mKeyUsage, &keyStatusString)) {
+ // Show the status in bold if there is a problem
+- keyStatusString = QLatin1String("") % keyStatusString % QLatin1String("");
++ keyStatusString = QLatin1String("") + keyStatusString + QLatin1String("");
+ }
+
+ QString html = QStringLiteral("");