[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-170-gace274b
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Jul 12 15:51:10 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 ace274b67cd6f5b320a04b4dbbb6bd5a0f994f72 (commit)
via e1c1af0310ae26f08a1a6df78dd3d638b5cece32 (commit)
via 98ada44113d4ab17012620e0087766391e4ea807 (commit)
from bd220eaa605446ee8ec2ca7da02a41aba4e3ceb2 (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 ace274b67cd6f5b320a04b4dbbb6bd5a0f994f72
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 15:45:12 2016 +0200
Update KDE Frameworks to 5.24.0 and add KArchive
* configure.ac: Register KArchive
* src/inst-karchive.nsi, src/uninst-karchive.nsi: New.
* packages/packages.current: Update Frameworks. Add KArchive.
* patches/gpgmepp/drop-version-dep.patch: Removed. No longer needed.
* patches/kconfigwidgets/0001-Make-QDbus-optional.patch,
patches/kiconthemes/0001-Make-DBus-optional.patch,
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch: Refreshed.
* patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch:
Removed. Applied upstream.
* Makefile.am (EXTRA_DIST): Update accordingly.
* src/config.nsi.in: Add KArchive
* src/inst-sections.nsi: Handle KArchive
--
KArchive is a new dependency for KIconThemes to handle themed
SVG(Z) files. As it is tier one and we ship all required dependencies
for KArchive already this should not hurt much.
diff --git a/Makefile.am b/Makefile.am
index fd3cd39..d80070f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
- patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch \
patches/gpgme-1.6.0/0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch \
patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch \
patches/gpgmepp/0002-disable-variants.patch \
diff --git a/configure.ac b/configure.ac
index 0210f43..9430ad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,7 +362,8 @@ GPG4WIN_KDEPKG([kmime], [kcodecs])
GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfig])
GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
GPG4WIN_KDEPKG([kitemmodels], [qtbase qttools])
-GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets])
+GPG4WIN_KDEPKG([karchive], [qtbase qttools extra-cmake-modules])
+GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets karchive])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
diff --git a/packages/packages.current b/packages/packages.current
index 2b602f1..4473d71 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -376,114 +376,123 @@ file 5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz
chk f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7
-# KDE Frameworks
+# KDE Frameworks generated by gen-frameworks.sh
server http://download.kde.org/stable/frameworks/
-# ECM
-# last changed: 2016-03-10
+##### Paste Here #####
+# extra-cmake-modules
+# last changed: 2016-07-12
# by: ah
-# 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
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/extra-cmake-modules-5.24.0.tar.xz
+chk 8a4fd5eac37d4c6a4998c48716efe2392c6f7ec9a124aab4c8fc26516815a106
-# KConfig
-# last changed: 2016-04-19
+# kconfig
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kconfig-5.20.0.tar.xz
-chk ebd7dd5c6960eac1aee299bd804ab864cad235ef30d312256b01b57ed9ff635b
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kconfig-5.24.0.tar.xz
+chk bb57371d419457529450ba570cd2804ea127a451bfbd8e8d0cfc45cfa28982b5
-# KI18n
-# last changed: 2016-04-19
+# ki18n
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/ki18n-5.20.0.tar.xz
-chk 226715a464a9b1d03c257d470ea0d6060fdfe35efc635108491cadb48512389c
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/ki18n-5.24.0.tar.xz
+chk bb01b060e29634678ef262aed500a54e8f26bda96c003eef1d0a6b5eaf268233
-# KWidgetsAddons
-# last changed: 2016-04-19
+# kwidgetsaddons
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kwidgetsaddons-5.20.0.tar.xz
-chk a930990de3b090d10c20cb30d764825a551253a7d4b104b4eac9ae73dc81e628
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kwidgetsaddons-5.24.0.tar.xz
+chk 9d551fb9a0813f2df5563856d4e7e40665e59d6b42cba80d36cb42772fe8f7ce
-# KCompletion
-# last changed: 2016-04-19
+# kcompletion
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kcompletion-5.20.0.tar.xz
-chk a503a1516012ecc5b6eaa328c31dfd0d6c527a8a78489d9d372dba90d0ec1b4f
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kcompletion-5.24.0.tar.xz
+chk bbbb6eba8786939b275bcbc72ac5b04904d77cc8324e0bf99f06d917c60696e2
-# KWindowSystem
-# last changed: 2016-04-19
+# kwindowsystem
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kwindowsystem-5.20.0.tar.xz
-chk b1d7e273b5fc75fbde45fe33179ea884a0b9761af0663279405cfd18d9e4390f
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kwindowsystem-5.24.0.tar.xz
+chk bf191b760eb5de97e7a2cdda8c8a59d50597e46d7714510c1e1b20aa2baabe70
-# KCoreAddons
-# last changed: 2016-04-19
+# kcoreaddons
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kcoreaddons-5.20.0.tar.xz
-chk ac3819517744f1868c664045eaf9231cdf1c090dec3d329257ee7b56dc94fe69
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kcoreaddons-5.24.0.tar.xz
+chk 7080985a9d51358fb8638a4a048e3d045ab2fb02b7c8ad6c8b596d3bfc3a5d1b
-# KCodecs
-# last changed: 2016-04-19
+# kcodecs
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kcodecs-5.20.0.tar.xz
-chk b08b419aaa1137083be32885afac8cfa7b3f1c3c874b5046e57c1f70cf0d3122
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kcodecs-5.24.0.tar.xz
+chk 8c849f6c3411fe6036e2b8ae3449d0f5eab86eb491d6252440ff0b860794ffe2
-# KConfigWidgets
-# last changed: 2016-04-19
+# kconfigwidgets
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kconfigwidgets-5.20.0.tar.xz
-chk c707529939e66d14bff03c320c0bf3237c760034344b2d8b28a4a4e53be079ba
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kconfigwidgets-5.24.0.tar.xz
+chk 82a6ea0c5a07c121ecb4d5e9071c768c3ef89aca196cfa29412916f840c9456c
-# KXmlGui
-# last changed: 2016-04-19
+# kxmlgui
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kxmlgui-5.20.0.tar.xz
-chk 84d186d92969570a47f314c20f7f444d3d82182e47b6f065ab3537bdbc221c14
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kxmlgui-5.24.0.tar.xz
+chk 174643efc8ba49aaa2e1f014088ec73fe7000121c7407973a57331081bed11e2
-# KGuiAddons
-# last changed: 2016-04-19
+# kguiaddons
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kguiaddons-5.20.0.tar.xz
-chk be0e6a2f1a1c0d670a8333325b0a65334a2aff62dda9c8e32347a480f9e62407
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kguiaddons-5.24.0.tar.xz
+chk 2c8e27aa763c5af2877fb5f3aa0816706e3a85da49727d792e6f7920a032e945
-# KItemViews
-# last changed: 2016-04-19
+# kitemviews
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kitemviews-5.20.0.tar.xz
-chk 3d71897950535b3180966917997320bd7227c503cb9e47356fe01df687d7e596
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kitemviews-5.24.0.tar.xz
+chk dc298914af2436003fcf1dd6dbd03d9a11a2063af83b5e735647f43061ea6e78
-# KItemModels
-# last changed: 2016-04-29
+# kitemmodels
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kitemmodels-5.20.0.tar.xz
-chk 2fce8fe2294ec26a1943c44a547cfd1a2b3e7044e5b571bebd0aef5c7812da79
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kitemmodels-5.24.0.tar.xz
+chk c9403de0a6a155931cb96790dc1407c06d95ee096a5ab9795bbfe11bb82537e8
-# KIconThemes
-# last changed: 2016-04-19
+# kiconthemes
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/kiconthemes-5.20.0.tar.xz
-chk 772d1a9f5a3168b8d5f255af66e04c8019df516225ac5ad268365dca1bbf4ee7
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/kiconthemes-5.24.0.tar.xz
+chk d5c0a0422cdc655fc3a800a8dfbb97bd0a838456b72176cdf6ee7363c58bbfcc
# breeze-icons
-# last changed: 2016-04-19
+# last changed: 2016-07-12
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/breeze-icons-5.24.0.tar.xz
+chk a2b344907aab4e0549d72740f4ebde0e60566ae5240d63f7584da7d4655c07b6
+
+# karchive
+# last changed: 2016-07-12
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
-file 5.20/breeze-icons-5.20.0.tar.xz
-chk 445b5cb8774cb224f804abea7864a8bf6307b6a4d1958b4caf1d251f02f98204
+# verified: https://www.kde.org/info/kde-frameworks-5.24.0.php (created by gen-frameworks.sh)
+file 5.24/karchive-5.24.0.tar.xz
+chk f86f35bf4a216348ab09aaef36ee2aca3b3223ceea78299f6cd9e2ed3274b6d8
+##### End Paste #####
# KDE Applications
#
diff --git a/patches/gpgmepp/drop-version-dep.patch b/patches/gpgmepp/drop-version-dep.patch
deleted file mode 100755
index 6d373f2..0000000
--- a/patches/gpgmepp/drop-version-dep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 613c6fe..f9a045f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12)
- project(Gpgmepp)
-
- # ECM setup
--set(KF5_VERSION "5.22.0")
-+set(KF5_VERSION "5.20.0")
- find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${Gpgmepp_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
diff --git a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
index 9206ff3..1c20675 100755
--- a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
+++ b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
@@ -21,10 +21,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed53d1..87f976c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -10,7 +10,16 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA
+@@ -10,7 +10,16 @@
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- set(REQUIRED_QT_VERSION "5.3.0")
+ set(REQUIRED_QT_VERSION 5.4.0)
-find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
+if (UNIX)
+ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
@@ -37,7 +37,7 @@ index bed53d1..87f976c 100644
+endif()
+set (HAVE_QDBUS ${Qt5DBus_FOUND})
include(KDEInstallDirs)
- include(KDEFrameworkCompilerSettings)
+ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97837b3..104b118 100644
diff --git a/patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch b/patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch
deleted file mode 100755
index 7984193..0000000
--- a/patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 7a2c71e618d97f5d4a3bdf1ba10fc36c638f17ba Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Fri, 4 Mar 2016 11:26:06 +0100
-Subject: [PATCH] Use QLocale::system uiLanguages as fallback
-
-This fixes locale initialisation on platforms that don't use
-environment variables for language settings. (Windows)
----
- src/klocalizedstring.cpp | 54 ++++++++++++++++++++++++++++++------------------
- 1 file changed, 34 insertions(+), 20 deletions(-)
-
-diff --git a/src/klocalizedstring.cpp b/src/klocalizedstring.cpp
-index b24fe9b..e1f71dd 100644
---- a/src/klocalizedstring.cpp
-+++ b/src/klocalizedstring.cpp
-@@ -95,6 +95,30 @@ static void splitLocale(const QString &aLocale,
- language = locale;
- }
-
-+static void appendLocaleString(QStringList &languages, const QString &value)
-+{
-+ // Process the value to create possible combinations.
-+ QString language, country, modifier, charset;
-+ splitLocale(value, language, country, modifier, charset);
-+
-+ if (!country.isEmpty() && !modifier.isEmpty()) {
-+ languages += language + QLatin1Char('_')
-+ + country + QLatin1Char('@')
-+ + modifier;
-+ }
-+ // NOTE: Priority is unclear in case both the country and
-+ // the modifier are present. Should really language at modifier be of
-+ // higher priority than language_country?
-+ // In at least one case (Serbian language), it is better this way.
-+ if (!modifier.isEmpty()) {
-+ languages += language + QLatin1Char('@') + modifier;
-+ }
-+ if (!country.isEmpty()) {
-+ languages += language + QLatin1Char('_') + country;
-+ }
-+ languages += language;
-+}
-+
- static void appendLanguagesFromVariable(QStringList &languages,
- const char *envar, bool isList = false)
- {
-@@ -104,30 +128,19 @@ static void appendLanguagesFromVariable(QStringList &languages,
- if (isList) {
- languages += value.split(QLatin1Char(':'));
- } else {
-- // Process the value to create possible combinations.
-- QString language, country, modifier, charset;
-- splitLocale(value, language, country, modifier, charset);
--
-- if (!country.isEmpty() && !modifier.isEmpty()) {
-- languages += language + QLatin1Char('_')
-- + country + QLatin1Char('@')
-- + modifier;
-- }
-- // NOTE: Priority is unclear in case both the country and
-- // the modifier are present. Should really language at modifier be of
-- // higher priority than language_country?
-- // In at least one case (Serbian language), it is better this way.
-- if (!modifier.isEmpty()) {
-- languages += language + QLatin1Char('@') + modifier;
-- }
-- if (!country.isEmpty()) {
-- languages += language + QLatin1Char('_') + country;
-- }
-- languages += language;
-+ appendLocaleString(languages, value);
- }
- }
- }
-
-+static void appendLanguagesFromQLocale(QStringList &languages, const QLocale &locale)
-+{
-+ const QStringList uiLangs = locale.uiLanguages();
-+ Q_FOREACH (QString value, uiLangs) {
-+ appendLocaleString(languages, value.replace(QLatin1Char('-'), QLatin1Char('_')));
-+ }
-+}
-+
- // Extract the first country code from a list of language_COUNTRY strings.
- // Country code is converted to all lower case letters.
- static QString extractCountry(const QStringList &languages)
-@@ -333,6 +346,7 @@ void KLocalizedStringPrivateStatics::initializeLocaleLanguages()
- appendLanguagesFromVariable(localeLanguages, "LC_ALL");
- appendLanguagesFromVariable(localeLanguages, "LC_MESSAGES");
- appendLanguagesFromVariable(localeLanguages, "LANG");
-+ appendLanguagesFromQLocale(localeLanguages, QLocale::system());
- }
-
- KLocalizedString::KLocalizedString()
---
-2.1.4
diff --git a/patches/kiconthemes/0001-Make-DBus-optional.patch b/patches/kiconthemes/0001-Make-DBus-optional.patch
index 2f46c68..0a41707 100755
--- a/patches/kiconthemes/0001-Make-DBus-optional.patch
+++ b/patches/kiconthemes/0001-Make-DBus-optional.patch
@@ -84,20 +84,19 @@ index 75ab482..3a0ff0a 100644
#include "kiconloader.h"
#include <qplatformdefs.h> //for readlink
-@@ -46,8 +48,11 @@
+@@ -46,8 +48,10 @@
#include <kconfiggroup.h>
#include <kshareddatacache.h>
#include <ksharedconfig.h>
-#include <QtDBus/QDBusConnection>
-#include <QDBusMessage>
-+
+#if HAVE_QDBUS
+# include <QtDBus/QDBusConnection>
+# include <QDBusMessage>
+#endif
-
- // kdeui
- #include "kicontheme.h"
+ #include <QSvgRenderer>
+ #include <QXmlStreamReader>
+ #include <QXmlStreamWriter>
@@ -323,15 +328,21 @@ public:
parseGenericIconsFiles(file);
}
diff --git a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
index 8fb1414..bc1a808 100755
--- a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
+++ b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
@@ -43,7 +43,7 @@ index 74afa01..a6691fe 100644
+option(FORCE_DISABLE_DBUS "Force building KXmlGui without a dependency to QDbus. This will break KMainWindow integration and style change notifications. [default=OFF]" OFF)
# Dependencies
- set(REQUIRED_QT_VERSION 5.3.0)
+ set(REQUIRED_QT_VERSION 5.4.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
-
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets Xml Network PrintSupport)
diff --git a/src/Makefile.am b/src/Makefile.am
index c0fe8a6..8554173 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,6 +74,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kxmlgui.nsi uninst-kxmlgui.nsi \
inst-kiconthemes.nsi uninst-kiconthemes.nsi \
inst-breeze-icons.nsi uninst-breeze-icons.nsi \
+ inst-karchive.nsi uninst-karchive.nsi \
inst-kitemviews.nsi uninst-kitemviews.nsi \
inst-kitemmodels.nsi uninst-kitemmodels.nsi \
inst-kguiaddons.nsi uninst-kguiaddons.nsi \
@@ -117,7 +118,7 @@ gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
- kiconthemes kleopatra breeze-icons kitemmodels
+ kiconthemes kleopatra breeze-icons kitemmodels karchive
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 7809c75..93ef87a 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -278,6 +278,10 @@
!define gpg4win_pkg_kde_l10n_version @gpg4win_pkg_kde_l10n_version@
!define gpg4win_pkg_kde_l10n_src @gpg4win_pkg_kde_l10n_src@
+ at HAVE_PKG_KARCHIVE@
+!define gpg4win_pkg_karchive @gpg4win_pkg_karchive@
+!define gpg4win_pkg_karchive_version @gpg4win_pkg_karchive_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-karchive.nsi b/src/inst-karchive.nsi
new file mode 100644
index 0000000..581c797
--- /dev/null
+++ b/src/inst-karchive.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2016 Intevation 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/karchive-${gpg4win_pkg_karchive_version}
+
+!ifdef DEBUG
+Section "karchive" SEC_karchive
+!else
+Section "-karchive" SEC_karchive
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_karchive}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5Archive.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index d2eaf2d..f537457 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -149,6 +149,9 @@
!ifdef HAVE_PKG_KICONTHEMES
!include "inst-kiconthemes.nsi"
!endif
+!ifdef HAVE_PKG_KARCHIVE
+!include "inst-karchive.nsi"
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!include "inst-kitemviews.nsi"
!endif
@@ -365,6 +368,9 @@
!ifdef HAVE_PKG_KICONTHEMES
!include "uninst-kiconthemes.nsi"
!endif
+!ifdef HAVE_PKG_KARCHIVE
+!include "uninst-karchive.nsi"
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!include "uninst-kitemviews.nsi"
!endif
@@ -633,6 +639,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KICONTHEMES
!insertmacro UnselectSection ${SEC_kiconthemes}
!endif
+!ifdef HAVE_PKG_KARCHIVE
+ !insertmacro UnselectSection ${SEC_karchive}
+!endif
!ifdef HAVE_PKG_KITEMVIEWS
!insertmacro UnselectSection ${SEC_kitemviews}
!endif
@@ -757,6 +766,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_kitemviews}
!insertmacro SelectSection ${SEC_kitemmodels}
!insertmacro SelectSection ${SEC_kiconthemes}
+ !insertmacro SelectSection ${SEC_karchive}
!insertmacro SelectSection ${SEC_kguiaddons}
!insertmacro SelectSection ${SEC_qtsvg}
!insertmacro SelectSection ${SEC_kmime}
diff --git a/src/uninst-karchive.nsi b/src/uninst-karchive.nsi
new file mode 100644
index 0000000..cc56952
--- /dev/null
+++ b/src/uninst-karchive.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2016 Intevation 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/karchive-${gpg4win_pkg_karchive_version}
+
+; Uninstaller section.
+Section "-un.karchive"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_karchive}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5Archive.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
commit e1c1af0310ae26f08a1a6df78dd3d638b5cece32
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 15:42:31 2016 +0200
Update gpgme to 1.7.0 beta
* configure.ac: Build gpgme after qtbase.
* src/Makefile.am (gpg4win_pkg_gpgme_configure),
(gpg4win_pkg_gpgme_ex_configure): Don't build languages for now.
* packages/packages.current: Switch to unreleased gpgme version.
--
GpgME is moved after qtbase as we want to build qgpgme from there
in the future but for now we disable the languages to avoid
confilicts. Should be changed once libkleo and gpgmepp no
longer contain these parts.
diff --git a/configure.ac b/configure.ac
index 2a6f35e..0210f43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,7 +316,7 @@ GPG4WIN_SPKG([bzip2])
GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
GPG4WIN_SPKG([pinentry], [qtbase libiconv gtk+])
-GPG4WIN_SPKG([gpgme], [libgpg-error glib])
+GPG4WIN_SPKG([gpgme], [libgpg-error glib qtbase])
GPG4WIN_SPKG([gpgol], [gpgme libassuan])
GPG4WIN_SPKG([gpgex], [libassuan])
GPG4WIN_SPKG([paperkey])
diff --git a/packages/packages.current b/packages/packages.current
index ef14af3..2b602f1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -295,15 +295,17 @@ name gnupg-w32-2.1.13-20160616-src.tar.xz
file binary/gnupg-w32-2.1.13_20160616.tar.xz
chk f928e680770f3754b22ee6bfb0532307a4fa1f871a726656e028e6e95095bf2d
+# TODO: Switch back to released version
# last changed: 2015-12-11
# by: ah
#file pinentry/pinentry-0.9.7.tar.bz2
#chk 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2
+# TODO: Switch back to released version
# last changed: 2015-08-26
# by: ah
-file gpgme/gpgme-1.6.0.tar.bz2
-chk b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
+# file gpgme/gpgme-1.6.0.tar.bz2
+# chk b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d
# last changed: 2015-09-09
# by: ah
@@ -497,6 +499,12 @@ server http://files.intevation.de/projects/gpg4all
file pinentry/pinentry-0.9.8-beta18.tar.bz2
chk 67b017001928ad072f57435b72d473a961f64bfb17c792e42984dc31f72ae7d1
+# ditto for gpgme.
+# by: ah
+# verified: tarball created by ah
+file gpgme/gpgme-1.7.0-beta225.tar.bz2
+chk c70f1699fc9af870d9225f57878385b49f9d571b2a8cfd17c73613b7ea983c56
+
# Gpgmepp
# last changed: 2016-01-21
# by: ah
diff --git a/src/Makefile.am b/src/Makefile.am
index fbec3b9..c0fe8a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,13 +237,15 @@ gpg4win_pkg_pinentry_configure = \
gpg4win_pkg_gpgme_configure = --silent \
--with-gpg-error-prefix=$(idir) --enable-static \
`test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
- --disable-w32-qt CFLAGS=-I$(idir)/include/glib-2.0/ \
- LDFLAGS=-L$(idir)/lib
+ CFLAGS=-I$(idir)/include/glib-2.0/ \
+ LDFLAGS=-L$(idir)/lib \
+ --enable-languages=no
gpg4win_pkg_gpgme_ex_configure = --silent \
--with-gpg-error-prefix=$(ex_idir) --enable-static \
--with-libassuan-prefix=$(ex_idir) \
- LDFLAGS=-L$(ex_idir)/lib
+ LDFLAGS=-L$(ex_idir)/lib \
+ --enable-languages=no
gpg4win_pkg_gpa_configure = --silent \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
commit 98ada44113d4ab17012620e0087766391e4ea807
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Jul 12 15:40:51 2016 +0200
Add script to update KDE-Frameworks
* packages/gen-frameworks.sh: New.
* packages/Makefile.am (EXTRA_DIST): Update accordingly.
diff --git a/packages/Makefile.am b/packages/Makefile.am
index dfa7854..fb559bf 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-EXTRA_DIST = download.sh packages.current
+EXTRA_DIST = download.sh packages.current gen-frameworks.sh
#upload: packages.current packages.current.sig
diff --git a/packages/gen-frameworks.sh b/packages/gen-frameworks.sh
new file mode 100755
index 0000000..8afc7da
--- /dev/null
+++ b/packages/gen-frameworks.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+# Copyright (C) 2016 Intevation 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+# Grab the version information for KDE Frameworks and generate a text block
+# that can be copy and pasted into packages.current.
+#
+# Ideally KDE will PGP Sign their releases soon.
+
+set -e
+
+if [ -z "$1" ]; then
+ echo "Usage $0 <Version>"
+ exit 1
+fi
+
+FRAMEWORKS="extra-cmake-modules
+ kconfig
+ ki18n
+ kwidgetsaddons
+ kcompletion
+ kwindowsystem
+ kcoreaddons
+ kcodecs
+ kconfigwidgets
+ kxmlgui
+ kguiaddons
+ kitemviews
+ kitemmodels
+ kiconthemes
+ breeze-icons
+ karchive"
+
+tmpdir=$(mktemp -d)
+
+# StartComs authenticates KDE.org
+cat > "$tmpdir/startcom.pem" << EOF
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+EOF
+curl --cacert $tmpdir/startcom.pem "https://www.kde.org/info/kde-frameworks-${1}.php" > \
+ $tmpdir/relpage
+
+majorversion=$(echo $1 | head -c 4)
+curdate=$(date +%Y-%m-%d)
+
+for fw in $FRAMEWORKS; do
+ # Download sha1sums and pacakges over http now and verify that file matches sha1
+ curl -L -s "http://download.kde.org/stable/frameworks/$majorversion/$fw-$1.tar.xz.sha1" > "$tmpdir/$fw-$1.tar.xz.sha1"
+ curl -L -s "http://download.kde.org/stable/frameworks/$majorversion/$fw-$1.tar.xz" > "$tmpdir/$fw-$1.tar.xz"
+ cd $tmpdir
+ if ! cat "$tmpdir/$fw-$1.tar.xz.sha1" | sha1sum -c > /dev/null 2>&1; then
+ echo "failed to verify sha1sum for $fw-$1.tar.xz"
+ exit 1
+ fi
+ cd - > /dev/null
+ # Now to validate that the sha1 is actually part of the https release page
+ sha1=$(cat "$tmpdir/$fw-$1.tar.xz.sha1" | cut -d ' ' -f 1)
+ if ! grep -q "$sha1" "$tmpdir/relpage"; then
+ echo "Sha1sum not found on release page!"
+ exit 1
+ fi
+
+ sha2=$(sha256sum $tmpdir/$fw-$1.tar.xz | cut -d ' ' -f 1)
+
+ echo "# $fw"
+ echo "# last changed: $curdate"
+ echo "# by: ah"
+ echo "# verified: https://www.kde.org/info/kde-frameworks-${1}.php (created by gen-frameworks.sh)"
+ echo "file $majorversion/$fw-$1.tar.xz"
+ echo "chk $sha2"
+ echo ""
+done
+
+rm -r $tmpdir
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
configure.ac | 5 +-
packages/Makefile.am | 2 +-
packages/gen-frameworks.sh | 131 ++++++++++++++++
packages/packages.current | 171 +++++++++++----------
patches/gpgmepp/drop-version-dep.patch | 16 --
.../kconfigwidgets/0001-Make-QDbus-optional.patch | 6 +-
...se-QLocale-system-uiLanguages-as-fallback.patch | 100 ------------
patches/kiconthemes/0001-Make-DBus-optional.patch | 9 +-
.../0002-Make-QDBus-dependency-optional.patch | 2 +-
src/Makefile.am | 11 +-
src/config.nsi.in | 4 +
src/{inst-kitemmodels.nsi => inst-karchive.nsi} | 10 +-
src/inst-sections.nsi | 10 ++
...{uninst-kitemmodels.nsi => uninst-karchive.nsi} | 8 +-
15 files changed, 267 insertions(+), 219 deletions(-)
create mode 100755 packages/gen-frameworks.sh
delete mode 100755 patches/gpgmepp/drop-version-dep.patch
delete mode 100755 patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch
copy src/{inst-kitemmodels.nsi => inst-karchive.nsi} (80%)
copy src/{uninst-kitemmodels.nsi => uninst-karchive.nsi} (83%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list