[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-139-g4127017
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Apr 19 16:40:01 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 4127017afeb97272435e0cbc4080118007e89b03 (commit)
via 06f585fb94964dba0ef88ccf596d1f0604d9c929 (commit)
from 87b329c66094908233bbf674dbdd26e2505210e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4127017afeb97272435e0cbc4080118007e89b03
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Apr 19 16:37:51 2016 +0200
Update KDE Packages and pinentry
* Makefile.am (EXTRA_DIST): Remove patches applied upstream.
* packages/packages.current: Update
* patches/kcoreaddons/
0001-Fix-Kdelibs4-config-migration-for-Windows.patch,
patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch,
patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch,
patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch,
patches/pinentry-0.9.7/
Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch: Removed.
* patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG: Updated.
diff --git a/Makefile.am b/Makefile.am
index d9991a1..2824eac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,11 +43,9 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/gpgmepp/0002-disable-variants.patch \
patches/kmime/0001-Check-for-and-replace-strcasestr.patch \
patches/kmime/0002-Fix-Windows-build.patch \
- patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
- patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
@@ -58,8 +56,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch \
patches/kleopatra/0004-Make-DBus-integration-of-the-smime-conf-optional.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
- patches/kcoreaddons/0001-Fix-Kdelibs4-config-migration-for-Windows.patch \
- patches/pinentry-0.9.7/Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch \
patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch
copy-news:
diff --git a/packages/packages.current b/packages/packages.current
index afc6e8a..cb01cf1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -297,8 +297,8 @@ chk c132c16a5ae57ddd8193f222e539a608930fe3556a5c7932cabb5675f0dc3305
# last changed: 2015-12-11
# by: ah
-file pinentry/pinentry-0.9.7.tar.bz2
-chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
+#file pinentry/pinentry-0.9.7.tar.bz2
+#chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
# last changed: 2015-08-26
# by: ah
@@ -381,100 +381,100 @@ server http://download.kde.org/stable/frameworks/
# ECM
# last changed: 2016-03-10
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.19.0.php
-file 5.19/extra-cmake-modules-5.19.0.tar.xz
-chk c3d02fbeaa3af9bc1165365be00a97746475c26d85695e16d7f1a8ac168483b6
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/extra-cmake-modules-5.20.0.tar.xz
+chk 2c8ff0c7289edfaa95007e622c87a5fa95e9e2a2ed291eb25a61f06ea92ac34c
# KConfig
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kconfig-5.18.0.tar.xz
-chk 36a4c887080bff674bccd302985ff9a401d8e1a8a0649616ff686f4d1ddceee8
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kconfig-5.20.0.tar.xz
+chk ebd7dd5c6960eac1aee299bd804ab864cad235ef30d312256b01b57ed9ff635b
# KI18n
-# last changed: 2016-01-21
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/ki18n-5.18.0.tar.xz
-chk 0926ef9fd9a1f7fe74c251c4fc155855fad2347eb37fb1e4dde12ea012c17493
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/ki18n-5.20.0.tar.xz
+chk 226715a464a9b1d03c257d470ea0d6060fdfe35efc635108491cadb48512389c
# KWidgetsAddons
-# last changed: 2016-01-21
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kwidgetsaddons-5.18.0.tar.xz
-chk 61eebbe729dba31fccfdd1178e50d4c2c9e4b221f193f2a0d2e57ec6d9f9d819
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kwidgetsaddons-5.20.0.tar.xz
+chk a930990de3b090d10c20cb30d764825a551253a7d4b104b4eac9ae73dc81e628
# KCompletion
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kcompletion-5.18.0.tar.xz
-chk cb9cd9e2c156df65f6de8057ad855808922b072cf042882de91c9f4aef23723e
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kcompletion-5.20.0.tar.xz
+chk a503a1516012ecc5b6eaa328c31dfd0d6c527a8a78489d9d372dba90d0ec1b4f
# KWindowSystem
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kwindowsystem-5.18.0.tar.xz
-chk 67567ba32268d0a5365106b7e98e69eb77880271580c68adbf0d128f32691f06
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kwindowsystem-5.20.0.tar.xz
+chk b1d7e273b5fc75fbde45fe33179ea884a0b9761af0663279405cfd18d9e4390f
# KCoreAddons
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kcoreaddons-5.18.0.tar.xz
-chk ee7785642f3bcbb513c6a236f8f13a14809ee58b69a7a885c4c63688acbac817
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kcoreaddons-5.20.0.tar.xz
+chk ac3819517744f1868c664045eaf9231cdf1c090dec3d329257ee7b56dc94fe69
# KCodecs
-# last changed: 2016-01-25
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kcodecs-5.18.0.tar.xz
-chk 9098cec9ed88287cf000580c2381a60faad45e1f7b70a1a391c2b579fe6dd2c6
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kcodecs-5.20.0.tar.xz
+chk b08b419aaa1137083be32885afac8cfa7b3f1c3c874b5046e57c1f70cf0d3122
# KConfigWidgets
-# last changed: 2016-01-28
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kconfigwidgets-5.18.0.tar.xz
-chk 35a25df3d79ec4ae50f80e496218b8898564011f6eadbe7cb742e70b08102122
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kconfigwidgets-5.20.0.tar.xz
+chk c707529939e66d14bff03c320c0bf3237c760034344b2d8b28a4a4e53be079ba
# KXmlGui
-# last changed: 2016-01-28
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kxmlgui-5.18.0.tar.xz
-chk 316324910ba63df52de57445b68aaf3f4b1689e86d568039f968eb7132f0357a
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kxmlgui-5.20.0.tar.xz
+chk 84d186d92969570a47f314c20f7f444d3d82182e47b6f065ab3537bdbc221c14
# KGuiAddons
-# last changed: 2016-01-28
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kguiaddons-5.18.0.tar.xz
-chk bf4b419964849f87e599313da8d2d0fe15cbfc1d12495d052be692c7e3927594
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kguiaddons-5.20.0.tar.xz
+chk be0e6a2f1a1c0d670a8333325b0a65334a2aff62dda9c8e32347a480f9e62407
# KItemViews
-# last changed: 2016-01-28
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kitemviews-5.18.0.tar.xz
-chk 6b785b151c5e02e652d25371a133193ca60b9209a8cba6968c00e67f1d80eb82
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kitemviews-5.20.0.tar.xz
+chk 3d71897950535b3180966917997320bd7227c503cb9e47356fe01df687d7e596
# KIconThemes
-# last changed: 2016-01-28
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/kiconthemes-5.18.0.tar.xz
-chk 2df21aa7a72c218903060976cf2ac63024bfd30e4188d78d78f6148f0416f282
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kiconthemes-5.20.0.tar.xz
+chk 772d1a9f5a3168b8d5f255af66e04c8019df516225ac5ad268365dca1bbf4ee7
# breeze-icons
-# last changed: 2016-02-04
+# last changed: 2016-04-19
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
-file 5.18/breeze-icons-5.18.0.tar.xz
-chk 9f7007cdc805083812583d575b3ce2880f41f32f5337582c55a6acfc4bc69128
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/breeze-icons-5.20.0.tar.xz
+chk 445b5cb8774cb224f804abea7864a8bf6307b6a4d1958b4caf1d251f02f98204
# KDE Applications
#
@@ -484,6 +484,12 @@ chk 9f7007cdc805083812583d575b3ce2880f41f32f5337582c55a6acfc4bc69128
# server http://download.kde.org/stable/applications/
server http://files.intevation.de/projects/gpg4all
+# Pinentry master to show new pinentry features under devel.
+# by: ah
+# verified: tarball created by ah
+file pinentry/pinentry-0.9.8-beta5.tar.bz2
+chk b4e7713165008c0b21c065c4452a155cc353b7bb9abf519833873eb522b6a676
+
# Gpgmepp
# last changed: 2016-01-21
# by: ah
@@ -492,12 +498,12 @@ server http://files.intevation.de/projects/gpg4all
# chk 56d5f05bd513efc6caf770e43b6109e42842198f
#
# Gpgmepp-devel
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
# verified: Tarball created by ah.
-file gpgmepp/gpgmepp-201603091357.tar.xz
-chk 79c33c35f45f5833fe6d909aec5539c1baee571a34e0d51df8d6d5baa8b7c6d8
+file gpgmepp/gpgmepp-201604191437.tar.xz
+chk e8c6d9947c2b9410f151379a1bcd6e562e05f0b71fdf5d889783b5914bfa51da
# kmime
# last changed: 2016-01-25
@@ -515,11 +521,11 @@ file kmime/kmime-201601251644.tar.xz
chk fab98917a4cbde33040c97817c1e199d70e335c1a66b1329ff39be0b25287a48
# Libkleo
-# last changed: 2016-01-22
+# last changed: 2016-04-19
# by: ah
# verified: Tarball created by ah.
-file libkleo/libkleo-201601221448.tar.xz
-chk 73371739483b1ca33f6de3ecdd83de0c5c33f486705c8927458168d7181375b9
+file libkleo/libkleo-201604191436.tar.xz
+chk 2d04b133900454eb5f61bc016a43e6ee426c48fe5ca8ed54cd46542fef59b6bd
# KDE-L10n
# last changed: 2016-02-19
@@ -535,5 +541,5 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201603101932.tar.gz
-chk a8cbb676ee7e354f76d6715c7eaf660eccac12c03948479d196990de800b2426
+file kleopatra/kleopatra-201604191441.tar.gz
+chk 861cea4d59117a1fb8f98338c050dc50e9e940f12093aa2f86149eabc07e7d80
diff --git a/patches/kcoreaddons/0001-Fix-Kdelibs4-config-migration-for-Windows.patch b/patches/kcoreaddons/0001-Fix-Kdelibs4-config-migration-for-Windows.patch
deleted file mode 100755
index 87ed563..0000000
--- a/patches/kcoreaddons/0001-Fix-Kdelibs4-config-migration-for-Windows.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 0de14a576faf93d0a540ce65aa4c5a5a203e35c7 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Tue, 1 Mar 2016 17:41:58 +0100
-Subject: [PATCH] Fix Kdelibs4 config migration for Windows
-
-Look for old config in ~/AppData/Roaming/.kde on Windows and
-use GenericConfigLocation instead of ConfigLocation for new
-config.
----
- src/lib/util/kdelibs4configmigrator.cpp | 2 +-
- src/lib/util/kdelibs4migration.cpp | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/util/kdelibs4configmigrator.cpp b/src/lib/util/kdelibs4configmigrator.cpp
-index c8560c1..acdb19c 100644
---- a/src/lib/util/kdelibs4configmigrator.cpp
-+++ b/src/lib/util/kdelibs4configmigrator.cpp
-@@ -72,7 +72,7 @@ bool Kdelibs4ConfigMigrator::migrate()
-
- Q_FOREACH (const QString &configFileName, d->configFiles) {
- const QString newConfigLocation
-- = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
-+ = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
- + QLatin1Char('/') + configFileName;
-
- if (QFile(newConfigLocation).exists()) {
-diff --git a/src/lib/util/kdelibs4migration.cpp b/src/lib/util/kdelibs4migration.cpp
-index f631efa..32a78c0 100644
---- a/src/lib/util/kdelibs4migration.cpp
-+++ b/src/lib/util/kdelibs4migration.cpp
-@@ -41,6 +41,9 @@ Kdelibs4Migration::Kdelibs4Migration()
- QDir homeDir = QDir::home();
- QVector<QString> testSubdirs;
- testSubdirs << QStringLiteral(KDE4_DEFAULT_HOME) << QStringLiteral(".kde4") << QStringLiteral(".kde");
-+#ifdef Q_OS_WIN
-+ testSubdirs << QStringLiteral("AppData/Roaming/.kde");
-+#endif
- Q_FOREACH (const QString &testSubdir, testSubdirs) {
- if (homeDir.exists(testSubdir)) {
- //qDebug() << "Using" << testSubdir << "as the location of the old config file";
---
-2.1.4
diff --git a/patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch b/patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch
index 5081a7b..34e1944 100755
--- a/patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch
+++ b/patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch
@@ -76,7 +76,7 @@ index 1abaa6b..6799187 100644
ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME log_kleopatra)
if(KLEO_MODEL_TEST)
-@@ -261,13 +278,13 @@ target_link_libraries(kleopatra_bin
+@@ -261,14 +278,14 @@ target_link_libraries(kleopatra_bin
${_kleopatra_extra_libs}
KF5::Libkleo
KF5::Mime
@@ -88,6 +88,7 @@ index 1abaa6b..6799187 100644
- KF5::DBusAddons
+ ${_kleopatra_dbusaddons_libs}
Qt5::Network
+ Qt5::PrintSupport # Printing secret keys
+ KF5::CoreAddons
${_kleopatra_uiserver_extra_libs}
kleopatraclientcore
diff --git a/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch b/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
deleted file mode 100755
index eee7e85..0000000
--- a/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From cca106313c9ec77f5dc409bd1b104f4e93da3cf1 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Tue, 26 Jan 2016 17:20:18 +0100
-Subject: [PATCH 1/2] Add option to disable KGlobalAccel
-
-KGlobalAccel integration is a core feature of KXmlGui in
-an integrated KDE enviornment. For other platforms, with different
-global shortcut concepts support for it might not be required
-in XMLGui. So there is now an option to disable it.
-
-REVIEW: 126895
----
- CMakeLists.txt | 9 +++++++--
- src/CMakeLists.txt | 4 +++-
- src/config-xmlgui.h.cmake | 3 +++
- src/kactioncollection.cpp | 26 ++++++++++++++++++++++++--
- src/kkeysequencewidget.cpp | 13 ++++++++++++-
- src/kshortcuteditwidget.cpp | 7 ++++++-
- src/kshortcutseditor.cpp | 15 +++++++++++++--
- src/kshortcutseditoritem.cpp | 32 +++++++++++++++++++++++++++++---
- src/kxmlguifactory.cpp | 7 ++++++-
- 9 files changed, 103 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e2de5b0..74afa01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,8 @@ ecm_setup_version(${KF5_VERSION}
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5XmlGuiConfigVersion.cmake"
- SOVERSION 5)
-
-+option(FORCE_DISABLE_KGLOBALACCEL "Force building KXmlGui without KGlobalAccel. Doing this will break global shortcut support. [default=OFF]" OFF)
-+
- # Dependencies
- set(REQUIRED_QT_VERSION 5.3.0)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
-@@ -37,7 +39,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
-@@ -45,7 +46,6 @@ find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Attica ${KF5_DEP_VERSION})
--
- set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API"
- PURPOSE "Support for Get Hot New Stuff in KXMLGUI"
- URL "https://projects.kde.org/attica"
-@@ -53,6 +53,11 @@ set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that imple
- )
- set (HAVE_ATTICA ${KF5Attica_FOUND})
-
-+if (NOT FORCE_DISABLE_KGLOBALACCEL)
-+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
-+endif()
-+set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
-+
- # Subdirectories
- add_definitions(-DTRANSLATION_DOMAIN=\"kxmlgui5\")
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 58f0c7a..8126b5e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,6 +3,9 @@ add_subdirectory(ksendbugmail)
- if (HAVE_ATTICA)
- set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::Attica)
- endif ()
-+if (HAVE_GLOBALACCEL)
-+ set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::GlobalAccel)
-+endif ()
- if(WIN32)
- set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} secur32) # GetUserNameEx()
- endif()
-@@ -89,7 +92,6 @@ PRIVATE
- KF5::IconThemes #KIconLoader and KIconThemes in KToolBar
- KF5::TextWidgets #KTextEdit in kbugreport
- KF5::WindowSystem #KKeyServer in kkeysequencewidget
-- KF5::GlobalAccel #KActionCollection and shortcut widgets
- ${XMLGUI_EXTRA_LIBS}
- )
-
-diff --git a/src/config-xmlgui.h.cmake b/src/config-xmlgui.h.cmake
-index 07c882f..9d7f3dc 100644
---- a/src/config-xmlgui.h.cmake
-+++ b/src/config-xmlgui.h.cmake
-@@ -4,3 +4,6 @@
-
- #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
- #define KF5_LIBEXEC_INSTALL_DIR "${KF5_LIBEXEC_INSTALL_DIR}"
-+
-+/* KF5GlobalAccel available */
-+#cmakedefine01 HAVE_GLOBALACCEL
-diff --git a/src/kactioncollection.cpp b/src/kactioncollection.cpp
-index 9c45725..db856db 100644
---- a/src/kactioncollection.cpp
-+++ b/src/kactioncollection.cpp
-@@ -24,6 +24,8 @@
- Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include "kactioncollection.h"
-
- #include "kactioncategory.h"
-@@ -33,7 +35,9 @@
-
- #include <kauthorized.h>
- #include <kconfiggroup.h>
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
- #include <ksharedconfig.h>
-
- #include <QtXml/QDomDocument>
-@@ -62,7 +66,12 @@ public:
-
- void setComponentForAction(QAction *action)
- {
-- if (!KGlobalAccel::self()->hasShortcut(action)) {
-+#if HAVE_GLOBALACCEL
-+ bool hasGlobalShortcut = KGlobalAccel::self()->hasShortcut(action);
-+#else
-+ bool hasGlobalShortcut = false;
-+#endif
-+ if (!hasGlobalShortcut) {
- action->setProperty("componentName", m_componentName);
- action->setProperty("componentDisplayName", m_componentDisplayName);
- }
-@@ -254,6 +263,7 @@ QAction *KActionCollection::addAction(const QString &name, QAction *action)
- // settings to disk. Both for local and global shortcuts.
- qCDebug(DEBUG_KXMLGUI) << "Registering action " << objectName << " under new name " << indexName;
- // If there is a global shortcuts it's a very bad idea.
-+#if HAVE_GLOBALACCEL
- if (KGlobalAccel::self()->hasShortcut(action)) {
- // In debug mode assert
- Q_ASSERT(!KGlobalAccel::self()->hasShortcut(action));
-@@ -261,6 +271,7 @@ QAction *KActionCollection::addAction(const QString &name, QAction *action)
- qCritical() << "Changing action name from " << objectName << " to " << indexName << "\nignored because of active global shortcut.";
- indexName = objectName;
- }
-+#endif
- }
-
- // Set the new name
-@@ -445,6 +456,7 @@ void KActionCollection::setConfigGlobal(bool global)
-
- void KActionCollection::importGlobalShortcuts(KConfigGroup *config)
- {
-+#if HAVE_GLOBALACCEL
- Q_ASSERT(config);
- if (!config || !config->exists()) {
- return;
-@@ -469,6 +481,9 @@ void KActionCollection::importGlobalShortcuts(KConfigGroup *config)
- }
- }
- }
-+#else
-+ Q_UNUSED(config);
-+#endif
- }
-
- void KActionCollection::readSettings(KConfigGroup *config)
-@@ -505,6 +520,7 @@ void KActionCollection::readSettings(KConfigGroup *config)
-
- void KActionCollection::exportGlobalShortcuts(KConfigGroup *config, bool writeAll) const
- {
-+#if HAVE_GLOBALACCEL
- Q_ASSERT(config);
- if (!config) {
- return;
-@@ -555,6 +571,10 @@ void KActionCollection::exportGlobalShortcuts(KConfigGroup *config, bool writeAl
- }
-
- config->sync();
-+#else
-+ Q_UNUSED(config);
-+ Q_UNUSED(writeAll);
-+#endif
- }
-
- bool KActionCollectionPrivate::writeKXMLGUIConfigFile()
-@@ -599,7 +619,9 @@ bool KActionCollectionPrivate::writeKXMLGUIConfigFile()
- bool bSameAsDefault = (action->shortcuts() == q->defaultShortcuts(action));
- qCDebug(DEBUG_KXMLGUI) << "name = " << actionName
- << " shortcut = " << QKeySequence::listToString(action->shortcuts())
-+#if HAVE_GLOBALACCEL
- << " globalshortcut = " << QKeySequence::listToString(KGlobalAccel::self()->shortcut(action))
-+#endif
- << " def = " << QKeySequence::listToString(q->defaultShortcuts(action));
-
- // now see if this element already exists
-diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp
-index b2e2b6a..b85d527 100644
---- a/src/kkeysequencewidget.cpp
-+++ b/src/kkeysequencewidget.cpp
-@@ -19,6 +19,8 @@
- Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include "kkeysequencewidget.h"
- #include "kkeysequencewidget_p.h"
-
-@@ -34,7 +36,9 @@
- #include <klocalizedstring.h>
- #include <kmessagebox.h>
- #include <kkeyserver.h>
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
-
- #include "kactioncollection.h"
-
-@@ -112,6 +116,7 @@ public:
- doneRecording();
- }
-
-+#if HAVE_GLOBALACCEL
- bool promptStealShortcutSystemwide(
- QWidget *parent,
- const QHash<QKeySequence, QList<KGlobalShortcutInfo> > &shortcuts,
-@@ -146,6 +151,7 @@ public:
- return KMessageBox::warningContinueCancel(parent, message, title, KGuiItem(i18n("Reassign")))
- == KMessageBox::Continue;
- }
-+#endif
-
- //private slot
- void doneRecording(bool validate = true);
-@@ -471,6 +477,7 @@ bool KKeySequenceWidgetPrivate::conflictWithGlobalShortcuts(const QKeySequence &
- }
- #endif
-
-+#if HAVE_GLOBALACCEL
- if (!(checkAgainstShortcutTypes & KKeySequenceWidget::GlobalShortcuts)) {
- return false;
- }
-@@ -501,6 +508,10 @@ bool KKeySequenceWidgetPrivate::conflictWithGlobalShortcuts(const QKeySequence &
- KGlobalAccel::stealShortcutSystemwide(keySequence[i]);
- }
- return false;
-+#else
-+ Q_UNUSED(keySequence);
-+ return false;
-+#endif
- }
-
- bool shortcutsConflictWith(const QList<QKeySequence> &shortcuts, const QKeySequence &needle)
-diff --git a/src/kshortcuteditwidget.cpp b/src/kshortcuteditwidget.cpp
-index 670d031..ebd59be 100644
---- a/src/kshortcuteditwidget.cpp
-+++ b/src/kshortcuteditwidget.cpp
-@@ -22,6 +22,7 @@
- Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
- #include "kshortcutsdialog_p.h"
-
- #include <QPainter>
-@@ -31,7 +32,9 @@
- #include <QLabel>
-
- #include <klocalizedstring.h>
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
-
- #include "kkeysequencewidget.h"
-
-@@ -85,6 +88,7 @@ ShortcutEditWidget::ShortcutEditWidget(QWidget *viewport, const QKeySequence &de
- this, SLOT(setCustom(QKeySequence)));
- connect(m_customEditor, SIGNAL(stealShortcut(QKeySequence,QAction*)),
- this, SIGNAL(stealShortcut(QKeySequence,QAction*)));
-+#if HAVE_GLOBALACCEL
- connect(KGlobalAccel::self(), &KGlobalAccel::globalShortcutChanged,
- [this](QAction *action, const QKeySequence &seq) {
- if (action != m_action) {
-@@ -93,6 +97,7 @@ ShortcutEditWidget::ShortcutEditWidget(QWidget *viewport, const QKeySequence &de
- setKeySequence(seq);
- }
- );
-+#endif
- }
-
- KKeySequenceWidget::ShortcutTypes ShortcutEditWidget::checkForConflictsAgainst() const
-diff --git a/src/kshortcutseditor.cpp b/src/kshortcutseditor.cpp
-index 99dfb3d..c32aed0 100644
---- a/src/kshortcutseditor.cpp
-+++ b/src/kshortcutseditor.cpp
-@@ -22,6 +22,7 @@
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-+#include "config-xmlgui.h"
-
- #include "kshortcutseditor.h"
-
-@@ -43,7 +44,9 @@
-
- #include <kconfig.h>
- #include <kconfiggroup.h>
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
- #include <kmessagebox.h>
- #include "kactioncollection.h"
- #include "kactioncategory.h"
-@@ -292,7 +295,13 @@ void KShortcutsEditorPrivate::initGUI(KShortcutsEditor::ActionTypes types, KShor
- ui.list->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
- ui.list->header()->hideSection(ShapeGesture); //mouse gestures didn't make it in time...
- ui.list->header()->hideSection(RockerGesture);
-- if (!(actionTypes & KShortcutsEditor::GlobalAction)) {
-+#if HAVE_GLOBALACCEL
-+ bool hideGlobals = !(actionTypes & KShortcutsEditor::GlobalAction);
-+#else
-+ bool hideGlobals = true;
-+#endif
-+
-+ if (hideGlobals) {
- ui.list->header()->hideSection(GlobalPrimary);
- ui.list->header()->hideSection(GlobalAlternate);
- } else if (!(actionTypes & ~KShortcutsEditor::GlobalAction)) {
-@@ -388,11 +397,13 @@ void KShortcutsEditorPrivate::allDefault()
- changeKeyShortcut(item, LocalAlternate, alternate);
- }
-
-+#if HAVE_GLOBALACCEL
- if (KGlobalAccel::self()->shortcut(act) != KGlobalAccel::self()->defaultShortcut(act)) {
- QList<QKeySequence> defaultShortcut = KGlobalAccel::self()->defaultShortcut(act);
- changeKeyShortcut(item, GlobalPrimary, primarySequence(defaultShortcut));
- changeKeyShortcut(item, GlobalAlternate, alternateSequence(defaultShortcut));
- }
-+#endif
-
- #if 0
- KShapeGesture actShapeGesture = KGestureMap::self()->shapeGesture(act);
-diff --git a/src/kshortcutseditoritem.cpp b/src/kshortcutseditoritem.cpp
-index 461a90c..8442f10 100644
---- a/src/kshortcutseditoritem.cpp
-+++ b/src/kshortcutseditoritem.cpp
-@@ -22,6 +22,7 @@
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-+#include "config-xmlgui.h"
-
- #include "kshortcutsdialog_p.h"
-
-@@ -33,7 +34,9 @@
- #include <kgesturemap.h>
- #endif
-
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
-
- KShortcutsEditorItem::KShortcutsEditorItem(QTreeWidgetItem *parent, QAction *action)
- : QTreeWidgetItem(parent, ActionItem)
-@@ -129,12 +132,14 @@ QVariant KShortcutsEditorItem::data(int column, int role) const
- case LocalAlternate:
- return !m_action->property("isShortcutConfigurable").isValid()
- || m_action->property("isShortcutConfigurable").toBool();
-+#if HAVE_GLOBALACCEL
- case GlobalPrimary:
- case GlobalAlternate:
- if (!KGlobalAccel::self()->hasShortcut(m_action)) {
- return false;
- }
- return true;
-+#endif
- default:
- return false;
- }
-@@ -166,17 +171,21 @@ QVariant KShortcutsEditorItem::data(int column, int role) const
-
- case DefaultShortcutRole: {
- QList<QKeySequence> defaultShortcuts = m_action->property("defaultShortcuts").value<QList<QKeySequence> >();
-+#if HAVE_GLOBALACCEL
- QList<QKeySequence> defaultGlobalShortcuts = KGlobalAccel::self()->defaultShortcut(m_action);
-+#endif
-
- switch (column) {
- case LocalPrimary:
- return primarySequence(defaultShortcuts);
- case LocalAlternate:
- return alternateSequence(defaultShortcuts);
-+#if HAVE_GLOBALACCEL
- case GlobalPrimary:
- return primarySequence(defaultGlobalShortcuts);
- case GlobalAlternate:
- return alternateSequence(defaultGlobalShortcuts);
-+#endif
- #if 0
- case ShapeGesture: {
- QVariant ret;
-@@ -214,17 +223,21 @@ bool KShortcutsEditorItem::operator<(const QTreeWidgetItem &other) const
- QKeySequence KShortcutsEditorItem::keySequence(uint column) const
- {
- QList<QKeySequence> shortcuts = m_action->shortcuts();
-+#if HAVE_GLOBALACCEL
- QList<QKeySequence> globalShortcuts = KGlobalAccel::self()->shortcut(m_action);
-+#endif
-
- switch (column) {
- case LocalPrimary:
- return primarySequence(shortcuts);
- case LocalAlternate:
- return alternateSequence(shortcuts);
-+#if HAVE_GLOBALACCEL
- case GlobalPrimary:
- return primarySequence(globalShortcuts);
- case GlobalAlternate:
- return alternateSequence(globalShortcuts);
-+#endif
- default:
- return QKeySequence();
- }
-@@ -233,12 +246,15 @@ QKeySequence KShortcutsEditorItem::keySequence(uint column) const
- void KShortcutsEditorItem::setKeySequence(uint column, const QKeySequence &seq)
- {
- QList<QKeySequence> ks;
-+#if HAVE_GLOBALACCEL
- if (column == GlobalPrimary || column == GlobalAlternate) {
- ks = KGlobalAccel::self()->shortcut(m_action);
- if (!m_oldGlobalShortcut) {
- m_oldGlobalShortcut = new QList<QKeySequence>(ks);
- }
-- } else {
-+ } else
-+#endif
-+ {
- ks = m_action->shortcuts();
- if (!m_oldLocalShortcut) {
- m_oldLocalShortcut = new QList<QKeySequence>(ks);
-@@ -264,9 +280,13 @@ void KShortcutsEditorItem::setKeySequence(uint column, const QKeySequence &seq)
- }
-
- //avoid also setting the default shortcut - what we are setting here is custom by definition
-+#if HAVE_GLOBALACCEL
- if (column == GlobalPrimary || column == GlobalAlternate) {
- KGlobalAccel::self()->setShortcut(m_action, ks, KGlobalAccel::NoAutoloading);
-- } else {
-+
-+ } else
-+#endif
-+ {
- m_action->setShortcuts(ks);
- }
-
-@@ -304,10 +324,12 @@ void KShortcutsEditorItem::updateModified()
- delete m_oldLocalShortcut;
- m_oldLocalShortcut = 0;
- }
-+#if HAVE_GLOBALACCEL
- if (m_oldGlobalShortcut && *m_oldGlobalShortcut == KGlobalAccel::self()->shortcut(m_action)) {
- delete m_oldGlobalShortcut;
- m_oldGlobalShortcut = 0;
- }
-+#endif
- #if 0
- if (m_oldShapeGesture && *m_oldShapeGesture == KGestureMap::self()->shapeGesture(m_action)) {
- delete m_oldShapeGesture;
-@@ -335,6 +357,7 @@ bool KShortcutsEditorItem::isModified(uint column) const
- } else {
- return alternateSequence(*m_oldLocalShortcut) != alternateSequence(m_action->shortcuts());
- }
-+#if HAVE_GLOBALACCEL
- case GlobalPrimary:
- case GlobalAlternate:
- if (!m_oldGlobalShortcut) {
-@@ -345,6 +368,7 @@ bool KShortcutsEditorItem::isModified(uint column) const
- } else {
- return alternateSequence(*m_oldGlobalShortcut) != alternateSequence(KGlobalAccel::self()->shortcut(m_action));
- }
-+#endif
- #if 0
- case ShapeGesture:
- return static_cast<bool>(m_oldShapeGesture);
-@@ -370,9 +394,11 @@ void KShortcutsEditorItem::undo()
- m_action->setShortcuts(*m_oldLocalShortcut);
- }
-
-+#if HAVE_GLOBALACCEL
- if (m_oldGlobalShortcut) {
- KGlobalAccel::self()->setShortcut(m_action, *m_oldGlobalShortcut, KGlobalAccel::NoAutoloading);
- }
-+#endif
-
- #if 0
- if (m_oldShapeGesture) {
-diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp
-index 6848610..f42bc41 100644
---- a/src/kxmlguifactory.cpp
-+++ b/src/kxmlguifactory.cpp
-@@ -17,6 +17,7 @@
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-+#include "config-xmlgui.h"
-
- #include "kxmlguifactory.h"
-
-@@ -42,7 +43,9 @@
-
- #include <ksharedconfig.h>
- #include <kconfiggroup.h>
--#include <kglobalaccel.h>
-+#if HAVE_GLOBALACCEL
-+# include <kglobalaccel.h>
-+#endif
-
- Q_DECLARE_METATYPE(QList<QKeySequence>)
-
-@@ -675,7 +678,9 @@ void KXMLGUIFactoryPrivate::configureAction(QAction *action, const QDomAttr &att
- } else if (isShortcut) {
- // Setting the shortcut by property also sets the default shortcut (which is incorrect), so we have to do it directly
- if (attrName == QStringLiteral("globalShortcut")) {
-+#if HAVE_GLOBALACCEL
- KGlobalAccel::self()->setShortcut(action, QKeySequence::listFromString(attribute.value()));
-+#endif
- } else {
- action->setShortcuts(QKeySequence::listFromString(attribute.value()));
- }
---
-2.1.4
diff --git a/patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch b/patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch
deleted file mode 100755
index f299f0e..0000000
--- a/patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From aa75395f2d4b203b3b764f2a3a622dc4f465e930 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 19 Feb 2016 14:57:57 +0100
-Subject: [PATCH] Use non native Language name as fallback
-
-Some languages like Lower German don't have a native Language
-name in Qt. So we use a fallback to avoid showing empty menu
-entries.
----
- src/kswitchlanguagedialog_p.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/kswitchlanguagedialog_p.cpp b/src/kswitchlanguagedialog_p.cpp
-index 039daea..531598e 100644
---- a/src/kswitchlanguagedialog_p.cpp
-+++ b/src/kswitchlanguagedialog_p.cpp
-@@ -339,12 +339,16 @@ void KSwitchLanguageDialogPrivate::fillApplicationLanguages(KLanguageButton *but
- foreach(const QLocale &l, allLocales) {
- QString languageCode = l.name();
- if (l != cLocale) {
-+ const QString nativeName = l.nativeLanguageName();
-+ // For some languages the native name is empty. In this case use the non native language
-+ // name as fallback.
-+ const QString languageName = nativeName.isEmpty() ? QLocale::languageToString(l.language()) : nativeName;
- if (!insertedLanguges.contains(languageCode) && KLocalizedString::isApplicationTranslatedInto(languageCode)) {
-- button->insertLanguage(languageCode, l.nativeLanguageName());
-+ button->insertLanguage(languageCode, languageName);
- insertedLanguges << languageCode;
- } else if (stripCountryCode(&languageCode)) {
- if (!insertedLanguges.contains(languageCode) && KLocalizedString::isApplicationTranslatedInto(languageCode)) {
-- button->insertLanguage(languageCode, l.nativeLanguageName());
-+ button->insertLanguage(languageCode, languageName);
- insertedLanguges << languageCode;
- }
- }
---
-2.1.4
diff --git a/patches/pinentry-0.9.7/Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch b/patches/pinentry-0.9.7/Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch
deleted file mode 100755
index 80312c1..0000000
--- a/patches/pinentry-0.9.7/Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From a651fe1023be21d01f43864927965e92185af892 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 4 Mar 2016 15:44:26 +0100
-Subject: [PATCH 2/2] Qt: Fix Windows foreground window hacks for Qt5
-
-* qt/pinentrydialog.cpp: Use Q_OS_WIN instead of Q_WS_WIN
- (SetForegroundWindowEx): Handle new Wid type with casts.
-
---
-Q_WS_WIN is no longer defined by Qt5
----
- qt/pinentrydialog.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
-index 81205ee..1b0d276 100644
---- a/qt/pinentrydialog.cpp
-+++ b/qt/pinentrydialog.cpp
-@@ -35,7 +35,7 @@
- #include <QPalette>
- #include <QLineEdit>
-
--#ifdef Q_WS_WIN
-+#ifdef Q_OS_WIN
- #include <windows.h>
- #endif
-
-@@ -51,7 +51,7 @@
- does not always work (e.g. when the ForegroundWindow timeout
- has not expired.
- */
--#ifdef Q_WS_WIN
-+#ifdef Q_OS_WIN
- WINBOOL SetForegroundWindowEx( HWND hWnd )
- {
- //Attach foreground window thread to our thread
-@@ -75,14 +75,14 @@ void raiseWindow( QWidget* w )
- /* Maybe Qt will become agressive enough one day that
- * this is enough on windows too*/
- w->raise();
--#ifdef Q_WS_WIN
-+#ifdef Q_OS_WIN
- /* In the meantime we do our own attention grabbing */
-- if (!SetForegroundWindow (w->winId()) &&
-- !SetForegroundWindowEx (w->winId())) {
-+ if (!SetForegroundWindow ((HWND)w->winId()) &&
-+ !SetForegroundWindowEx ((HWND)w->winId())) {
- OutputDebugString("SetForegroundWindow (ex) failed");
- /* Yet another fallback which will not work on some
- * versions and is not recommended by msdn */
-- if (!ShowWindow (w->winId(), SW_SHOWNORMAL)) {
-+ if (!ShowWindow ((HWND)w->winId(), SW_SHOWNORMAL)) {
- OutputDebugString ("ShowWindow failed.");
- }
- }
---
-2.1.4
commit 06f585fb94964dba0ef88ccf596d1f0604d9c929
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Apr 13 17:33:38 2016 +0200
Fix Unreg of File extensions
* src/uninst-gpa.nsi, src/uninst-kleopatra.nsi: Unregister more
CMS Extensions.
diff --git a/src/uninst-gpa.nsi b/src/uninst-gpa.nsi
index 95a35e0..50931e3 100644
--- a/src/uninst-gpa.nsi
+++ b/src/uninst-gpa.nsi
@@ -54,14 +54,21 @@ Section "-un.gpa"
DeleteRegValue HKLM "Software\Classes\.gpg" "gpg4win.AssocFile.gpa.GPG"
DeleteRegValue HKLM "Software\Classes\.asc" "gpg4win.AssocFile.gpa.ASC"
DeleteRegValue HKLM "Software\Classes\.pgp" "gpg4win.AssocFile.gpa.PGP"
- DeleteRegValue HKLM "Software\Classes\.cer" "gpg4win.AssocFile.gpa.X509"
DeleteRegValue HKLM "Software\Classes\.pem" "gpg4win.AssocFile.gpa.CMS"
+ DeleteRegValue HKLM "Software\Classes\.p7s" "gpg4win.AssocFile.gpa.CMS"
+ DeleteRegValue HKLM "Software\Classes\.p7m" "gpg4win.AssocFile.gpa.CMS"
+ DeleteRegValue HKLM "Software\Classes\.arl" "gpg4win.AssocFile.gpa.CMS"
+ DeleteRegValue HKLM "Software\Classes\.crl" "gpg4win.AssocFile.gpa.CMS"
DeleteRegKey /ifempty HKLM "Software\Classes\.gpg"
DeleteRegKey /ifempty HKLM "Software\Classes\.asc"
DeleteRegKey /ifempty HKLM "Software\Classes\.pgp"
- DeleteRegKey /ifempty HKLM "Software\Classes\.pem"
DeleteRegKey /ifempty HKLM "Software\Classes\.sig"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.pem"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.p7m"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.p7s"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.crl"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.arl"
!endif
SectionEnd
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index 88e10ec..ece2083 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -214,13 +214,20 @@ Section "-un.kleopatra"
DeleteRegValue HKLM "Software\Classes\.gpg" "gpg4win.AssocFile.kleopatra.GPG"
DeleteRegValue HKLM "Software\Classes\.asc" "gpg4win.AssocFile.kleopatra.ASC"
DeleteRegValue HKLM "Software\Classes\.pgp" "gpg4win.AssocFile.kleopatra.PGP"
- DeleteRegValue HKLM "Software\Classes\.cer" "gpg4win.AssocFile.kleopatra.X509"
DeleteRegValue HKLM "Software\Classes\.pem" "gpg4win.AssocFile.kleopatra.CMS"
+ DeleteRegValue HKLM "Software\Classes\.p7s" "gpg4win.AssocFile.kleopatra.CMS"
+ DeleteRegValue HKLM "Software\Classes\.p7m" "gpg4win.AssocFile.kleopatra.CMS"
+ DeleteRegValue HKLM "Software\Classes\.arl" "gpg4win.AssocFile.kleopatra.CMS"
+ DeleteRegValue HKLM "Software\Classes\.crl" "gpg4win.AssocFile.kleopatra.CMS"
DeleteRegKey /ifempty HKLM "Software\Classes\.gpg"
DeleteRegKey /ifempty HKLM "Software\Classes\.asc"
DeleteRegKey /ifempty HKLM "Software\Classes\.pgp"
- DeleteRegKey /ifempty HKLM "Software\Classes\.pem"
DeleteRegKey /ifempty HKLM "Software\Classes\.sig"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.pem"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.p7m"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.p7s"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.crl"
+ DeleteRegKey /ifempty HKLM "Software\Classes\.arl"
!endif
SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 -
packages/packages.current | 136 +++---
...Fix-Kdelibs4-config-migration-for-Windows.patch | 46 --
.../0003-Add-option-to-disable-KWatchGnuPG.patch | 3 +-
...001-Make-KGlobalAccel-dependency-optional.patch | 542 ---------------------
...-Use-non-native-Language-name-as-fallback.patch | 41 --
...x-Windows-foreground-window-hacks-for-Qt5.patch | 61 ---
src/uninst-gpa.nsi | 11 +-
src/uninst-kleopatra.nsi | 11 +-
9 files changed, 91 insertions(+), 764 deletions(-)
delete mode 100755 patches/kcoreaddons/0001-Fix-Kdelibs4-config-migration-for-Windows.patch
delete mode 100755 patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
delete mode 100755 patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch
delete mode 100755 patches/pinentry-0.9.7/Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list