[arch-commits] Commit in oxygen-gtk2/repos (6 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Thu Apr 10 12:04:18 UTC 2014
Date: Thursday, April 10, 2014 @ 14:04:17
Author: andrea
Revision: 210148
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
oxygen-gtk2/repos/extra-i686/PKGBUILD
(from rev 210147, oxygen-gtk2/trunk/PKGBUILD)
oxygen-gtk2/repos/extra-x86_64/PKGBUILD
(from rev 210147, oxygen-gtk2/trunk/PKGBUILD)
Deleted:
oxygen-gtk2/repos/extra-i686/PKGBUILD
oxygen-gtk2/repos/extra-i686/kdebug-331879.patch
oxygen-gtk2/repos/extra-x86_64/PKGBUILD
oxygen-gtk2/repos/extra-x86_64/kdebug-331879.patch
----------------------------------+
/PKGBUILD | 68 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 39 ---------------------
extra-i686/kdebug-331879.patch | 35 -------------------
extra-x86_64/PKGBUILD | 39 ---------------------
extra-x86_64/kdebug-331879.patch | 35 -------------------
5 files changed, 68 insertions(+), 148 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-10 12:04:07 UTC (rev 210147)
+++ extra-i686/PKGBUILD 2014-04-10 12:04:17 UTC (rev 210148)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=oxygen-gtk2
-pkgver=1.4.4
-pkgrel=2
-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/'
-license=('LGPL')
-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')
-
-prepare() {
- mkdir build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/kdebug-331879.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-gtk2/repos/extra-i686/PKGBUILD (from rev 210147, oxygen-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-10 12:04:17 UTC (rev 210148)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=oxygen-gtk2
+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/'
+license=('LGPL')
+depends=('gtk2')
+conflicts=('oxygen-gtk')
+replaces=('oxygen-gtk')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('b368d074cb13a6020e6ed43016866d93')
+
+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
+}
Deleted: extra-i686/kdebug-331879.patch
===================================================================
--- extra-i686/kdebug-331879.patch 2014-04-10 12:04:07 UTC (rev 210147)
+++ extra-i686/kdebug-331879.patch 2014-04-10 12:04:17 UTC (rev 210148)
@@ -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;
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-10 12:04:07 UTC (rev 210147)
+++ extra-x86_64/PKGBUILD 2014-04-10 12:04:17 UTC (rev 210148)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=oxygen-gtk2
-pkgver=1.4.4
-pkgrel=2
-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/'
-license=('LGPL')
-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')
-
-prepare() {
- mkdir build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/kdebug-331879.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-gtk2/repos/extra-x86_64/PKGBUILD (from rev 210147, oxygen-gtk2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-10 12:04:17 UTC (rev 210148)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=oxygen-gtk2
+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/'
+license=('LGPL')
+depends=('gtk2')
+conflicts=('oxygen-gtk')
+replaces=('oxygen-gtk')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('b368d074cb13a6020e6ed43016866d93')
+
+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
+}
Deleted: extra-x86_64/kdebug-331879.patch
===================================================================
--- extra-x86_64/kdebug-331879.patch 2014-04-10 12:04:07 UTC (rev 210147)
+++ extra-x86_64/kdebug-331879.patch 2014-04-10 12:04:17 UTC (rev 210148)
@@ -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;
-
More information about the arch-commits
mailing list