[SCM] Qt 4 packaging branch, kubuntu_vivid, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-2-9-gdbb6094

[Dmitry Shachnev]

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

The following commit has been merged in the kubuntu_vivid branch:
commit dbb6094ef0669f9f4912ef3ec57a919d3e60d710
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Nov 4 17:42:14 2014 +0300

    Don’t build QtMeegoGraphicsSystemHelper, it is useless on non-MeeGo systems.
---
 debian/changelog                                |  7 +++++++
 debian/patches/kubuntu_43_no_meego_helper.patch | 13 +++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 033dafe..51faa62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu3) UNRELEASED; urgency=medium
+
+  * kubuntu_43_no_meego_helper.patch: Don’t build QtMeegoGraphicsSystemHelper,
+    useless on non-MeeGo systems.
+
+ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 04 Nov 2014 17:37:26 +0300
+
 qt4-x11 (4:4.8.6+git64-g5dc8b2b+dfsg-3~ubuntu2) vivid; urgency=medium
 
   * Drop the hacks to build QtWebKit for Assistant, as we now have Assistant
diff --git a/debian/patches/kubuntu_43_no_meego_helper.patch b/debian/patches/kubuntu_43_no_meego_helper.patch
new file mode 100644
index 0000000..9a56a06
--- /dev/null
+++ b/debian/patches/kubuntu_43_no_meego_helper.patch
@@ -0,0 +1,13 @@
+Description: do not build QtMeegoGraphicsSystemHelper library
+Author: Dmitry Shachnev <mitya57 at ubuntu.com>
+Forwarded: no
+Last-Update: 2014-11-04
+
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -50,5 +50,3 @@
+ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
+ 
+ !win32:!embedded:!mac:!symbian:CONFIG += x11
+-
+-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper
diff --git a/debian/patches/series b/debian/patches/series
index 86a35e6..4adb4cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,6 +62,7 @@ kubuntu_30_translucent_drag_pixmap.diff
 kubuntu_37_cups_settings.diff
 kubuntu_39_fix_medium_font.diff
 kubuntu_40_disable_neon.patch
+kubuntu_43_no_meego_helper.patch
 kubuntu_93_disable_overlay_scrollbars.diff
 kubuntu_94_xinput_valuators_fix.diff
 kubuntu_95_qt_disable_bounce.diff

-- 
Qt 4 packaging