[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.6.1+dfsg-3ubuntu2-4-gefe80b2

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Aug 20 08:24:43 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=efe80b2

The following commit has been merged in the ubuntu+1 branch:
commit efe80b2ae5adead55edede12f9f01d834d9b9c12
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 20 11:23:31 2016 +0300

    Add a file in include/ directory to dbusmenu_global_menu.diff
    
    It should be normally generated by syncqt, so was not part of the original
    patch.
---
 debian/patches/dbusmenu_global_menu.diff | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/patches/dbusmenu_global_menu.diff b/debian/patches/dbusmenu_global_menu.diff
index d4010a7..f5e2aac 100644
--- a/debian/patches/dbusmenu_global_menu.diff
+++ b/debian/patches/dbusmenu_global_menu.diff
@@ -611,3 +611,7 @@ Last-Update: 2016-08-18
  #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON)
      QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE;
  #endif
+--- /dev/null
++++ b/include/QtPlatformSupport/5.6.1/QtPlatformSupport/private/qdbusmenubar_p.h
+@@ -0,0 +1 @@
++#include "../../../../../src/platformsupport/dbusmenu/qdbusmenubar_p.h"

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list