[arch-commits] Commit in oxygen-gtk3/repos (6 files)
Andrea Scarpino
andrea at archlinux.org
Mon Oct 20 07:10:04 UTC 2014
Date: Monday, October 20, 2014 @ 09:10:04
Author: andrea
Revision: 224861
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
oxygen-gtk3/repos/extra-i686/PKGBUILD
(from rev 224860, oxygen-gtk3/trunk/PKGBUILD)
oxygen-gtk3/repos/extra-i686/gtk3137.patch
(from rev 224860, oxygen-gtk3/trunk/gtk3137.patch)
oxygen-gtk3/repos/extra-x86_64/PKGBUILD
(from rev 224860, oxygen-gtk3/trunk/PKGBUILD)
oxygen-gtk3/repos/extra-x86_64/gtk3137.patch
(from rev 224860, oxygen-gtk3/trunk/gtk3137.patch)
Deleted:
oxygen-gtk3/repos/extra-i686/PKGBUILD
oxygen-gtk3/repos/extra-x86_64/PKGBUILD
----------------------------+
/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 31 ------------------
extra-i686/gtk3137.patch | 52 +++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 31 ------------------
extra-x86_64/gtk3137.patch | 52 +++++++++++++++++++++++++++++++
5 files changed, 176 insertions(+), 62 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-20 07:08:47 UTC (rev 224860)
+++ extra-i686/PKGBUILD 2014-10-20 07:10:04 UTC (rev 224861)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=oxygen-gtk3
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
-license=('LGPL')
-depends=('gtk3')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('68f0e7af7bd9f618abf3c0444a0f2868')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen-gtk3/repos/extra-i686/PKGBUILD (from rev 224860, oxygen-gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-20 07:10:04 UTC (rev 224861)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=oxygen-gtk3
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
+license=('LGPL')
+depends=('gtk3')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ 'gtk3137.patch')
+md5sums=('68f0e7af7bd9f618abf3c0444a0f2868'
+ 'eae9bb38c78d17d3b86f84835362ecd4')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/gtk3137.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: oxygen-gtk3/repos/extra-i686/gtk3137.patch (from rev 224860, oxygen-gtk3/trunk/gtk3137.patch)
===================================================================
--- extra-i686/gtk3137.patch (rev 0)
+++ extra-i686/gtk3137.patch 2014-10-20 07:10:04 UTC (rev 224861)
@@ -0,0 +1,52 @@
+commit 5f97a2d3f8880eb68ce2e0fd44285b6adc38293e
+Author: Hugo Pereira Da Costa <hugo.pereira at free.fr>
+Date: Mon Aug 25 07:34:35 2014 +0200
+
+ properly handle GTK_STATE_FLAG_CHECKED when rendering check buttons or
+ radio buttons
+ CCBUG: 338538
+
+diff --git a/src/oxygenstyleoptions.h b/src/oxygenstyleoptions.h
+index 52334df..a2712f8 100644
+--- a/src/oxygenstyleoptions.h
++++ b/src/oxygenstyleoptions.h
+@@ -76,7 +76,7 @@ namespace Oxygen
+ if( flags & GTK_STATE_FLAG_INSENSITIVE ) (*this) |= Disabled;
+ if( flags & GTK_STATE_FLAG_PRELIGHT ) (*this) |= Hover;
+ if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
+- if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
++ if( flags & ( GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_CHECKED ) ) (*this) |= Sunken;
+
+ // TODO: check whether one should use this, or gtk_widget_has_focus
+ if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
+@@ -90,7 +90,7 @@ namespace Oxygen
+ if( flags & GTK_STATE_FLAG_INSENSITIVE ) (*this) |= Disabled;
+ if( flags & GTK_STATE_FLAG_PRELIGHT ) (*this) |= Hover;
+ if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
+- if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
++ if( flags & ( GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_CHECKED ) ) (*this) |= Sunken;
+ if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
+ else if( GTK_IS_WIDGET( widget ) && gtk_widget_has_focus(widget) ) (*this)|=Focus;
+ }
+diff --git a/src/oxygenthemingengine.cpp b/src/oxygenthemingengine.cpp
+index 0e6382e..39d02d2 100644
+--- a/src/oxygenthemingengine.cpp
++++ b/src/oxygenthemingengine.cpp
+@@ -1868,7 +1868,7 @@ namespace Oxygen
+ // shadow type defines checkmark presence and type
+ GtkShadowType shadow( GTK_SHADOW_OUT );
+ if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
+- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
++ else if( state&(GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_CHECKED) ) shadow = GTK_SHADOW_IN;
+
+ Style::instance().renderCheckBox( widget, context, x, y, w, h, shadow, options, data );
+
+@@ -1955,7 +1955,7 @@ namespace Oxygen
+ // shadow type defines checkmark presence and type
+ GtkShadowType shadow( GTK_SHADOW_OUT );
+ if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
+- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
++ else if( state&(GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_CHECKED) ) shadow = GTK_SHADOW_IN;
+ Style::instance().renderRadioButton( widget, context, x, y, w, h, shadow, options, data );
+
+ } else {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-20 07:08:47 UTC (rev 224860)
+++ extra-x86_64/PKGBUILD 2014-10-20 07:10:04 UTC (rev 224861)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=oxygen-gtk3
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
-license=('LGPL')
-depends=('gtk3')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('68f0e7af7bd9f618abf3c0444a0f2868')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: oxygen-gtk3/repos/extra-x86_64/PKGBUILD (from rev 224860, oxygen-gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-20 07:10:04 UTC (rev 224861)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=oxygen-gtk3
+pkgver=1.4.0
+pkgrel=2
+pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
+license=('LGPL')
+depends=('gtk3')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ 'gtk3137.patch')
+md5sums=('68f0e7af7bd9f618abf3c0444a0f2868'
+ 'eae9bb38c78d17d3b86f84835362ecd4')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/gtk3137.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: oxygen-gtk3/repos/extra-x86_64/gtk3137.patch (from rev 224860, oxygen-gtk3/trunk/gtk3137.patch)
===================================================================
--- extra-x86_64/gtk3137.patch (rev 0)
+++ extra-x86_64/gtk3137.patch 2014-10-20 07:10:04 UTC (rev 224861)
@@ -0,0 +1,52 @@
+commit 5f97a2d3f8880eb68ce2e0fd44285b6adc38293e
+Author: Hugo Pereira Da Costa <hugo.pereira at free.fr>
+Date: Mon Aug 25 07:34:35 2014 +0200
+
+ properly handle GTK_STATE_FLAG_CHECKED when rendering check buttons or
+ radio buttons
+ CCBUG: 338538
+
+diff --git a/src/oxygenstyleoptions.h b/src/oxygenstyleoptions.h
+index 52334df..a2712f8 100644
+--- a/src/oxygenstyleoptions.h
++++ b/src/oxygenstyleoptions.h
+@@ -76,7 +76,7 @@ namespace Oxygen
+ if( flags & GTK_STATE_FLAG_INSENSITIVE ) (*this) |= Disabled;
+ if( flags & GTK_STATE_FLAG_PRELIGHT ) (*this) |= Hover;
+ if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
+- if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
++ if( flags & ( GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_CHECKED ) ) (*this) |= Sunken;
+
+ // TODO: check whether one should use this, or gtk_widget_has_focus
+ if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
+@@ -90,7 +90,7 @@ namespace Oxygen
+ if( flags & GTK_STATE_FLAG_INSENSITIVE ) (*this) |= Disabled;
+ if( flags & GTK_STATE_FLAG_PRELIGHT ) (*this) |= Hover;
+ if( flags & GTK_STATE_FLAG_SELECTED ) (*this) |= (Selected|Active);
+- if( flags & GTK_STATE_FLAG_ACTIVE ) (*this) |= Sunken;
++ if( flags & ( GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_CHECKED ) ) (*this) |= Sunken;
+ if( flags & GTK_STATE_FLAG_FOCUSED ) (*this) |= Focus;
+ else if( GTK_IS_WIDGET( widget ) && gtk_widget_has_focus(widget) ) (*this)|=Focus;
+ }
+diff --git a/src/oxygenthemingengine.cpp b/src/oxygenthemingengine.cpp
+index 0e6382e..39d02d2 100644
+--- a/src/oxygenthemingengine.cpp
++++ b/src/oxygenthemingengine.cpp
+@@ -1868,7 +1868,7 @@ namespace Oxygen
+ // shadow type defines checkmark presence and type
+ GtkShadowType shadow( GTK_SHADOW_OUT );
+ if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
+- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
++ else if( state&(GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_CHECKED) ) shadow = GTK_SHADOW_IN;
+
+ Style::instance().renderCheckBox( widget, context, x, y, w, h, shadow, options, data );
+
+@@ -1955,7 +1955,7 @@ namespace Oxygen
+ // shadow type defines checkmark presence and type
+ GtkShadowType shadow( GTK_SHADOW_OUT );
+ if( state>K_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
+- else if( state>K_STATE_FLAG_ACTIVE ) shadow = GTK_SHADOW_IN;
++ else if( state&(GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_CHECKED) ) shadow = GTK_SHADOW_IN;
+ Style::instance().renderRadioButton( widget, context, x, y, w, h, shadow, options, data );
+
+ } else {
More information about the arch-commits
mailing list