[arch-commits] Commit in oxygen-gtk2/repos (6 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Thu Feb 7 13:44:31 UTC 2013
Date: Thursday, February 7, 2013 @ 14:44:31
Author: andrea
Revision: 177572
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
oxygen-gtk2/repos/extra-i686/PKGBUILD
(from rev 177571, oxygen-gtk2/trunk/PKGBUILD)
oxygen-gtk2/repos/extra-i686/fix-regression.patch
(from rev 177571, oxygen-gtk2/trunk/fix-regression.patch)
oxygen-gtk2/repos/extra-x86_64/PKGBUILD
(from rev 177571, oxygen-gtk2/trunk/PKGBUILD)
oxygen-gtk2/repos/extra-x86_64/fix-regression.patch
(from rev 177571, oxygen-gtk2/trunk/fix-regression.patch)
Deleted:
oxygen-gtk2/repos/extra-i686/PKGBUILD
oxygen-gtk2/repos/extra-x86_64/PKGBUILD
-----------------------------------+
extra-i686/PKGBUILD | 68 +++++++++++++++++++-----------------
extra-i686/fix-regression.patch | 48 +++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 68 +++++++++++++++++++-----------------
extra-x86_64/fix-regression.patch | 48 +++++++++++++++++++++++++
4 files changed, 170 insertions(+), 62 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-02-07 13:44:24 UTC (rev 177571)
+++ extra-i686/PKGBUILD 2013-02-07 13:44:31 UTC (rev 177572)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=oxygen-gtk2
-pkgver=1.3.2
-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/'
-license=('LGPL')
-depends=('gtk2')
-conflicts=('oxygen-gtk')
-replaces=('oxygen-gtk')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7c4ecfca330102b7ff50e472a62dfc60')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen-gtk2/repos/extra-i686/PKGBUILD (from rev 177571, oxygen-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-02-07 13:44:31 UTC (rev 177572)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=oxygen-gtk2
+pkgver=1.3.2
+pkgrel=2
+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/'
+license=('LGPL')
+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')
+
+build() {
+ cd ${pkgname}-${pkgver}/
+ patch -p1 -i "${srcdir}"/fix-regression.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: oxygen-gtk2/repos/extra-i686/fix-regression.patch (from rev 177571, oxygen-gtk2/trunk/fix-regression.patch)
===================================================================
--- extra-i686/fix-regression.patch (rev 0)
+++ extra-i686/fix-regression.patch 2013-02-07 13:44:31 UTC (rev 177572)
@@ -0,0 +1,48 @@
+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();
+
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-02-07 13:44:24 UTC (rev 177571)
+++ extra-x86_64/PKGBUILD 2013-02-07 13:44:31 UTC (rev 177572)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=oxygen-gtk2
-pkgver=1.3.2
-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/'
-license=('LGPL')
-depends=('gtk2')
-conflicts=('oxygen-gtk')
-replaces=('oxygen-gtk')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7c4ecfca330102b7ff50e472a62dfc60')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen-gtk2/repos/extra-x86_64/PKGBUILD (from rev 177571, oxygen-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-02-07 13:44:31 UTC (rev 177572)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=oxygen-gtk2
+pkgver=1.3.2
+pkgrel=2
+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/'
+license=('LGPL')
+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')
+
+build() {
+ cd ${pkgname}-${pkgver}/
+ patch -p1 -i "${srcdir}"/fix-regression.patch
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: oxygen-gtk2/repos/extra-x86_64/fix-regression.patch (from rev 177571, oxygen-gtk2/trunk/fix-regression.patch)
===================================================================
--- extra-x86_64/fix-regression.patch (rev 0)
+++ extra-x86_64/fix-regression.patch 2013-02-07 13:44:31 UTC (rev 177572)
@@ -0,0 +1,48 @@
+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();
+
+ }
+
More information about the arch-commits
mailing list