[arch-commits] Commit in oxygen-gtk2/trunk (PKGBUILD fix-regression.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Wed Feb 13 13:32:58 UTC 2013
Date: Wednesday, February 13, 2013 @ 14:32:58
Author: andrea
Revision: 178009
upgpkg: oxygen-gtk2 1.3.2.1-1
Upstream release
Modified:
oxygen-gtk2/trunk/PKGBUILD
Deleted:
oxygen-gtk2/trunk/fix-regression.patch
----------------------+
PKGBUILD | 14 ++++----------
fix-regression.patch | 48 ------------------------------------------------
2 files changed, 4 insertions(+), 58 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-13 13:30:36 UTC (rev 178008)
+++ PKGBUILD 2013-02-13 13:32:58 UTC (rev 178009)
@@ -3,8 +3,8 @@
# 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 @@
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} \
Deleted: fix-regression.patch
===================================================================
--- fix-regression.patch 2013-02-13 13:30:36 UTC (rev 178008)
+++ fix-regression.patch 2013-02-13 13:32:58 UTC (rev 178009)
@@ -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();
-
- }
-
More information about the arch-commits
mailing list