[oxygen-gtk2] Upgrade to oxygen-gtk2 1.3.2 is buggy (kde#314545)

[Rex Dieter]

commit 2fe8589ead0372a303dafcb3bc4d02d98c9df172
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Feb 8 12:11:22 2013 -0600

    Upgrade to oxygen-gtk2 1.3.2 is buggy (kde#314545)

 ...pt-initialization-if-gtkSettings-is-not-r.patch |   65 ++++++++++++++++++++
 oxygen-gtk2.spec                                   |   10 +++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/0002-don-t-attempt-initialization-if-gtkSettings-is-not-r.patch b/0002-don-t-attempt-initialization-if-gtkSettings-is-not-r.patch
new file mode 100644
index 0000000..508616c
--- /dev/null
+++ b/0002-don-t-attempt-initialization-if-gtkSettings-is-not-r.patch
@@ -0,0 +1,65 @@
+From a89f20d522b674cd2794cd195b7e48978ac69b20 Mon Sep 17 00:00:00 2001
+From: Hugo Pereira Da Costa <hugo at oxygen-icons.org>
+Date: Thu, 7 Feb 2013 11:56:04 +0100
+Subject: [PATCH 2/2] don't attempt initialization if gtkSettings is not
+ ready/available. put back initialization in theme_init try initialization a
+ second time in instanceInit, in case it failed the first time, due to
+ gtkSettings not being ready.
+
+---
+ src/oxygenqtsettings.cpp   | 3 +++
+ src/oxygenstylewrapper.cpp | 4 ++++
+ src/oxygentheme.cpp        | 8 ++------
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp
+index f2ad1af..9965086 100644
+--- a/src/oxygenqtsettings.cpp
++++ b/src/oxygenqtsettings.cpp
+@@ -102,6 +102,9 @@ namespace Oxygen
+ 
+         const bool forced( flags&Forced );
+ 
++        // no attempt at initializing if gtk settings is not yet set
++        if( !gtk_settings_get_default() ) return false;
++
+         if( _initialized && !forced ) return false;
+         else if( !forced ) _initialized = true;
+ 
+diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp
+index ff0666b..a2572b0 100644
+--- a/src/oxygenstylewrapper.cpp
++++ b/src/oxygenstylewrapper.cpp
+@@ -3741,6 +3741,10 @@ namespace Oxygen
+         #endif
+ 
+         // style initialization
++        /*
++        this is normally achieved in theme_init, but is somehow not working with gnome shell
++        so that it is redone here, since duplication is avoided when initialization is called twice without modifications
++        */
+         Style::instance().initialize();
+ 
+         // hooks
+diff --git a/src/oxygentheme.cpp b/src/oxygentheme.cpp
+index 50b04e2..9bc49e1 100644
+--- a/src/oxygentheme.cpp
++++ b/src/oxygentheme.cpp
+@@ -52,12 +52,8 @@ void theme_init( GTypeModule* module )
+     Oxygen::RCStyle::registerType( module );
+     Oxygen::StyleWrapper::registerType( module );
+ 
+-    // initialize oxygen here, for XUL applications
+-    // special care is taken to not initialize everything
+-    Oxygen::ApplicationName applicationName;
+-    applicationName.initialize();
+-    if( applicationName.isXul() )
+-    { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); }
++    // style initialization
++    Oxygen::Style::instance().initialize();
+ 
+ }
+ 
+-- 
+1.8.1.2
+
diff --git a/oxygen-gtk2.spec b/oxygen-gtk2.spec
index 08a4165..23bf535 100644
--- a/oxygen-gtk2.spec
+++ b/oxygen-gtk2.spec
@@ -2,13 +2,16 @@
 Name:    oxygen-gtk2
 Summary: Oxygen GTK+2 theme
 Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 Group:   User Interface/Desktops
 URL:     https://projects.kde.org/projects/playground/artwork/oxygen-gtk
 Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk2/%{version}/src/%{name}-%{version}.tar.bz2
 
+## upstream patches
+Patch102: 0002-don-t-attempt-initialization-if-gtkSettings-is-not-r.patch
+
 BuildRequires: cmake
 BuildRequires: gtk2-devel
 
@@ -31,6 +34,8 @@ otherwise breaks every time some setting is changed in KDE.
 %prep
 %setup -q
 
+%patch102 -p1 -b .0002
+
 
 %build
 mkdir -p %{_target_platform}
@@ -59,6 +64,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 08 2013 Rex Dieter <rdieter at fedoraproject.org> 1.3.2-2
+- Upgrade to oxygen-gtk2 1.3.2 is buggy (kde#314545)
+
 * Wed Jan 30 2013 Alexey Kurov <nucleo at fedoraproject.org> - 1.3.2-1
 - oxygen-gtk2-1.3.2