[arch-commits] Commit in oxygen-gtk3/trunk (PKGBUILD gtk3137.patch)

[Andrea Scarpino]

    Date: Wednesday, October 22, 2014 @ 20:04:25
  Author: andrea
Revision: 225193

upgpkg: oxygen-gtk3 1.4.1-1

Upstream release

Modified:
  oxygen-gtk3/trunk/PKGBUILD
Deleted:
  oxygen-gtk3/trunk/gtk3137.patch

---------------+
 PKGBUILD      |   13 ++++---------
 gtk3137.patch |   52 ----------------------------------------------------
 2 files changed, 4 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-22 18:04:17 UTC (rev 225192)
+++ PKGBUILD	2014-10-22 18:04:25 UTC (rev 225193)
@@ -2,8 +2,8 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+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/'
@@ -10,16 +10,11 @@
 license=('LGPL')
 depends=('gtk3')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'gtk3137.patch')
-md5sums=('68f0e7af7bd9f618abf3c0444a0f2868'
-         'eae9bb38c78d17d3b86f84835362ecd4')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('231854fbe379dd441518195c45d08201')
 
 prepare() {
   mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/gtk3137.patch
 }
 
 build() {

Deleted: gtk3137.patch
===================================================================
--- gtk3137.patch	2014-10-22 18:04:17 UTC (rev 225192)
+++ gtk3137.patch	2014-10-22 18:04:25 UTC (rev 225193)
@@ -1,52 +0,0 @@
-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&GTK_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
--            else if( state&GTK_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&GTK_STATE_FLAG_INCONSISTENT ) shadow = GTK_SHADOW_ETCHED_IN;
--            else if( state&GTK_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 {