Update KDE frameworks master
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 2 Feb 2017 11:27:55 +0000 (12:27 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 2 Feb 2017 11:29:41 +0000 (12:29 +0100)
* packages/packages.current: Update frameworks to 5.30.1
* patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch,
patches/kleopatra/lower-kf5-required.patch,
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch: Refresh
* src/Makefile.am (gpg4win_pkg_kleopatra_configure): Set version
suffix.
(gpg4win_pkg_breeze_icons_configure): Disable binary icons

packages/packages.current
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
patches/kleopatra/lower-kf5-required.patch
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
src/Makefile.am

index 78207a0..2e2b49d 100644 (file)
@@ -385,128 +385,127 @@ server http://download.kde.org/stable/frameworks/
 
 ##### Paste Here #####
 # extra-cmake-modules
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/extra-cmake-modules-5.25.0.tar.xz
-chk 73c90e67c328076c2bee35884836087e7e9f753e48fc0063c8348b6f66b0345f
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/extra-cmake-modules-5.30.0.tar.xz
+chk 7da9647514e134db5054ab4848d4bfa6054537593a95720a7a9361f8cc71a96c
 
 # kconfig
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kconfig-5.25.0.tar.xz
-chk 498332f1c3fbb5e0d681cf6807502c1fe0aef74e79b29cd1e60e4096924949c2
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kconfig-5.30.0.tar.xz
+chk a29a3ccb6c9e8124eca488417d602e689dc7240f9b10510f4152e739fdc143dc
 
 # ki18n
-# last changed: 2016-11-14
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/ki18n-5.25.0.tar.xz
-chk 5d9ae669b2c6a7637489ffb04d603762512fe8c78501ea5318acc387741e7167
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/ki18n-5.30.0.tar.xz
+chk 2dd2d0835570c5e9fcdabd124613131cb4042a4deb3a38e68ed05daf6fcd72f3
 
 # kwidgetsaddons
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kwidgetsaddons-5.25.0.tar.xz
-chk 1e099d9e021dc44fdee54220b30d3f48a72900fa88e8273ee7fea2895946a8bd
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kwidgetsaddons-5.30.0.tar.xz
+chk 34c322aa53a33ed883d8082e2435cd9464fb9d3f63e50c4a81d87166088fc24a
 
 # kcompletion
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kcompletion-5.25.0.tar.xz
-chk 6a8af0a084ce697f57382f16157b0c21e4287c809819611fb7e6171e7e149d4a
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kcompletion-5.30.0.tar.xz
+chk a667bd28575ba4462ed365ce3ea7d35e3f86b20e6fc034365914949205ee0588
 
 # kwindowsystem
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kwindowsystem-5.25.0.tar.xz
-chk b8228dddcc6487e234f81239bea7ca7ae261af8fef7b9e5d7a8b49aa3ac5d0dd
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kwindowsystem-5.30.0.tar.xz
+chk 20ac7025f998f85e83f72609038b4bf7051f3c373dc039faf30340c595e7e16b
 
 # kcoreaddons
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kcoreaddons-5.25.0.tar.xz
-chk 5479180bcb6034cfcfbe779d88d91e11233f2120ba6314d180a1f87ad3f02c09
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kcoreaddons-5.30.0.tar.xz
+chk f62bcef0aa391362e8797eb03135ad9d9b9fd5f3741298241ffb59eb182da040
 
 # kcodecs
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kcodecs-5.25.0.tar.xz
-chk d5bef19f3575784e93b55db76bbaea7f8dba2bed4ffd9b9fbbb52db6d85f4ea5
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kcodecs-5.30.0.tar.xz
+chk 6eb6935512e01a70d730938c28cb84852e73d4c023deebb5f2946b4c760f2aee
 
 # kconfigwidgets
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kconfigwidgets-5.25.0.tar.xz
-chk f394366fb3d3e65b2c4ea49428113c5081f8a05d2e6cc945cb2b910b55d691fe
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kconfigwidgets-5.30.0.tar.xz
+chk 021d85537faf01b9a88a9614edf9011a7e2dac752330f4928a287f4832263996
 
 # kxmlgui
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kxmlgui-5.25.0.tar.xz
-chk 1ff1f07fc1bede0cb0b498de2d2b0db088639b91d0f7c39a90abfc032dbb44b2
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kxmlgui-5.30.0.tar.xz
+chk da3f6f59aed6d7970f78a040e387fcec6509a2bac3e6efaa965b6600c9b1ac00
 
 # kguiaddons
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kguiaddons-5.25.0.tar.xz
-chk 136cb22285eeb7e15a02cdcc8e8bc65edc777dd923125bd64695eb10c9ff5d9f
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kguiaddons-5.30.0.tar.xz
+chk f55f5b5ffe0e330ae3ee5971cf8d206040d82bd52d677a8478d6a9c88c8ac04e
 
 # kitemviews
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kitemviews-5.25.0.tar.xz
-chk 98078899862514cc16ceff0275fe5eab43bc14e8f361af11a8e3c45a2fc5a284
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kitemviews-5.30.0.tar.xz
+chk 5e8466caa4d27cd78e37c3814e495590158a5a57cbb61e8d07505cea72d3a43b
 
 # kitemmodels
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kitemmodels-5.25.0.tar.xz
-chk e44a5c4ba997993057e8ebda6df400c3f1b97bf81d11bb02af27950ff1cd749d
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kitemmodels-5.30.0.tar.xz
+chk aeb94534470bb581196a3e2eef158694c5b5727a7e9db8ca2d873fdcbf5bc2f9
 
 # kiconthemes
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/kiconthemes-5.25.0.tar.xz
-chk dfea9b4da835c028b62faec6550d279a3a75874ff88d996d2b603be4f9b228b5
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/kiconthemes-5.30.0.tar.xz
+chk e969d2180f0d5b0802e7c57d63ff78314562cad4b50dbb3a0935d5edc4c33d6a
 
 # breeze-icons
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/breeze-icons-5.25.0.tar.xz
-chk e274c7f5c71c177e2e9d8ced9c49cd052ec2f726cb693c7df73e96af12277e8f
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/breeze-icons-5.30.0.tar.xz
+chk 53e533d006e0289b969ee37534a71f02b2708cee28cfa829b95a144f75010759
 
 # karchive
-# last changed: 2016-08-26
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.25.0.php (created by gen-frameworks.sh)
-file 5.25/karchive-5.25.0.tar.xz
-chk 0c338f1e1adc5522de6555fa3fa8c6ebcde29ce48e1f5959beca12d46aea88d8
+# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
+file 5.30/karchive-5.30.0.tar.xz
+chk 18b35d437e7cbf6f00983d0f66372cbd6a0daedaa58e6c092838c20845571f38
 ##### End Paste #####
 
 # KDE Applications
 
 server http://download.kde.org/stable/applications/
 # kmime
-# last changed: 2016-07-22
+# last changed: 2017-02-02
 # by: ah
-# verified: https://www.kde.org/info/applications-16.04.3.php
-file 16.04.3/src/kmime-16.04.3.tar.xz
-chk 161c4b963f57bc52894fb63a5288e20e92651313136066698c02ead4a6d194b3
-
+# verified: https://www.kde.org/info/applications-16.12.1.php
+file 16.12.1/src/kmime-16.12.1.tar.xz
+chk c435708f18422117f10cef52a7edcaae71c5da444f72c6f405665154f116e9bc
 
 # Devel versions are needed until Kleopatra can be based on
 # a stable branch.
index 9cfc0ef..effd132 100755 (executable)
@@ -28,8 +28,8 @@ index 9096da6..660db4c 100644
 --- a/KF5ConfigWidgetsConfig.cmake.in
 +++ b/KF5ConfigWidgetsConfig.cmake.in
 @@ -1,6 +1,5 @@
- @PACKAGE_INIT@
 
+ include(CMakeFindDependencyMacro)
 -find_dependency(KF5Auth "@KF5_DEP_VERSION@")
  find_dependency(KF5Codecs "@KF5_DEP_VERSION@")
  find_dependency(KF5Config "@KF5_DEP_VERSION@")
index 9b8fe99..ec773b2 100755 (executable)
@@ -10,7 +10,7 @@ index 7223ab9..754088c 100644
  option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
 
  # Standalone build. Find / include everything neccessary.
--set(KF5_VERSION "5.28.0")
+-set(KF5_VERSION "5.30.0")
 -set(KMIME_VERSION "5.4.40")
 +set(KF5_VERSION "5.25.0")
 +set(KMIME_VERSION "5.2")
index b433040..a6826f9 100755 (executable)
@@ -2,9 +2,9 @@
 patch -p1 -l -f $* < $0
 exit $?
 
-From 7e0831d090db72319a8b0629d16693fef690808f Mon Sep 17 00:00:00 2001
+From 6f2ed92f19bcfa4d8d03a98ace3232082ddbab18 Mon Sep 17 00:00:00 2001
 From: Andre Heinecke <aheinecke@intevation.de>
-Date: Tue, 26 Jan 2016 18:18:56 +0100
+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.
@@ -14,11 +14,10 @@ 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                     | 15 ++++++++++++---
  KF5XmlGuiConfig.cmake.in           |  2 +-
- autotests/kmainwindow_unittest.cpp | 10 ++++++++++
+ autotests/kmainwindow_unittest.cpp |  2 ++
  autotests/ktoolbar_unittest.cpp    | 20 +++++++++++++++++++-
  src/CMakeLists.txt                 | 15 ++++++++++++---
  src/config-xmlgui.h.cmake          |  3 +++
@@ -26,13 +25,13 @@ accordingly.
  src/kmainwindowiface.cpp           |  2 +-
  src/ktoolbar.cpp                   | 13 +++++++++++--
  src/kxmlguiwindow.cpp              | 13 +++++++++++--
- 10 files changed, 88 insertions(+), 15 deletions(-)
+ 10 files changed, 80 insertions(+), 15 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74afa01..a6691fe 100644
+index d9728db..7d8cd00 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -30,12 +30,14 @@ ecm_setup_version(${KF5_VERSION}
+@@ -29,12 +29,14 @@ ecm_setup_version(PROJECT
                    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5XmlGuiConfigVersion.cmake"
                    SOVERSION 5)
 
@@ -50,7 +49,7 @@ index 74afa01..a6691fe 100644
  find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
  find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
  find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-@@ -45,6 +47,7 @@ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
+@@ -44,6 +46,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)
@@ -58,7 +57,7 @@ index 74afa01..a6691fe 100644
  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)
+@@ -57,6 +60,12 @@ if (NOT FORCE_DISABLE_KGLOBALACCEL)
  endif()
  set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
 
@@ -72,20 +71,20 @@ index 74afa01..a6691fe 100644
  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
+index 6f8d8ce..550e667 100644
 --- a/KF5XmlGuiConfig.cmake.in
 +++ b/KF5XmlGuiConfig.cmake.in
-@@ -2,7 +2,7 @@
-
+@@ -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 00282ef..7bbd581 100644
+index ec73f7f..4776453 100644
 --- a/autotests/kmainwindow_unittest.cpp
 +++ b/autotests/kmainwindow_unittest.cpp
 @@ -17,6 +17,8 @@
@@ -97,29 +96,8 @@ index 00282ef..7bbd581 100644
  #include <QTest>
  #include "kmainwindow_unittest.h"
  #include <QEventLoopLocker>
-@@ -91,12 +93,20 @@ void KMainWindow_UnitTest::testNameWithSpecialChars()
-     mw.setObjectName(QStringLiteral("a#@_test/"));
-     mw.show();
-     mw.ensurePolished();
-+#if HAVE_QDBUS
-     QCOMPARE(mw.dbusName(), QString::fromLatin1("/kmainwindow_unittest/a___test_"));
-+#else
-+    QCOMPARE(mw.objectName(), QString::fromLatin1("a#@_test/"));
-+#endif
-     KMainWindow mw2;
-     mw2.setObjectName(QStringLiteral("a#@_test/"));
-     mw2.show();
-     mw2.ensurePolished();
-+#if HAVE_QDBUS
-     QCOMPARE(mw2.dbusName(), QString::fromLatin1("/kmainwindow_unittest/a___test_2"));
-+#else
-+    QCOMPARE(mw2.objectName(), QString::fromLatin1("a#@_test/2"));
-+#endif
- }
-
- static bool s_mainWindowDeleted;
 diff --git a/autotests/ktoolbar_unittest.cpp b/autotests/ktoolbar_unittest.cpp
-index d6c1e05..da0eb4e 100644
+index 09b96dc..241f7f0 100644
 --- a/autotests/ktoolbar_unittest.cpp
 +++ b/autotests/ktoolbar_unittest.cpp
 @@ -18,10 +18,14 @@
@@ -138,7 +116,7 @@ index d6c1e05..da0eb4e 100644
  #include <QDir>
  #include <QFile>
  #include <QFileInfo>
-@@ -79,7 +83,9 @@ protected:
+@@ -80,7 +84,9 @@ protected:
  private:
      void changeGlobalIconSizeSetting(int, int);
      void deleteGlobalIconSizeSetting();
@@ -148,7 +126,7 @@ index d6c1e05..da0eb4e 100644
      void deleteGlobalToolButtonStyleSetting();
      QByteArray m_xml;
      bool m_showWasCalled;
-@@ -422,6 +428,7 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
+@@ -427,6 +433,7 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
          QCOMPARE((int)mainToolBar->toolButtonStyle(), (int)toolButtonStyle);
          QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
 
@@ -156,7 +134,7 @@ index d6c1e05..da0eb4e 100644
          // Now change KDE-global setting
          changeGlobalToolButtonStyleSetting(QStringLiteral("IconOnly"), QStringLiteral("TextOnly"));
 
-@@ -436,6 +443,9 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
+@@ -441,6 +448,9 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
          } else {
              QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
          }
@@ -166,7 +144,7 @@ index d6c1e05..da0eb4e 100644
      }
  }
 
-@@ -485,16 +495,23 @@ void tst_KToolBar::testToolButtonStyleXmlGui()
+@@ -490,16 +500,23 @@ void tst_KToolBar::testToolButtonStyleXmlGui()
          // Save settings
          kmw.saveMainWindowSettings(group);
 
@@ -190,7 +168,7 @@ index d6c1e05..da0eb4e 100644
  void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar, const QString &otherToolBars)
  {
      KConfigGroup group(KSharedConfig::openConfig(), "Toolbar style");
-@@ -512,6 +529,7 @@ void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar
+@@ -517,6 +534,7 @@ void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar
      KToolBar::emitToolbarStyleChanged();
      spy.wait(2000);
  }
@@ -262,7 +240,7 @@ index 9d7f3dc..35c9477 100644
 +/* Qt5DBus available */
 +#cmakedefine01 HAVE_QDBUS
 diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
-index cae655d..4c98c3f 100644
+index 46588d2..fb8eca3 100644
 --- a/src/kmainwindow.cpp
 +++ b/src/kmainwindow.cpp
 @@ -23,11 +23,11 @@
@@ -298,7 +276,7 @@ index cae655d..4c98c3f 100644
  //#include <ctype.h>
 
  static const char WINDOW_PROPERTIES[]="WindowProperties";
-@@ -302,6 +306,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
+@@ -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
 
@@ -306,7 +284,7 @@ index cae655d..4c98c3f 100644
      dbusName = QLatin1Char('/') + QCoreApplication::applicationName() + QLatin1Char('/');
      dbusName += q->objectName().replace(QLatin1Char('/'), QLatin1Char('_'));
      // Clean up for dbus usage: any non-alphanumeric char should be turned into '_'
-@@ -317,6 +322,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
+@@ -355,6 +360,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
              QDBusConnection::ExportNonScriptableSlots |
              QDBusConnection::ExportNonScriptableProperties |
              QDBusConnection::ExportAdaptors);
@@ -329,7 +307,7 @@ index c194bec..25439b3 100644
  #include "kxmlguiwindow.h"
 
 diff --git a/src/ktoolbar.cpp b/src/ktoolbar.cpp
-index 8fcb9cb..6bda175 100644
+index 4569524..f77d965 100644
 --- a/src/ktoolbar.cpp
 +++ b/src/ktoolbar.cpp
 @@ -24,6 +24,8 @@
@@ -357,7 +335,7 @@ index 8fcb9cb..6bda175 100644
  #include <kauthorized.h>
  #include <kconfig.h>
  #include <ksharedconfig.h>
-@@ -273,8 +278,10 @@ void KToolBar::Private::init(bool readConfig, bool _isMainToolBar)
+@@ -275,8 +280,10 @@ void KToolBar::Private::init(bool readConfig, bool _isMainToolBar)
 
      q->setAcceptDrops(true);
 
@@ -368,7 +346,7 @@ index 8fcb9cb..6bda175 100644
      connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()),
              q, SLOT(slotAppearanceChanged()));
  }
-@@ -1465,8 +1472,10 @@ bool KToolBar::toolBarsLocked()
+@@ -1467,8 +1474,10 @@ bool KToolBar::toolBarsLocked()
 
  void KToolBar::emitToolbarStyleChanged()
  {
@@ -380,10 +358,10 @@ index 8fcb9cb..6bda175 100644
 
  #include "moc_ktoolbar.cpp"
 diff --git a/src/kxmlguiwindow.cpp b/src/kxmlguiwindow.cpp
-index b4162c8..9e76928 100644
+index 24d48f1..5b9fac7 100644
 --- a/src/kxmlguiwindow.cpp
 +++ b/src/kxmlguiwindow.cpp
-@@ -23,11 +23,12 @@
+@@ -23,12 +23,13 @@
      Boston, MA 02110-1301, USA.
  */
 
@@ -392,12 +370,13 @@ index b4162c8..9e76928 100644
  #include "kxmlguiwindow.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"
-@@ -35,7 +36,6 @@
+@@ -36,7 +37,6 @@
  #include "ktoolbar.h"
 
  #include <QCloseEvent>
@@ -405,7 +384,7 @@ index b4162c8..9e76928 100644
  #include <QtXml/QDomDocument>
  #include <QLayout>
  #include <QDebug>
-@@ -46,6 +46,11 @@
+@@ -47,6 +47,11 @@
  #include <QWidget>
  #include <QList>
 
@@ -417,7 +396,7 @@ index b4162c8..9e76928 100644
  #include <ktoggleaction.h>
  #include <kstandardaction.h>
  #include <kconfig.h>
-@@ -86,7 +91,9 @@ KXmlGuiWindow::KXmlGuiWindow(QWidget *parent, Qt::WindowFlags f)
+@@ -87,7 +92,9 @@ KXmlGuiWindow::KXmlGuiWindow(QWidget *parent, Qt::WindowFlags f)
      d->toolBarHandler = 0;
      d->showStatusBarAction = 0;
      d->factory = 0;
@@ -427,7 +406,7 @@ index b4162c8..9e76928 100644
  }
 
  QAction *KXmlGuiWindow::toolBarMenuAction()
-@@ -116,6 +123,7 @@ KXmlGuiWindow::~KXmlGuiWindow()
+@@ -117,6 +124,7 @@ KXmlGuiWindow::~KXmlGuiWindow()
  bool KXmlGuiWindow::event(QEvent *ev)
  {
      bool ret = KMainWindow::event(ev);
@@ -435,7 +414,7 @@ index b4162c8..9e76928 100644
      if (ev->type() == QEvent::Polish) {
          QDBusConnection::sessionBus().registerObject(dbusName() + QStringLiteral("/actions"), actionCollection(),
                  QDBusConnection::ExportScriptableSlots |
-@@ -124,6 +132,7 @@ bool KXmlGuiWindow::event(QEvent *ev)
+@@ -125,6 +133,7 @@ bool KXmlGuiWindow::event(QEvent *ev)
                  QDBusConnection::ExportNonScriptableProperties |
                  QDBusConnection::ExportChildObjects);
      }
index e9c237d..a8b6e6f 100644 (file)
@@ -358,12 +358,16 @@ endef
 
 gpg4win_pkg_kleopatra_configure = \
     -DFORCE_DISABLE_KCMUTILS=ON \
-    -DDISABLE_KWATCHGNUPG=ON
+    -DDISABLE_KWATCHGNUPG=ON \
+    -DKLEOPATRA_VERSION_SUFFIX=-gpg4win-$(VERSION)
 
 gpg4win_pkg_kxmlgui_configure = \
     -DFORCE_DISABLE_KGLOBALACCEL=ON \
     -DFORCE_DISABLE_DBUS=ON
 
+gpg4win_pkg_breeze_icons_configure = \
+    -DBINARY_ICONS_RESOURCE=OFF
+
 # Supported make-only source packages.
 gpg4win_mpkgs = bzip2 zlib