Update KDE Frameworks to 5.55.0
authorAndre Heinecke <aheinecke@gnupg.org>
Mon, 18 Feb 2019 18:01:16 +0000 (19:01 +0100)
committerAndre Heinecke <aheinecke@gnupg.org>
Mon, 18 Feb 2019 18:01:16 +0000 (19:01 +0100)
* things: Fix, rebase and update them.

packages/packages.current
patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
patches/kconfigwidgets/0001-Make-QDbus-optional.patch
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch [deleted file]
patches/kiconthemes/0001-Make-DBus-optional.patch
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch [deleted file]
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch
src/Makefile.am
src/gpg4win.mk.in

index 86b6ba1..b4dbe25 100644 (file)
@@ -411,130 +411,132 @@ chk 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7
 
 # KDE Frameworks generated by gen-frameworks.sh
 
-server https://download.kde.org/Attic/frameworks/
+# 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: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/extra-cmake-modules-5.43.0.tar.xz
-chk 5757a5ddceede5321b58345a8dbf953c2282487bf9c24ae477efde800b94fffd
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/extra-cmake-modules-5.55.0.tar.xz
+chk 649453922aef38a24af04258ab6661ddfd566aaba4d1773a9e1f4799344406f5
 
 # kconfig
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kconfig-5.43.0.tar.xz
-chk 22ebe055ae6545e01653b2e7d678145261cc5073202561735a894aa59b5841d9
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kconfig-5.55.0.tar.xz
+chk 4a566842d566e9904d1478fa428cbf8b1caf49efe142ae237f24a4c16e64fa19
 
 # ki18n
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/ki18n-5.43.0.tar.xz
-chk 8a802507ba6a5a91470d09c649e842843d70f37968d86473567928f2cdee57ff
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/ki18n-5.55.0.tar.xz
+chk 22fdd19fe805467b15abc977143d951acaa5026a0b2de7b972c9af15f1977c4f
 
 # kwidgetsaddons
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kwidgetsaddons-5.43.0.tar.xz
-chk 59a7329e8a4a3b22677dc09648de9c0a042b9ae284af2556c5db48394a9aa797
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kwidgetsaddons-5.55.0.tar.xz
+chk ec5b7ffd47c2b26763e363f741f0d57d280330fdc32c061896bdc32cebdeeb4e
 
 # kcompletion
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kcompletion-5.43.0.tar.xz
-chk 2999af185dea2164b6943c9cabf2330e4cae4bea46863a1c3d66e86b04ffb618
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kcompletion-5.55.0.tar.xz
+chk 224761954421b2e25c2b9651c7e730da9fb7a569674c399c867a9f895d3ad523
 
 # kwindowsystem
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kwindowsystem-5.43.0.tar.xz
-chk 4df6da4f313f8c52a5d202caa5cc90791b4a07f0d91d5b7252e2da5487a6997d
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kwindowsystem-5.55.0.tar.xz
+chk a698ddf3caeb890314b3b768a15b4cc35dd9e10356af4cf9faa89c8640eded83
 
 # kcoreaddons
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kcoreaddons-5.43.0.tar.xz
-chk c67f008b79365913cbb8c62d2b1b48353c1302f6a351a9bc34b874b18392ef82
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kcoreaddons-5.55.0.tar.xz
+chk 3cd840b3f308b4529012d16aeee05494b5e55c938b6ad7f6580d4d055d61ebc8
 
 # kcodecs
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kcodecs-5.43.0.tar.xz
-chk 5bc09761bf3a3e5fcbea76b1b41c2f07e372fd8449c14fb7276250e177ff9959
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kcodecs-5.55.0.tar.xz
+chk 4bd6fd48268d83b59f1b3c8ee19a50d9bee72f3601098dd5bb8e4b24a8912111
 
 # kconfigwidgets
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kconfigwidgets-5.43.0.tar.xz
-chk 7c9016f2c98452d912359def78185f4bf3c6f8c45833fe0e321278124c45bbe3
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kconfigwidgets-5.55.0.tar.xz
+chk b3acbce98798eb5fe897fae671b898697b5ffdd2e357aa8d4750305abeb9ee5a
 
 # kxmlgui
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kxmlgui-5.43.0.tar.xz
-chk a3fd16055c5c37130edc80cc331356dea0be78ad227ed4bf00d45bb59dbfccca
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kxmlgui-5.55.0.tar.xz
+chk 963dd83e7898946933b0ea3d0b70afba910d63ce4b2074ee664c0797d53f065e
 
 # kguiaddons
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kguiaddons-5.43.0.tar.xz
-chk 19b32ef071dd51271b5999f22968864cf8409cb8caf9c9daa7707a922f71da7c
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kguiaddons-5.55.0.tar.xz
+chk 039a0f98b5491668ea4e2e45ca57c68bd5fea956f46ba50778283a8137e412a4
 
 # kitemviews
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kitemviews-5.43.0.tar.xz
-chk 304cbdd832b12c9e2b08f29efc5d876a9de60076d444c3d502849fdc21ec86a7
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kitemviews-5.55.0.tar.xz
+chk 4d91a42f300cb63cd817feceebe148b32a22cf75b8228c853a0c2ed6cb3ff0d5
 
 # kitemmodels
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kitemmodels-5.43.0.tar.xz
-chk ad617dc843297c2c4d5db97ea528c44c886d52c89125a77f9494da09de8187fb
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kitemmodels-5.55.0.tar.xz
+chk 862f2b2888a563ff9f61bd25e59b637ca16c8531679cec7f3ad1653cb74ac08c
 
 # kiconthemes
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kiconthemes-5.43.0.tar.xz
-chk 5ce7918311b89e30a4715f3ebeeb7263c550c9e9c59556a1a6e45ad24442ac80
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kiconthemes-5.55.0.tar.xz
+chk 3c1be304537d4c7eedd097463c977b3d0e845c575567ffc53faff7b3e874ebe5
 
 # breeze-icons
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/breeze-icons-5.43.0.tar.xz
-chk 3eda58a4c7c9369fe9b246500d88a964d3411f83e1113727ed723989d935dea7
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/breeze-icons-5.55.0.tar.xz
+chk 89381f2e78cd479c533095bc0a58da74c8bbe6ca2ee64a9664060a56513fab0e
 
 # karchive
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/karchive-5.43.0.tar.xz
-chk 0e639a2818700220bf20aea83a00697b385d67f39eba5840b400d8d72ec477b8
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/karchive-5.55.0.tar.xz
+chk 8475efa46cdc054d9fb6336e42c6075fb037921a9147d4e5aa564a5e58b79fd2
 
 # kcrash
-# last changed: 2018-02-27
+# last changed: 2019-02-18
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
-file 5.43/kcrash-5.43.0.tar.xz
-chk 2b74ab0d0d393c32a7e53e16757763fbe91d25e8dd157e860dec45a047866ec3
+# verified: PGP Signed by ./kde-release-key.gpg (created by gen-frameworks.sh)
+file 5.55/kcrash-5.55.0.tar.xz
+chk c90d96fbac26727e1de32898a93bb7cbc9a05ee992c11d4303941ab96a614821
 
 ##### End Paste #####
 
index 27e8e1a..24cf44c 100755 (executable)
@@ -89,39 +89,24 @@ diff --git a/modules/ECMAddAppIcon.cmake b/modules/ECMAddAppIcon.cmake
 index 5233a5f..2b5dca1 100644
 --- a/modules/ECMAddAppIcon.cmake
 +++ b/modules/ECMAddAppIcon.cmake
-@@ -128,10 +128,22 @@ function(ecm_add_app_icon appsources)
-     if (WIN32 AND windows_icons)
+@@ -192,8 +192,11 @@
+     if (WIN32 AND (windows_icons_modern OR windows_icons_classic))
          set(saved_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
          set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_FIND_MODULE_DIR})
 -        find_package(Png2Ico)
+-        find_package(IcoTool)
 +        find_package(Convert)
 +        if (NOT Convert_FOUND)
++            find_package(IcoTool)
 +            find_package(Png2Ico)
 +        endif()
          set(CMAKE_MODULE_PATH "${saved_CMAKE_MODULE_PATH}")
 
--        if (Png2Ico_FOUND)
-+        if (Convert_FOUND)
-+            set(windows_icons ${windows_icons} ${icons_at_256px})
-+            add_custom_command(
-+                OUTPUT "${_outfilename}.ico"
-+                COMMAND Convert::Convert
-+                ARGS ${windows_icons} "${_outfilename}.ico"
-+                DEPENDS ${windows_icons}
-+                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-+            )
-+        elseif (Png2Ico_FOUND)
-             if (Png2Ico_HAS_RCFILE_ARGUMENT)
-                 add_custom_command(
-                     OUTPUT "${_outfilename}.rc" "${_outfilename}.ico"
-@@ -151,6 +163,14 @@ function(ecm_add_app_icon appsources)
-                     DEPENDS ${windows_icons}
+         function(create_windows_icon_and_rc command args deps)
+@@ -204,6 +207,10 @@
+                     DEPENDS ${deps}
                      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
                  )
-+            endif()
-+        else()
-+            message(WARNING "Unable to find the png2ico or convert utility - application will not have an application icon!")
-+        endif()
 +
 +        if (Convert_FOUND OR Png2Ico_FOUND)
 +            set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
@@ -129,15 +114,23 @@ index 5233a5f..2b5dca1 100644
                  # this bit's a little hacky to make the dependency stuff work
                  file(WRITE "${_outfilename}.rc.in" "IDI_ICON1        ICON        DISCARDABLE    \"${_outfilename}.ico\"\n")
                  add_custom_command(
-@@ -161,9 +181,6 @@ function(ecm_add_app_icon appsources)
+@@ -220,6 +220,8 @@
+                     DEPENDS "${_outfilename}.ico"
                      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
                  )
-             endif()
--            set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
++            endif()
++        endif()
+         endfunction()
+
+         if (IcoTool_FOUND)
+@@ -270,8 +281,6 @@
+
+             set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
+         # else none of the supported tools was found
 -        else()
--            message(WARNING "Unable to find the png2ico utility - application will not have an application icon!")
+-            message(WARNING "Unable to find the png2ico or icotool utilities or icons in matching sizes - application will not have an application icon!")
          endif()
-     elseif (APPLE AND mac_icons)
+     elseif (APPLE AND (mac_icons OR mac_sidebar_icons))
          # first generate .iconset directory structure, then convert to .icns format using the Mac OS X "iconutil" utility,
 --
 2.1.4
index 893dde7..615d5ec 100755 (executable)
@@ -11,120 +11,28 @@ This removes the Klipper integration of KPasteAction if QDBus
 is not available.
 ---
  CMakeLists.txt                    | 11 ++++++++++-
- src/CMakeLists.txt                |  7 ++++++-
- src/config-kconfigwidgets.h.cmake |  2 ++
- src/kpastetextaction.cpp          | 14 ++++++++++++--
- 4 files changed, 30 insertions(+), 4 deletions(-)
- create mode 100644 src/config-kconfigwidgets.h.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index bed53d1..87f976c 100644
 --- CMakeLists.txt.orig 2018-02-28 08:33:32.052419561 +0100
 +++ CMakeLists.txt      2018-02-28 08:35:44.523986191 +0100
-@@ -12,7 +12,17 @@
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
- set(REQUIRED_QT_VERSION 5.7.0)
--find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
-+find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets)
-+if (UNIX)
-+    find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED DBus)
-+#else()
-+#    find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
-+#    set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
-+#                           PURPOSE "KPasteAction klipper integration."
-+#                           URL "https://doc.qt.io/qt-5/qdbus.html"
-+#                           TYPE OPTIONAL)
-+endif()
-+set (HAVE_QDBUS ${Qt5DBus_FOUND})
+@@ -13,7 +13,7 @@
+
+ set(REQUIRED_QT_VERSION 5.10.0)
+ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets)
+-if (NOT ANDROID)
++if (NOT ANDROID AND NOT WIN32)
+   find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED DBus)
+ endif()
  include(KDEInstallDirs)
- include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 97837b3..104b118 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+if (HAVE_QDBUS)
-+    set (KCONFIGWIDGETS_QDBUS_LIBS Qt5::DBus)
-+endif ()
-+configure_file(config-kconfigwidgets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfigwidgets.h )
-+
- set(kconfigwidgets_SRCS
-   kcodecaction.cpp
-   kcolorscheme.cpp
-@@ -29,7 +34,7 @@ target_link_libraries(KF5ConfigWidgets
-     KF5::ConfigGui # KStandardAction uses KStandardShortcut
-     KF5::Auth # KCModule uses KAuth::Action
-   PRIVATE
--    Qt5::DBus # KPasteTextAction talks to Klipper via DBus
-+    ${KCONFIGWIDGETS_QDBUS_LIBS} # KPasteTextAction talks to Klipper via DBus
-     KF5::CoreAddons # KCModule uses KAboutData, KTipDialog uses KRandom
-     KF5::GuiAddons # KColorScheme uses KColorUtils
-     KF5::I18n # For action and widget texts
-diff --git a/src/config-kconfigwidgets.h.cmake b/src/config-kconfigwidgets.h.cmake
-new file mode 100644
-index 0000000..4a933fa
---- /dev/null
-+++ b/src/config-kconfigwidgets.h.cmake
-@@ -0,0 +1,2 @@
-+/* Qt5DBus available */
-+#cmakedefine01 HAVE_QDBUS
-diff --git a/src/kpastetextaction.cpp b/src/kpastetextaction.cpp
-index a38aa0c..3c5a614 100644
---- a/src/kpastetextaction.cpp
-+++ b/src/kpastetextaction.cpp
-@@ -27,11 +27,15 @@
-
- #include "kpastetextaction.h"
-
-+#include "config-kconfigwidgets.h"
-+
- #include <QApplication>
- #include <QClipboard>
- #include <QMenu>
--#include <QDBusInterface>
--#include <QDBusReply>
-+#if HAVE_QDBUS
-+# include <QDBusInterface>
-+# include <QDBusReply>
-+#endif
-
- class KPasteTextActionPrivate
- {
-@@ -97,6 +101,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
- {
-     m_popup->clear();
-     QStringList list;
-+#if HAVE_QDBUS
-     QDBusInterface klipper(QStringLiteral("org.kde.klipper"), QStringLiteral("/klipper"), QStringLiteral("org.kde.klipper.klipper"));
-     if (klipper.isValid()) {
-         QDBusReply<QStringList> reply = klipper.call(QStringLiteral("getClipboardHistoryMenu"));
-@@ -104,6 +109,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
-             list = reply;
-         }
-     }
-+#endif
-     QString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard);
-     if (list.isEmpty()) {
-         list << clipboardText;
-@@ -123,6 +129,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
-
- void KPasteTextActionPrivate::_k_slotTriggered(QAction *action)
- {
-+#if HAVE_QDBUS
-     QDBusInterface klipper(QStringLiteral("org.kde.klipper"), QStringLiteral("/klipper"), QStringLiteral("org.kde.klipper.klipper"));
-     if (klipper.isValid()) {
-         QDBusReply<QString> reply = klipper.call(QStringLiteral("getClipboardHistoryItem"),
-@@ -135,6 +142,9 @@ void KPasteTextActionPrivate::_k_slotTriggered(QAction *action)
-         //if (reply.isValid())
-         //  qDebug() << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard);
-     }
-+#else
-+    Q_UNUSED(action);
-+#endif
- }
-
- #include "moc_kpastetextaction.cpp"
+@@ -34,7 +34,7 @@
+                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake"
+                         SOVERSION 5)
+
+-if (NOT ANDROID)
++if (NOT ANDROID AND NOT WIN32)
+   find_package(KF5Auth ${KF5_DEP_VERSION} REQUIRED)
+ endif()
+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
 --
 2.1.4
diff --git a/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch b/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
deleted file mode 100755 (executable)
index effd132..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-commit 1726c63ba424a3392a1cba5a993c1388f0c3eadc
-Author: Andre Heinecke <aheinecke@intevation.de>
-Date:   Tue Feb 2 13:39:27 2016 +0100
-
-    Crudely remove KF5Auth depedency
-
-    This is not intended for upstream
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 87f976c..43d447f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIGWIDGETS
-                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake"
-                         SOVERSION 5)
-
--find_package(KF5Auth ${KF5_DEP_VERSION} REQUIRED)
-+find_package(KF5Auth ${KF5_DEP_VERSION})
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-diff --git a/KF5ConfigWidgetsConfig.cmake.in b/KF5ConfigWidgetsConfig.cmake.in
-index 9096da6..660db4c 100644
---- a/KF5ConfigWidgetsConfig.cmake.in
-+++ b/KF5ConfigWidgetsConfig.cmake.in
-@@ -1,6 +1,5 @@
-
- include(CMakeFindDependencyMacro)
--find_dependency(KF5Auth "@KF5_DEP_VERSION@")
- find_dependency(KF5Codecs "@KF5_DEP_VERSION@")
- find_dependency(KF5Config "@KF5_DEP_VERSION@")
- find_dependency(KF5WidgetsAddons "@KF5_DEP_VERSION@")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 104b118..ebce4ec 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -32,7 +32,6 @@ target_link_libraries(KF5ConfigWidgets
-     KF5::Codecs # KCodecActions uses KCharsets, KEncodingProber
-     KF5::WidgetsAddons # For K*Action, KPage*, KViewStateSerializer, KAcceleratorManager, K*GuiItem
-     KF5::ConfigGui # KStandardAction uses KStandardShortcut
--    KF5::Auth # KCModule uses KAuth::Action
-   PRIVATE
-     ${KCONFIGWIDGETS_QDBUS_LIBS} # KPasteTextAction talks to Klipper via DBus
-     KF5::CoreAddons # KCModule uses KAboutData, KTipDialog uses KRandom
-@@ -78,5 +77,5 @@ install(PROGRAMS preparetips5 DESTINATION ${KDE_INSTALL_BINDIR} )
- install( FILES entry.desktop  DESTINATION  ${KDE_INSTALL_LOCALEDIR}/en_US RENAME kf5_entry.desktop )
-
- include(ECMGeneratePriFile)
--ecm_generate_pri_file(BASE_NAME KConfigWidgets LIB_NAME KF5ConfigWidgets DEPS "KCodecs KWidgetsAddons KConfigGui KAuth" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigWidgets)
-+ecm_generate_pri_file(BASE_NAME KConfigWidgets LIB_NAME KF5ConfigWidgets DEPS "KCodecs KWidgetsAddons KConfigGui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigWidgets)
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-diff --git a/src/kcmodule.cpp b/src/kcmodule.cpp
-index db6c966..cfa3ac9 100644
---- a/src/kcmodule.cpp
-+++ b/src/kcmodule.cpp
-@@ -32,7 +32,9 @@
- #include <kconfigskeleton.h>
- #include <kconfigdialogmanager.h>
- #include <klocalizedstring.h>
-+#if 0
- #include <kauthexecutejob.h>
-+#endif
-
- class KCModulePrivate
- {
-@@ -43,7 +45,9 @@ public:
-         _useRootOnlyMessage(false),
-         _firstshow(true),
-         _needsAuthorization(false),
-+#if 0
-         _authAction(),
-+#endif
-         _unmanagedWidgetChangeState(false)
-     { }
-
-@@ -59,7 +63,9 @@ public:
-     bool _firstshow : 1;
-
-     bool  _needsAuthorization : 1;
-+#if 0
-     KAuth::Action _authAction;
-+#endif
-
-     // this member is used to record the state on non-automatically
-     // managed widgets, allowing for mixed KConfigXT-drive and manual
-@@ -118,6 +124,7 @@ KConfigDialogManager *KCModule::addConfig(KConfigSkeleton *config, QWidget *widg
-     return manager;
- }
-
-+#if 0
- void KCModule::setNeedsAuthorization(bool needsAuth)
- {
-     d->_needsAuthorization = needsAuth;
-@@ -173,6 +180,7 @@ void KCModule::authStatusChanged(KAuth::Action::AuthStatus status)
-
-     qDebug() << useRootOnlyMessage();
- }
-+#endif
-
- KCModule::~KCModule()
- {
-diff --git a/src/kcmodule.h b/src/kcmodule.h
-index b01c3dc..e77b465 100644
---- a/src/kcmodule.h
-+++ b/src/kcmodule.h
-@@ -25,7 +25,9 @@
-
- #include <kconfigwidgets_export.h>
-
-+#if 0
- #include <kauthaction.h>
-+#endif
-
- #include <QVariant>
- #include <QWidget>
-@@ -197,6 +199,7 @@ public:
-      */
-     QList<KConfigDialogManager *> configs() const;
-
-+#if 0
-     /**
-      * @brief Set if the module's save() method requires authorization to be executed.
-      *
-@@ -241,6 +244,7 @@ public:
-      * @return The action that has to be authorized to execute the save() method.
-      */
-     KAuth::Action authAction() const;
-+#endif
-
-     /**
-      * Returns the value set by setExportText();
-@@ -378,10 +382,12 @@ protected Q_SLOTS:
-      */
-     void widgetChanged();
-
-+#if 0
-     /**
-      * The status of the auth action, if one, has changed
-      */
-     void authStatusChanged(KAuth::Action::AuthStatus status);
-+#endif
-
- protected:
index 0a41707..fddc7b3 100755 (executable)
@@ -21,103 +21,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 5664ea1..22642b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -32,7 +32,15 @@ ecm_setup_version(${KF5_VERSION}
- set(REQUIRED_QT_VERSION 5.3.0)
+@@ -36,7 +36,7 @@
+ set(REQUIRED_QT_VERSION 5.10.0)
  find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
  find_package(Qt5Svg ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
--find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-+#if (UNIX)
-+#else()
-+#    find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
-+#    set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
-+#                           PURPOSE "KIconLoader icon change notifications."
-+#                           URL "https://doc.qt.io/qt-5/qdbus.html"
-+#                           TYPE OPTIONAL)
-+#endif()
-+set (HAVE_QDBUS ${Qt5DBus_FOUND})
-
- find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 82d2979..f006f17 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,6 +3,11 @@ if (APPLE)
-     add_subdirectory(tools/ksvg2icns)
+-if (NOT ANDROID)
++if (NOT ANDROID AND NOT WIN32)
+   find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
  endif()
 
-+if (HAVE_QDBUS)
-+    set (QDBUS_LIBS Qt5::DBus)
-+endif ()
-+configure_file(config-kiconthemes.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kiconthemes.h )
-+
- set(kiconthemes_SRCS
-   kiconbutton.cpp
-   kicondialog.cpp
-@@ -23,7 +28,7 @@ target_link_libraries(KF5IconThemes
-   PUBLIC
-     Qt5::Widgets
-   PRIVATE
--    Qt5::DBus
-+    ${QDBUS_LIBS}      # for icon changed notification in KIconLoader
-     Qt5::Svg
-     KF5::I18n          # for i18n in KIconDialog
-     KF5::WidgetsAddons # for KPixmapSequence family
-diff --git a/src/config-kiconthemes.h.cmake b/src/config-kiconthemes.h.cmake
-new file mode 100644
-index 0000000..4a933fa
---- /dev/null
-+++ b/src/config-kiconthemes.h.cmake
-@@ -0,0 +1,2 @@
-+/* Qt5DBus available */
-+#cmakedefine01 HAVE_QDBUS
-diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
-index 75ab482..3a0ff0a 100644
---- a/src/kiconloader.cpp
-+++ b/src/kiconloader.cpp
-@@ -22,6 +22,8 @@
-  * Boston, MA 02110-1301, USA.
-  */
-
-+#include "config-kiconthemes.h"
-+
- #include "kiconloader.h"
-
- #include <qplatformdefs.h> //for readlink
-@@ -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
- #include <QSvgRenderer>
- #include <QXmlStreamReader>
- #include <QXmlStreamWriter>
-@@ -323,15 +328,21 @@ public:
-             parseGenericIconsFiles(file);
-         }
-
-+#if HAVE_QDBUS
-         QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"),
-                                               QStringLiteral("iconChanged"), this, SIGNAL(iconChanged(int)));
-+#endif
-     }
-
-     void emitChange(KIconLoader::Group group)
-     {
-+#if HAVE_QDBUS
-         QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
-         message.setArguments(QList<QVariant>() << int(group));
-         QDBusConnection::sessionBus().send(message);
-+#else
-+        Q_UNUSED(group);
-+#endif
-     }
-
-     QString genericIconFor(const QString &icon) const
 --
 2.1.4
diff --git a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
deleted file mode 100755 (executable)
index ebf6f07..0000000
+++ /dev/null
@@ -1,421 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 6f2ed92f19bcfa4d8d03a98ace3232082ddbab18 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke@intevation.de>
-Date: Thu, 2 Feb 2017 11:36:48 +0100
-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
-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
----
- CMakeLists.txt                     | 15 ++++++++++++---
- KF5XmlGuiConfig.cmake.in           |  2 +-
- autotests/kmainwindow_unittest.cpp |  2 ++
- autotests/ktoolbar_unittest.cpp    | 20 +++++++++++++++++++-
- src/CMakeLists.txt                 | 15 ++++++++++++---
- src/config-xmlgui.h.cmake          |  3 +++
- src/kmainwindow.cpp                | 10 ++++++++--
- src/kmainwindowiface.cpp           |  2 +-
- src/ktoolbar.cpp                   | 13 +++++++++++--
- src/kxmlguiwindow.cpp              | 13 +++++++++++--
- 10 files changed, 80 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9728db..7d8cd00 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,13 +30,16 @@
-                   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)
- option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
- add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
-
- # Dependencies
- set(REQUIRED_QT_VERSION 5.7.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)
-
- find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
-@@ -60,6 +64,12 @@
- 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 6f8d8ce..550e667 100644
---- a/KF5XmlGuiConfig.cmake.in
-+++ b/KF5XmlGuiConfig.cmake.in
-@@ -3,7 +3,7 @@
- set(XMLGUI_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@")
-
- include(CMakeFindDependencyMacro)
--find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
-+@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 ec73f7f..4776453 100644
---- a/autotests/kmainwindow_unittest.cpp
-+++ b/autotests/kmainwindow_unittest.cpp
-@@ -17,6 +17,8 @@
-     Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include <QTest>
- #include "kmainwindow_unittest.h"
- #include <QEventLoopLocker>
-diff --git a/autotests/ktoolbar_unittest.cpp b/autotests/ktoolbar_unittest.cpp
-index 09b96dc..241f7f0 100644
---- a/autotests/ktoolbar_unittest.cpp
-+++ b/autotests/ktoolbar_unittest.cpp
-@@ -18,10 +18,14 @@
-     Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include "testxmlguiwindow.h"
- #include "testguiclient.h"
-
--#include <QDBusConnection>
-+#if HAVE_QDBUS
-+# include <QDBusConnection>
-+#endif
- #include <QDir>
- #include <QFile>
- #include <QFileInfo>
-@@ -80,7 +84,9 @@ protected:
- private:
-     void changeGlobalIconSizeSetting(int, int);
-     void deleteGlobalIconSizeSetting();
-+#if HAVE_QDBUS
-     void changeGlobalToolButtonStyleSetting(const QString &, const QString &);
-+#endif
-     void deleteGlobalToolButtonStyleSetting();
-     QByteArray m_xml;
-     bool m_showWasCalled;
-@@ -427,6 +433,7 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
-         QCOMPARE((int)mainToolBar->toolButtonStyle(), (int)toolButtonStyle);
-         QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
-
-+#if HAVE_QDBUS
-         // Now change KDE-global setting
-         changeGlobalToolButtonStyleSetting(QStringLiteral("IconOnly"), QStringLiteral("TextOnly"));
-
-@@ -441,6 +448,9 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
-         } else {
-             QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
-         }
-+#else
-+        Q_UNUSED(selectedDefaultForOtherToolbar);
-+#endif
-     }
- }
-
-@@ -490,16 +500,23 @@ void tst_KToolBar::testToolButtonStyleXmlGui()
-         // Save settings
-         kmw.saveMainWindowSettings(group);
-
-+#if HAVE_QDBUS
-         // Now change KDE-global setting
-         changeGlobalToolButtonStyleSetting(QStringLiteral("IconOnly"), QStringLiteral("TextOnly"));
-
-         QCOMPARE((int)mainToolBar->toolButtonStyle(), (int)expectedStyleMainToolbar);
-         QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)expectedStyleOtherToolbar);
-         QCOMPARE((int)cleanToolBar->toolButtonStyle(), (int)expectedStyleCleanToolbar);
-+#else
-+        Q_UNUSED(expectedStyleMainToolbar);
-+        Q_UNUSED(expectedStyleOtherToolbar);
-+        Q_UNUSED(expectedStyleCleanToolbar);
-+#endif
-
-     }
- }
-
-+#if HAVE_QDBUS
- void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar, const QString &otherToolBars)
- {
-     KConfigGroup group(KSharedConfig::openConfig(), "Toolbar style");
-@@ -517,6 +534,7 @@ void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar
-     KToolBar::emitToolbarStyleChanged();
-     spy.wait(2000);
- }
-+#endif
-
- void tst_KToolBar::deleteGlobalToolButtonStyleSetting()
- {
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8126b5e..e849ab7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -6,6 +6,10 @@ endif ()
- if (HAVE_GLOBALACCEL)
-    set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::GlobalAccel)
- endif ()
-+if (HAVE_QDBUS)
-+   set (XMLGUI_QDBUS_LIBS Qt5::DBus)
-+   set (XMLGUI_DBUS_PRI_NAME "dbus")
-+endif ()
- if(WIN32)
-     set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} secur32) # GetUserNameEx()
- endif()
-@@ -33,7 +37,6 @@ set(kxmlgui_SRCS
-   khelpmenu.cpp
-   kkeysequencewidget.cpp
-   kmainwindow.cpp
--  kmainwindowiface.cpp
-   kmenumenuhandler_p.cpp
-   kshortcuteditwidget.cpp
-   kshortcutschemeseditor.cpp
-@@ -56,6 +59,12 @@ set(kxmlgui_SRCS
-   kundoactions.cpp
-   kcheckaccelerators.cpp
- )
-+if (HAVE_QDBUS)
-+  set(kxmlgui_SRCS
-+    ${kxmlgui_SRCS}
-+    kmainwindowiface.cpp
-+  )
-+endif()
-
- # add the resource file
- qt5_add_resources(kxmlgui_SRCS kxmlgui.qrc)
-@@ -77,7 +86,7 @@ target_include_directories(KF5XmlGui INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTAL
-
- target_link_libraries(KF5XmlGui
- PUBLIC
--    Qt5::DBus           #QDBus connect to signal in KToolBar
-+    ${XMLGUI_QDBUS_LIBS} #QDBus connect to signal in KToolBar
-     Qt5::Xml            #To parse the configuration (QDomDocument etc)
-     Qt5::Widgets        #QWidget is used everywhere
-     KF5::ConfigCore         #Reading config for ToolbarIcons, Shortcut Schemes...
-@@ -138,5 +147,5 @@ install(FILES
- install( FILES ui_standards.rc  DESTINATION  ${KDE_INSTALL_CONFDIR}/ui )
-
- include(ECMGeneratePriFile)
--ecm_generate_pri_file(BASE_NAME KXmlGui LIB_NAME KF5XmlGui DEPS "dbus xml widgets KConfigCore KConfigWidgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KXmlGui)
-+ecm_generate_pri_file(BASE_NAME KXmlGui LIB_NAME KF5XmlGui DEPS "${XMLGUI_DBUS_PRI_NAME} xml widgets KConfigCore KConfigWidgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KXmlGui)
- install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-diff --git a/src/config-xmlgui.h.cmake b/src/config-xmlgui.h.cmake
-index 9d7f3dc..35c9477 100644
---- a/src/config-xmlgui.h.cmake
-+++ b/src/config-xmlgui.h.cmake
-@@ -7,3 +7,6 @@
-
- /* KF5GlobalAccel available */
- #cmakedefine01 HAVE_GLOBALACCEL
-+
-+/* Qt5DBus available */
-+#cmakedefine01 HAVE_QDBUS
-diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
-index 46588d2..fb8eca3 100644
---- a/src/kmainwindow.cpp
-+++ b/src/kmainwindow.cpp
-@@ -23,11 +23,11 @@
-     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
- */
-+#include "config-xmlgui.h"
-
- #include "kmainwindow.h"
-
- #include "kmainwindow_p.h"
--#include "kmainwindowiface_p.h"
- #include "ktoolbarhandler_p.h"
- #include "khelpmenu.h"
- #include "ktoolbar.h"
-@@ -46,7 +46,6 @@
- #include <QStyle>
- #include <QWidget>
- #include <QWindow>
--#include <QDBusConnection>
-
- #include <ktoggleaction.h>
- #include <kaboutdata.h>
-@@ -58,6 +57,11 @@
- #include <kwindowconfig.h>
- #include <kconfiggui.h>
-
-+#if HAVE_QDBUS
-+# include "kmainwindowiface_p.h"
-+# include <QDBusConnection>
-+#endif
-+
- //#include <ctype.h>
-
- static const char WINDOW_PROPERTIES[]="WindowProperties";
-@@ -340,6 +344,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
-     q->winId(); // workaround for setWindowRole() crashing, and set also window role, just in case TT
-     q->setWindowRole(s);   // will keep insisting that object name suddenly should not be used for window role
-
-+#if HAVE_QDBUS
-     dbusName = QLatin1Char('/') + QCoreApplication::applicationName() + QLatin1Char('/');
-     dbusName += q->objectName().replace(QLatin1Char('/'), QLatin1Char('_'));
-     // Clean up for dbus usage: any non-alphanumeric char should be turned into '_'
-@@ -355,6 +360,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
-             QDBusConnection::ExportNonScriptableSlots |
-             QDBusConnection::ExportNonScriptableProperties |
-             QDBusConnection::ExportAdaptors);
-+#endif
- }
-
- void KMainWindowPrivate::setSettingsDirty(CallCompression callCompression)
-diff --git a/src/kmainwindowiface.cpp b/src/kmainwindowiface.cpp
-index c194bec..25439b3 100644
---- a/src/kmainwindowiface.cpp
-+++ b/src/kmainwindowiface.cpp
-@@ -18,8 +18,8 @@
-    Boston, MA 02110-1301, USA.
- */
-
--#include "kmainwindowiface_p.h"
-
-+#include "kmainwindowiface_p.h"
- #include "kactioncollection.h"
- #include "kxmlguiwindow.h"
-
-diff --git a/src/ktoolbar.cpp b/src/ktoolbar.cpp
-index 4569524..f77d965 100644
---- a/src/ktoolbar.cpp
-+++ b/src/ktoolbar.cpp
-@@ -24,6 +24,8 @@
-     Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include "ktoolbar.h"
-
- #include <QPointer>
-@@ -38,10 +40,13 @@
- #include <QMouseEvent>
- #include <QToolButton>
- #include <QtXml/QDomElement>
--#include <QDBusConnection>
--#include <QDBusMessage>
- #include <QDebug>
-
-+#if HAVE_QDBUS
-+# include <QDBusConnection>
-+# include <QDBusMessage>
-+#endif
-+
- #include <kauthorized.h>
- #include <kconfig.h>
- #include <ksharedconfig.h>
-@@ -275,8 +280,10 @@ void KToolBar::Private::init(bool readConfig, bool _isMainToolBar)
-
-     q->setAcceptDrops(true);
-
-+#if HAVE_QDBUS
-     QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KToolBar"), QStringLiteral("org.kde.KToolBar"),
-                                           QStringLiteral("styleChanged"), q, SLOT(slotAppearanceChanged()));
-+#endif
-     connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()),
-             q, SLOT(slotAppearanceChanged()));
- }
-@@ -1467,8 +1474,10 @@ bool KToolBar::toolBarsLocked()
-
- void KToolBar::emitToolbarStyleChanged()
- {
-+#if HAVE_QDBUS
-     QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KToolBar"), QStringLiteral("org.kde.KToolBar"), QStringLiteral("styleChanged"));
-     QDBusConnection::sessionBus().send(message);
-+#endif
- }
-
- #include "moc_ktoolbar.cpp"
-diff --git a/src/kxmlguiwindow.cpp b/src/kxmlguiwindow.cpp
-index 24d48f1..5b9fac7 100644
---- a/src/kxmlguiwindow.cpp
-+++ b/src/kxmlguiwindow.cpp
-@@ -23,13 +23,14 @@
-     Boston, MA 02110-1301, USA.
- */
-
-+#include "config-xmlgui.h"
-+
- #include "kxmlguiwindow.h"
- #include "debug.h"
-
- #include "kmainwindow_p.h"
- #include "kmessagebox.h"
- #include "kactioncollection.h"
--#include "kmainwindowiface_p.h"
- #include "ktoolbarhandler_p.h"
- #include "kxmlguifactory.h"
- #include "kedittoolbar.h"
-@@ -37,7 +38,6 @@
- #include "ktoolbar.h"
-
- #include <QCloseEvent>
--#include <QDBusConnection>
- #include <QtXml/QDomDocument>
- #include <QLayout>
- #include <QMenuBar>
-@@ -47,6 +47,11 @@
- #include <QWidget>
- #include <QList>
-
-+#if HAVE_QDBUS
-+# include "kmainwindowiface_p.h"
-+# include <QDBusConnection>
-+#endif
-+
- #include <ktoggleaction.h>
- #include <kstandardaction.h>
- #include <kconfig.h>
-@@ -87,7 +92,9 @@
-     d->toolBarHandler = nullptr;
-     d->showStatusBarAction = nullptr;
-     d->factory = nullptr;
--    new KMainWindowInterface(this);
-+#if HAVE_QDBUS
-+     new KMainWindowInterface(this);
-+#endif
- }
-
- QAction *KXmlGuiWindow::toolBarMenuAction()
-@@ -117,6 +124,7 @@
- bool KXmlGuiWindow::event(QEvent *ev)
- {
-     bool ret = KMainWindow::event(ev);
-+#if HAVE_QDBUS
-     if (ev->type() == QEvent::Polish) {
-         QDBusConnection::sessionBus().registerObject(dbusName() + QStringLiteral("/actions"), actionCollection(),
-                 QDBusConnection::ExportScriptableSlots |
-@@ -125,6 +133,7 @@
-                 QDBusConnection::ExportNonScriptableProperties |
-                 QDBusConnection::ExportChildObjects);
-     }
-+#endif
-     return ret;
- }
-
---
-2.1.4
index 7150e4e..a1f307d 100755 (executable)
@@ -72,10 +72,10 @@ diff --git a/src/config-xmlgui.h.cmake b/src/config-xmlgui.h.cmake
 index 35c9477..0873a95 100644
 --- a/src/config-xmlgui.h.cmake
 +++ b/src/config-xmlgui.h.cmake
-@@ -10,3 +10,6 @@
+@@ -7,3 +7,6 @@
 
- /* Qt5DBus available */
- #cmakedefine01 HAVE_QDBUS
+ /* KF5GlobalAccel available */
+ #cmakedefine01 HAVE_GLOBALACCEL
 +
 +/* KF5TextWidgets available */
 +#cmakedefine01 HAVE_TEXTWIDGETS
index acb9995..3eef90b 100644 (file)
@@ -285,7 +285,8 @@ gpg4win_pkg_gpgex_ex_configure = --silent \
 
 gpg4win_pkg_paperkey_configure = --silent
 
-gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QTSCRIPT=OFF
+gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QML=OFF
+gpg4win_pkg_kconfig_configure = -DKCONFIG_USE_DBUS=OFF
 
 gpg4win_pkg_qtbase_configure = ../$$$${pkg_version}/configure -opensource \
             -confirm-license \
index 68b4f01..33ea480 100644 (file)
@@ -640,7 +640,7 @@ stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
        (shopt -s nullglob;                             \
         $(call SETVARS,$(1));                          \
         cd "$$$${pkgsdir}";                            \
-        sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.43.0")/' CMakeLists.txt; \
+        sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.55.0")/' CMakeLists.txt; \
         sed -i 's/set(KMIME_VERSION.*)/set(KMIME_VERSION "5.2.40")/' CMakeLists.txt; \
         sed -i 's/set(LIBKLEO_VERSION.*)/set(LIBKLEO_VERSION "5.4.40")/' CMakeLists.txt; \
         sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.10.0")/' CMakeLists.txt; \