diff options
Diffstat (limited to 'extra/oxygen-gtk2')
| -rw-r--r-- | extra/oxygen-gtk2/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/oxygen-gtk2/kdebug-331879.patch | 35 |
2 files changed, 5 insertions, 45 deletions
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index e82967d29..d458e6852 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 208162 2014-03-18 11:27:59Z andrea $ +# $Id: PKGBUILD 210148 2014-04-10 12:04:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # 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 @@ depends=('gtk2') 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() { diff --git a/extra/oxygen-gtk2/kdebug-331879.patch b/extra/oxygen-gtk2/kdebug-331879.patch deleted file mode 100644 index f52a1f8ed..000000000 --- a/extra/oxygen-gtk2/kdebug-331879.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Hugo Pereira Da Costa <hugo.pereira@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; - |