[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-66-g7f867e2
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Feb 9 12:23:40 CET 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, kleo-kf5 has been updated
via 7f867e27e05f221fb38afef21085f4968e916235 (commit)
via 1c6c1eb6cf5a327b1bd261c6e984a04359c4ffa5 (commit)
via db51cbd0c07596d704229cc00bb5f917076438e9 (commit)
from 56dc2f30920982718d1deeff88b9587ad173f6f8 (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 7f867e27e05f221fb38afef21085f4968e916235
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 9 12:22:25 2016 +0100
Fix dependencies for KDE Frameworks packages
* configure.ac: Fix dependencies of KDE Frameworks.
--
Nearly all Tier 1 Frameworks depend on qttools for linguist.
Breeze Icons depends on Qt.
diff --git a/configure.ac b/configure.ac
index 432b448..6d9c5b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,7 +344,7 @@ GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([qtsvg], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_KDEPKG([breeze-icons], [extra-cmake-modules])
+GPG4WIN_KDEPKG([breeze-icons], [extra-cmake-modules qtbase])
GPG4WIN_KDEPKG([kleopatra], [breeze-icons kxmlgui libkleo])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
@@ -353,12 +353,12 @@ GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
GPG4WIN_KDEPKG([kwindowsystem], [qtbase qtwinextras])
-GPG4WIN_KDEPKG([kcoreaddons], [qtbase])
-GPG4WIN_KDEPKG([kcodecs], [qtbase])
-GPG4WIN_KDEPKG([kguiaddons], [qtbase])
+GPG4WIN_KDEPKG([kcoreaddons], [qtbase qttools])
+GPG4WIN_KDEPKG([kcodecs], [qtbase qttools])
+GPG4WIN_KDEPKG([kguiaddons], [qtbase qttools])
GPG4WIN_KDEPKG([kmime], [kcodecs])
GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfig])
-GPG4WIN_KDEPKG([kitemviews], [qtbase])
+GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets kiconthemes])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
commit 1c6c1eb6cf5a327b1bd261c6e984a04359c4ffa5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 9 12:19:57 2016 +0100
Update XMLGui DBus optional patch
* patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch: Update.
* src/Makefile.am (gpg4win_pkg_kxmlgui_configure): Add new options.
--
The updated patch fixes the installed cmake config and adds the
optional stuff as an option which has more chance to go upstream.
diff --git a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
index e4b586b..8fb1414 100755
--- a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
+++ b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
@@ -2,10 +2,10 @@
patch -p1 -l -f $* < $0
exit $?
-From f13bd3aff95038689b1f1b728f9929215785caf7 Mon Sep 17 00:00:00 2001
+From 7e0831d090db72319a8b0629d16693fef690808f Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke at intevation.de>
Date: Tue, 26 Jan 2016 18:18:56 +0100
-Subject: [PATCH 2/3] Make QDBus dependency optional
+Subject: [PATCH] Make QDBus dependency optional
If an application is "standalone" DBus IPC may not be neccessary.
This main use case for this are platforms like Windows where DBus
@@ -13,8 +13,11 @@ is foreign.
Features lost without DBus are the handling of global style changes
in KToolBar and the general KDE DBus integration of KMainWindow.
+So this should not be done and is guarded as a FORCE option
+accordingly.
---
- CMakeLists.txt | 13 +++++++++++--
+ CMakeLists.txt | 15 ++++++++++++---
+ KF5XmlGuiConfig.cmake.in | 2 +-
autotests/kmainwindow_unittest.cpp | 10 ++++++++++
autotests/ktoolbar_unittest.cpp | 20 +++++++++++++++++++-
src/CMakeLists.txt | 15 ++++++++++++---
@@ -23,13 +26,21 @@ in KToolBar and the general KDE DBus integration of KMainWindow.
src/kmainwindowiface.cpp | 2 +-
src/ktoolbar.cpp | 13 +++++++++++--
src/kxmlguiwindow.cpp | 13 +++++++++++--
- 9 files changed, 86 insertions(+), 13 deletions(-)
+ 10 files changed, 88 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 59132d8..acb6037 100644
+index 74afa01..a6691fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -32,8 +32,7 @@ ecm_setup_version(${KF5_VERSION}
+@@ -30,12 +30,14 @@ 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)
++# Optional packages that usually should not be disabled as this might
++# break behavior users (or other developers) of this library rely on.
++option(FORCE_DISABLE_KGLOBALACCEL "Force building KXmlGui without KGlobalAccel. This will break global shortcut support. [default=OFF]" OFF)
++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)
@@ -39,23 +50,40 @@ index 59132d8..acb6037 100644
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-@@ -43,6 +42,16 @@ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
+@@ -45,6 +47,7 @@ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+
-+# Optional dependencies
-+find_package(Qt5DBus ${REQUIRED_QT_VERSION} CONFIG)
-+set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
-+ PURPOSE "KDE MainWindow DBus integration and global style change handling"
-+ URL "https://doc.qt.io/qt-5/qdbus.html"
-+ TYPE OPTIONAL
-+ )
-+set (HAVE_QDBUS ${Qt5DBus_FOUND})
-+
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"
+@@ -58,6 +61,12 @@ if (NOT FORCE_DISABLE_KGLOBALACCEL)
+ endif()
+ set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
+
++if (NOT FORCE_DISABLE_DBUS)
++ find_package(Qt5DBus ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
++ set(QT5DBUS_FIND_DEPENDENCY "find_dependency(Qt5DBus ${REQUIRED_QT_VERSION})")
++endif()
++set (HAVE_QDBUS ${Qt5DBus_FOUND})
++
+ # Subdirectories
+ add_definitions(-DTRANSLATION_DOMAIN=\"kxmlgui5\")
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+diff --git a/KF5XmlGuiConfig.cmake.in b/KF5XmlGuiConfig.cmake.in
+index ff02031..fe556c7 100644
+--- a/KF5XmlGuiConfig.cmake.in
++++ b/KF5XmlGuiConfig.cmake.in
+@@ -2,7 +2,7 @@
+
+ set(XMLGUI_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@")
+
+-find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
++ at QT5DBUS_FIND_DEPENDENCY@
+ find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
+ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
+
diff --git a/autotests/kmainwindow_unittest.cpp b/autotests/kmainwindow_unittest.cpp
index 00282ef..7bbd581 100644
--- a/autotests/kmainwindow_unittest.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d631732..3659538 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -336,6 +336,10 @@ endef
gpg4win_pkg_kleopatra_configure = \
-DFORCE_DISABLE_KCMUTILS=ON
+gpg4win_pkg_kxmlgui_configure = \
+ -DFORCE_DISABLE_KGLOBALACCEL=ON \
+ -DFORCE_DISABLE_DBUS=ON
+
# Supported make-only source packages.
gpg4win_mpkgs = bzip2 zlib
commit db51cbd0c07596d704229cc00bb5f917076438e9
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 9 12:19:11 2016 +0100
Use respun tarball for Kleopatra
* packages/packages.current (kleopatra): Update tarball.
--
The old one extracted into a wrong subdirectory.
diff --git a/packages/packages.current b/packages/packages.current
index 2f700ca..d131b86 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -527,5 +527,5 @@ chk 668b115e7e025b5408f53ced73056f5c4f660993
# last changed: 2016-02-04
# by: ah
# verified: Tarball created by ah.
-file kleopatra/kleopatra-201602041528.tar.gz
-chk c377cbf3acbd8c415d1d1f7f5ff956fc37d0d33c
+file kleopatra/kleopatra-201602041645.tar.gz
+chk 9a18625324bf6ae42635470d220e722d66e91513
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 10 ++--
packages/packages.current | 4 +-
.../0002-Make-QDBus-dependency-optional.patch | 60 ++++++++++++++++------
src/Makefile.am | 4 ++
4 files changed, 55 insertions(+), 23 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list