[SCM] breeze packaging branch, kubuntu_vivid_archive, updated. 82a1cdabe8a07360320e6c779addc7f53bcc2f81

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze.git;a=commitdiff;h=82a1cda

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 82a1cdabe8a07360320e6c779addc7f53bcc2f81
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Mar 12 14:49:36 2015 +0100

    Add upstream_gtktheme-setup.diff from upstream to fix gtk theme setup
---
 debian/changelog                            |  6 ++++--
 debian/patches/series                       |  1 +
 debian/patches/upstream_gtktheme-setup.diff | 31 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2097a91..3fa6b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-breeze (4:5.2.1-0ubuntu2) UNRELEASED; urgency=medium
+breeze (4:5.2.1-0ubuntu2) vivid; urgency=medium
 
   * Add recommends on orion-gtk-theme
+  * Add upstream_gtktheme-setup.diff from upstream to fix gtk theme
+    setup
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Mar 2015 12:49:00 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 12 Mar 2015 13:42:19 +0100
 
 breeze (4:5.2.1-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..79c8be7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_gtktheme-setup.diff
diff --git a/debian/patches/upstream_gtktheme-setup.diff b/debian/patches/upstream_gtktheme-setup.diff
new file mode 100644
index 0000000..d1f0c07
--- /dev/null
+++ b/debian/patches/upstream_gtktheme-setup.diff
@@ -0,0 +1,31 @@
+diff --git a/misc/gtkbreeze/main.cpp b/misc/gtkbreeze/main.cpp
+index 186d37b..b4dfcaa 100644
+--- a/misc/gtkbreeze/main.cpp
++++ b/misc/gtkbreeze/main.cpp
+@@ -107,7 +107,7 @@ int setGtk2()
+     out << QStringLiteral("widget_class \"*\" style \"user-font\"
");
+     out << QStringLiteral("gtk-font-name=\"Oxygen-Sans Sans-Book 10\"
"); // matches plasma-workspace:startkde/startkde.cmake
+     out << QStringLiteral("gtk-theme-name=\"Orion\"
");
+-    out << QStringLiteral("gtk-icon-theme-name=\"oxygen\"
"); // breeze icons don't seem to work with gtk
++    out << QStringLiteral("gtk-icon-theme-name=\"breeze\"
");
+     out << QStringLiteral("gtk-fallback-icon-theme=\"gnome\"
");
+     out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS
");
+     out << QStringLiteral("gtk-menu-images=1
");
+@@ -138,6 +138,8 @@ int setGtk3()
+         qCDebug(GTKBREEZE) << "gtkrc3 already exists and is not using oxygen, quitting";
+         return 0;
+     }
++    QDir dir = QFileInfo(gtkrc3path).dir();
++    dir.mkpath(dir.path());
+ 
+     qCDebug(GTKBREEZE) << "no gtkrc3 file or oxygen being used, setting to new theme";
+     QFile gtkrc3writer(gtkrc3path);
+@@ -150,7 +152,7 @@ int setGtk3()
+     out << QStringLiteral("[Settings]
");
+     out << QStringLiteral("gtk-font-name=Oxygen-Sans 10
"); // matches plasma-workspace:startkde/startkde.cmake
+     out << QStringLiteral("gtk-theme-name=")+gtk3Theme+QStringLiteral("
");
+-    out << QStringLiteral("gtk-icon-theme-name=oxygen
"); // breeze icons don't seem to work with gtk
++    out << QStringLiteral("gtk-icon-theme-name=breeze
");
+     out << QStringLiteral("gtk-fallback-icon-theme=gnome
");
+     out << QStringLiteral("gtk-toolbar-style=GTK_TOOLBAR_ICONS
");
+     out << QStringLiteral("gtk-menu-images=1
");

-- 
breeze packaging