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

[Dmitry Shachnev]

* debian/patches/kubuntu_42_fix_icon_themes.diff:
  fix icon themes not working on a default Ubuntu install by using
  GtkSettings where appropriate (LP: #1180067).

This was forwarded upstream as https://codereview.qt-project.org/56458 (after dfaure's pre-approval on IRC), and this is already applied in Qt 5 (though the code is in a different place).

It will be nice if someone sponsored this to both saucy and raring-proposed.

[Dimitri John Ledkov (xnox)]

lgtm. Test building.

[Dimitri John Ledkov (xnox)]

verified with qt4/demos/textedit app.

review: Approve

[Dmitry Shachnev (mitya57)]

@Dmitrijs: can we get this uploaded to raring-proposed before saucy gets fixed? I'm getting tons of bug reports that icons are not working in ReText because of this bug...

[Dimitri John Ledkov (xnox)]

Before uploading this as an SRU for Raring, please update the bug description as per:
https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template

[Dmitry Shachnev (mitya57)]

Done.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-27 00:02:17 +0000
+++ debian/changelog	2013-05-19 15:27:26 +0000
@@ -1,3 +1,11 @@
+qt4-x11 (4:4.8.4+dfsg-0ubuntu10) UNRELEASED; urgency=low
+
+  * debian/patches/kubuntu_42_fix_icon_themes.diff:
+    fix icon themes not working on a default Ubuntu install by using
+    GtkSettings where appropriate (LP: #1180067).
+
+ -- Dmitry Shachnev <[e-mail]>  Sun, 19 May 2013 19:18:58 +0400
+
 qt4-x11 (4:4.8.4+dfsg-0ubuntu9) raring; urgency=low
 
   * Fix moc tripping over BOOST_JOIN. (LP: #1119656)

=== added file 'debian/patches/kubuntu_42_fix_icon_themes.diff'
--- debian/patches/kubuntu_42_fix_icon_themes.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_42_fix_icon_themes.diff	2013-05-19 15:27:26 +0000
@@ -0,0 +1,71 @@
+Description: fix icon themes not working on default Ubuntu install
+ On Ubuntu, /desktop/gnome/interface/icon_theme is no longer set by
+ default, so systemIconThemeName() returns "gnome" as a fallback
+ value. However, "gnome" icon theme is unusable unless
+ "gnome-icon-theme-full" package is installed (which is not installed
+ by default).
+ .
+ This patch makes systemIconThemeName() use GtkSettings on all non-KDE
+ environments. This way is more reliable and returns correct theme
+ name ("ubuntu-mono-dark") on the default Ubuntu install.
+Author: Dmitry Shachnev <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1180067
+Last-Update: 2013-05-19
+Forwarded: yes
+
+--- a/src/gui/kernel/qguiplatformplugin.cpp
++++ b/src/gui/kernel/qguiplatformplugin.cpp
+@@ -204,10 +204,12 @@ QString QGuiPlatformPlugin::systemIconThemeName()
+     QString result;
+ #ifdef Q_WS_X11
+     if (X11->desktopEnvironment == DE_GNOME) {
+-        result = QString::fromLatin1("gnome");
+ #ifndef QT_NO_STYLE_GTK
+-        result = QGtkStylePrivate::getGConfString(QLatin1String("/desktop/gnome/interface/icon_theme"), result);
++        result = QGtkStylePrivate::getIconThemeName();
+ #endif
++        if (result.isEmpty()) {
++            result = QString::fromLatin1("gnome");
++        }
+     } else if (X11->desktopEnvironment == DE_KDE) {
+         result =  X11->desktopVersion >= 4 ? QString::fromLatin1("oxygen") : QString::fromLatin1("crystalsvg");
+         QSettings settings(QKde::kdeHome() + QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat);
+--- a/src/gui/styles/qgtkstyle_p.cpp
++++ b/src/gui/styles/qgtkstyle_p.cpp
+@@ -686,6 +686,26 @@ QString QGtkStylePrivate::getThemeName()
+     return themeName;
+ }
+ 
++QString QGtkStylePrivate::getIconThemeName() {
++    if (!gtk_settings_get_default) {
++        // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
++        QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
++        libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics);
++        gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
++        gtk_settings_get_default = (Ptr_gtk_settings_get_default)libgtk.resolve("gtk_settings_get_default");
++    }
++    if (!gtk_settings_get_default) {
++        return QString();
++    }
++    gtk_init(NULL, NULL);
++    GtkSettings *settings = gtk_settings_get_default();
++    gchararray value;
++    g_object_get(settings, "gtk-icon-theme-name", &value, NULL);
++    QString result = QString::fromUtf8(value);
++    g_free(value);
++    return result;
++}
++
+ // Get size of the arrow controls in a GtkSpinButton
+ int QGtkStylePrivate::getSpinboxArrowSize() const
+ {
+--- a/src/gui/styles/qgtkstyle_p.h
++++ b/src/gui/styles/qgtkstyle_p.h
+@@ -339,6 +339,7 @@ public:
+     static QString getGConfString(const QString &key, const QString &fallback = QString());
+ 
+     static QString getThemeName();
++    static QString getIconThemeName();
+     virtual int getSpinboxArrowSize() const;
+ 
+     static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent,

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-27 00:02:06 +0000
+++ debian/patches/series	2013-05-19 15:27:26 +0000
@@ -58,6 +58,7 @@
 kubuntu_39_fix_medium_font.diff
 kubuntu_40_disable_neon.patch
 kubuntu_41_remove_gtk_theme_check.diff
+kubuntu_42_fix_icon_themes.diff
 kubuntu_93_disable_overlay_scrollbars.diff
 kubuntu_94_xinput_valuators_fix.diff
 kubuntu_95_qt_disable_bounce.diff