[arch-commits] Commit in oxygen-gtk2/trunk (PKGBUILD kdebug-331879.patch)

[Andrea Scarpino]

    Date: Thursday, April 10, 2014 @ 14:04:07
  Author: andrea
Revision: 210147

upgpkg: oxygen-gtk2 1.4.5-1

Upstream release

Modified:
  oxygen-gtk2/trunk/PKGBUILD
Deleted:
  oxygen-gtk2/trunk/kdebug-331879.patch

---------------------+
 PKGBUILD            |   13 ++++---------
 kdebug-331879.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-10 11:59:27 UTC (rev 210146)
+++ PKGBUILD	2014-04-10 12:04:07 UTC (rev 210147)
@@ -3,8 +3,8 @@
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.4.4
-pkgrel=2
+pkgver=1.4.5
+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,11 @@
 conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kdebug-331879.patch')
-md5sums=('dd55d704f97e0c9e2fcc0d4d88d2eb1d'
-         '1900b38a9e5fbfe681aa3074fd95b64e')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('b368d074cb13a6020e6ed43016866d93')
 
 prepare() {
   mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/kdebug-331879.patch
 }
 
 build() {

Deleted: kdebug-331879.patch
===================================================================
--- kdebug-331879.patch	2014-04-10 11:59:27 UTC (rev 210146)
+++ kdebug-331879.patch	2014-04-10 12:04:07 UTC (rev 210147)
@@ -1,35 +0,0 @@
-From: Hugo Pereira Da Costa <hugo.pereira at free.fr>
-Date: Sun, 09 Mar 2014 12:00:33 +0000
-Subject: make sure parent is registered to innerShadowEngine before registering child
-X-Git-Url: http://quickgit.kde.org/?p=oxygen-gtk.git&a=commitdiff&h=b39931fa3ad7a2756bcb1494d5c3559513406ce2
----
-make sure parent is registered to innerShadowEngine before registering child
-CCBUG: 331879
----
-
-
---- a/src/oxygenstylewrapper.cpp
-+++ b/src/oxygenstylewrapper.cpp
-@@ -1669,7 +1669,10 @@
-             }
- 
-             // register to inner shadow engine
--            if( shadow == GTK_SHADOW_IN && gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN )
-+            if(
-+                shadow == GTK_SHADOW_IN &&
-+                gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN &&
-+                Style::instance().animations().innerShadowEngine().contains( widget ) )
-             { Style::instance().animations().innerShadowEngine().registerChild( widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); }
- 
-         } else if(
-@@ -2074,7 +2077,8 @@
-                     if( gtk_scrolled_window_get_shadow_type( scrolledWindow ) != GTK_SHADOW_IN )
-                     {
-                         gtk_scrolled_window_set_shadow_type( scrolledWindow, GTK_SHADOW_IN );
--                        Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) );
-+                        if( Style::instance().animations().innerShadowEngine().contains( child ) )
-+                        { Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); }
-                     }
- 
-                     return;
-