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

Proposed by Dmitry Shachnev on 2013-03-13
Status: Merged
Merged at revision: 357
Proposed branch: lp:~mitya57/kubuntu-packaging/qt-lp1094360
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qt
Diff against target: 97 lines (+55/-1)
5 files modified
debian/changelog (+14/-0)
debian/patches/gcc-4.8.diff (+12/-0)
debian/patches/kubuntu_41_remove_gtk_theme_check.diff (+26/-0)
debian/patches/series (+2/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~mitya57/kubuntu-packaging/qt-lp1094360
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve on 2013-03-20
Harald Sitter 2013-03-13 Needs Fixing on 2013-03-19
Review via email: mp+153077@code.launchpad.net

Description of the Change

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.

To post a comment you must log in.
356. By Dmitry Shachnev on 2013-03-18

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

Harald Sitter (apachelogger) wrote :

please note that the target branch has changed.

also, have you forwarded this to the Qt Project?

review: Needs Fixing
Dimitri John Ledkov (xnox) wrote :

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

review: Approve
Dmitry Shachnev (mitya57) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-19 19:18:48 +0000
3+++ debian/changelog 2013-03-18 05:22:21 +0000
4@@ -1,3 +1,17 @@
5+qt4-x11 (4:4.8.4+dfsg-0ubuntu8) UNRELEASED; urgency=low
6+
7+ * debian/patches/kubuntu_41_remove_gtk_theme_check.diff:
8+ do not check that Gtk theme is not empty (LP: #1094360).
9+ * Fix FTBFS which was caused by moved extract-messages.sh.
10+
11+ -- Dmitry Shachnev <mitya57@ubuntu.com> Wed, 13 Mar 2013 11:58:09 +0400
12+
13+qt4-x11 (4:4.8.4+dfsg-0ubuntu7) raring; urgency=low
14+
15+ * Fix header file, causing build failure with GCC 4.8.
16+
17+ -- Matthias Klose <doko@ubuntu.com> Tue, 26 Feb 2013 11:00:45 +0100
18+
19 qt4-x11 (4:4.8.4+dfsg-0ubuntu6) raring; urgency=low
20
21 * Cherry pick upstream commit 5b285845a3c3478a4008b7e3416c3912c69fd20b
22
23=== added file 'debian/patches/gcc-4.8.diff'
24--- debian/patches/gcc-4.8.diff 1970-01-01 00:00:00 +0000
25+++ debian/patches/gcc-4.8.diff 2013-03-18 05:22:21 +0000
26@@ -0,0 +1,12 @@
27+Index: qt4-x11-4.8.4+dfsg/src/corelib/concurrent/qtconcurrentfilter.h
28+===================================================================
29+--- qt4-x11-4.8.4+dfsg.orig/src/corelib/concurrent/qtconcurrentfilter.h 2012-11-23 14:09:55.000000000 +0400
30++++ qt4-x11-4.8.4+dfsg/src/corelib/concurrent/qtconcurrentfilter.h 2013-03-13 11:33:30.000000000 +0400
31+@@ -105,7 +105,6 @@
32+ template <typename Sequence, typename KeepFunctor, typename ReduceFunctor>
33+ ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce)
34+ {
35+- typedef typename Sequence::const_iterator Iterator;
36+ typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType;
37+ return startThreadEngine(new KernelType(sequence, keep, reduce));
38+ }
39
40=== added file 'debian/patches/kubuntu_41_remove_gtk_theme_check.diff'
41--- debian/patches/kubuntu_41_remove_gtk_theme_check.diff 1970-01-01 00:00:00 +0000
42+++ debian/patches/kubuntu_41_remove_gtk_theme_check.diff 2013-03-18 05:22:21 +0000
43@@ -0,0 +1,26 @@
44+Author: Dmitry Shachnev <mitya57@ubuntu.com>
45+Description: do not check that Gtk theme name is not empty
46+ QGtkStyle uses GConf to get the Gtk theme name. We are getting rid of
47+ GConf schemas, so Qt fails to read that name, and disables QGtkStyle.
48+ .
49+ That check can be safely removed because we don't ship QStyle for Gtk
50+ and thus we shouldn't care about recursion problems much.
51+ .
52+ In upstream QtBase the whole theme-related code is going to be dropped.
53+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1094360
54+Forwarded: yes
55+
56+--- a/src/gui/styles/qgtkstyle_p.cpp
57++++ b/src/gui/styles/qgtkstyle_p.cpp
58+@@ -509,10 +509,7 @@
59+ if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
60+ themeName = getThemeName();
61+
62+- if (themeName.isEmpty()) {
63+- qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
64+- return;
65+- } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
66++ if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
67+ // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
68+ // we cannot support the GTK_Qt Gtk engine
69+ qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
70
71=== modified file 'debian/patches/series'
72--- debian/patches/series 2013-02-19 19:18:48 +0000
73+++ debian/patches/series 2013-03-18 05:22:21 +0000
74@@ -57,9 +57,11 @@
75 kubuntu_38_revert_fix_jit_crash.diff
76 kubuntu_39_fix_medium_font.diff
77 kubuntu_40_disable_neon.patch
78+kubuntu_41_remove_gtk_theme_check.diff
79 kubuntu_93_disable_overlay_scrollbars.diff
80 kubuntu_94_xinput_valuators_fix.diff
81 kubuntu_95_qt_disable_bounce.diff
82 kubuntu_97_a11y_qt_and_qml_backport.diff
83 CVE-2012-6093.patch
84 CVE-2013-0254.patch
85+gcc-4.8.diff
86
87=== modified file 'debian/rules'
88--- debian/rules 2013-02-08 06:30:55 +0000
89+++ debian/rules 2013-03-18 05:22:21 +0000
90@@ -357,7 +357,7 @@
91 # Create .pot file
92 ln -s MessagesQt.sh debian/Messages.sh
93 mkdir po
94- cd debian; qtcopydir=.. podir=../po extract-messages.sh
95+ cd debian; qtcopydir=.. podir=../po /usr/lib/kubuntu-l10n/libexec/extract-messages.sh
96 rm -f debian/Message.sh
97 endif
98

Subscribers

People subscribed via source and target branches