Merge lp:~mitya57/kubuntu-packaging/qt-lp1094360 into lp:~kubuntu-packagers/kubuntu-packaging/qt

[Dmitry Shachnev]

Quoting from the patch description:

"""
QGtkStyle uses GConf to get the Gtk theme name. We are getting rid of GConf schemas, so Qt fails to read that name, and disables QGtkStyle.

That check can be safely removed because we don't ship QStyle for Gtk and thus we shouldn't care about recursion problems much.

In upstream QtBase the whole theme-related code is going to be dropped.
"""

This patch fixes all Qt apps looking inconsistent with the rest of Ubuntu desktop in Raring.

Upstream MP (for QtBase): https://codereview.qt-project.org/50769

Update: I've also fixed an FTBFS which was caused by a recent pkg-kde-tools update which moved extract-messages.sh out of /usr/bin.

[lp:~mitya57/kubuntu-packaging/qt-lp1094360]

356. By Dmitry Shachnev on 2013-03-18

Fix FTBFS which was caused by moved extract-messages.sh.

[Harald Sitter (apachelogger)]

please note that the target branch has changed.

also, have you forwarded this to the Qt Project?

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Not merged in bzr sense, but changes applied in the branch and uploaded.

review: Approve

[Dmitry Shachnev (mitya57)]

Thanks Dmitrijs!

> also, have you forwarded this to the Qt Project?

I've forwarded what I think should be a better fix (see the link above), but was told that all Gtk-theme code will be removed, so changing it doesn't make much sense.

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-19 19:18:48 +0000
+++ debian/changelog	2013-03-18 05:22:21 +0000
@@ -1,3 +1,17 @@
+qt4-x11 (4:4.8.4+dfsg-0ubuntu8) UNRELEASED; urgency=low
+
+  * debian/patches/kubuntu_41_remove_gtk_theme_check.diff:
+    do not check that Gtk theme is not empty (LP: #1094360).
+  * Fix FTBFS which was caused by moved extract-messages.sh.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 13 Mar 2013 11:58:09 +0400
+
+qt4-x11 (4:4.8.4+dfsg-0ubuntu7) raring; urgency=low
+
+  * Fix header file, causing build failure with GCC 4.8.
+
+ -- Matthias Klose <[e-mail]>  Tue, 26 Feb 2013 11:00:45 +0100
+
 qt4-x11 (4:4.8.4+dfsg-0ubuntu6) raring; urgency=low
 
   * Cherry pick upstream commit 5b285845a3c3478a4008b7e3416c3912c69fd20b
 
=== added file 'debian/patches/gcc-4.8.diff'
--- debian/patches/gcc-4.8.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/gcc-4.8.diff	2013-03-18 05:22:21 +0000
@@ -0,0 +1,12 @@
+Index: qt4-x11-4.8.4+dfsg/src/corelib/concurrent/qtconcurrentfilter.h
+===================================================================
+--- qt4-x11-4.8.4+dfsg.orig/src/corelib/concurrent/qtconcurrentfilter.h	2012-11-23 14:09:55.000000000 +0400
++++ qt4-x11-4.8.4+dfsg/src/corelib/concurrent/qtconcurrentfilter.h	2013-03-13 11:33:30.000000000 +0400
+@@ -105,7 +105,6 @@
+ template <typename Sequence, typename KeepFunctor, typename ReduceFunctor>
+ ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce)
+ {
+-    typedef typename Sequence::const_iterator Iterator;
+     typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType;
+     return startThreadEngine(new KernelType(sequence, keep, reduce));
+ }
 
=== added file 'debian/patches/kubuntu_41_remove_gtk_theme_check.diff'
--- debian/patches/kubuntu_41_remove_gtk_theme_check.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_41_remove_gtk_theme_check.diff	2013-03-18 05:22:21 +0000
@@ -0,0 +1,26 @@
+Author: Dmitry Shachnev <[e-mail]>
+Description: do not check that Gtk theme name is not empty
+ QGtkStyle uses GConf to get the Gtk theme name. We are getting rid of
+ GConf schemas, so Qt fails to read that name, and disables QGtkStyle.
+ .
+ That check can be safely removed because we don't ship QStyle for Gtk
+ and thus we shouldn't care about recursion problems much.
+ .
+ In upstream QtBase the whole theme-related code is going to be dropped.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1094360
+Forwarded: yes
+
+--- a/src/gui/styles/qgtkstyle_p.cpp
++++ b/src/gui/styles/qgtkstyle_p.cpp
+@@ -509,10 +509,7 @@
+     if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
+         themeName = getThemeName();
+ 
+-        if (themeName.isEmpty()) {
+-            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
+-            return;
+-        } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
++        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+             // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
+             // we cannot support the GTK_Qt Gtk engine
+             qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-19 19:18:48 +0000
+++ debian/patches/series	2013-03-18 05:22:21 +0000
@@ -57,9 +57,11 @@
 kubuntu_38_revert_fix_jit_crash.diff
 kubuntu_39_fix_medium_font.diff
 kubuntu_40_disable_neon.patch
+kubuntu_41_remove_gtk_theme_check.diff
 kubuntu_93_disable_overlay_scrollbars.diff
 kubuntu_94_xinput_valuators_fix.diff
 kubuntu_95_qt_disable_bounce.diff
 kubuntu_97_a11y_qt_and_qml_backport.diff
 CVE-2012-6093.patch
 CVE-2013-0254.patch
+gcc-4.8.diff
 
=== modified file 'debian/rules'
--- debian/rules	2013-02-08 06:30:55 +0000
+++ debian/rules	2013-03-18 05:22:21 +0000
@@ -357,7 +357,7 @@
 	# Create .pot file
 	ln -s MessagesQt.sh debian/Messages.sh
 	mkdir po
-	cd debian; qtcopydir=.. podir=../po extract-messages.sh
+	cd debian; qtcopydir=.. podir=../po /usr/lib/kubuntu-l10n/libexec/extract-messages.sh
 	rm -f debian/Message.sh
 endif