Thu Feb 14 00:04:51 PST 2013

2 files changed, 5 insertions, 59 deletions

diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 4c84a7685..160446aa5 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177572 2013-02-07 13:44:31Z andrea $
+# $Id: PKGBUILD 178010 2013-02-13 13:33:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.2.1
+pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
@@ -13,16 +13,10 @@ depends=('gtk2')
 conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'fix-regression.patch')
-md5sums=('7c4ecfca330102b7ff50e472a62dfc60'
-         'bced3ab820c3eafbb4e40a279d05bff6')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('cc33b2ac08f66d4b70f9c85303d44aad')
 
 build() {
-  cd ${pkgname}-${pkgver}/
-  patch -p1 -i "${srcdir}"/fix-regression.patch
-  cd ../
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/oxygen-gtk2/fix-regression.patch b/extra/oxygen-gtk2/fix-regression.patch
deleted file mode 100644
index 466b53c17..000000000
--- a/extra/oxygen-gtk2/fix-regression.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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();
- 
- }
-