From 7f619855000f5de539987d0628076b549cedf798 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 12 Sep 2014 13:07:14 +0000
Subject: main/gtk-xfce-engine: upgrade to 3.0.1 and add gtk3 support

---
 main/gtk-xfce-engine/APKBUILD      | 31 ++++++++++++++++++++++++-------
 main/gtk-xfce-engine/memleak.patch | 19 -------------------
 2 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100644 main/gtk-xfce-engine/memleak.patch

(limited to 'main/gtk-xfce-engine')

diff --git a/main/gtk-xfce-engine/APKBUILD b/main/gtk-xfce-engine/APKBUILD
index 26e9079e3d..41567ee6a1 100644
--- a/main/gtk-xfce-engine/APKBUILD
+++ b/main/gtk-xfce-engine/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk-xfce-engine
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A port of Xfce engine to GTK+-2.0"
+pkgver=3.0.1
+pkgrel=0
+pkgdesc="Xfce theme engine"
 url="http://www.xfce.org/"
 arch="all"
 license="GPL-2"
 depends=
-makedepends="pkgconfig gtk+-dev libiconv-dev gettext-dev expat-dev"
+makedepends="gtk+2.0-dev gtk+3.0-dev"
 source="http://archive.xfce.org/src/xfce/gtk-xfce-engine/${pkgver%.*}/gtk-xfce-engine-$pkgver.tar.bz2
-	memleak.patch"
+	"
+subpackages="gtk2-xfce-engine:_gtk2 gtk3-xfce-engine:_gtk3"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -41,5 +42,21 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	find "$pkgdir"/ -name '*.la' -delete
 }
-md5sums="c02dec13f063c285de44d5388902822a  gtk-xfce-engine-3.0.0.tar.bz2
-cbb977c1160d0a07c408a18e748d7b68  memleak.patch"
+
+_split() {
+	local _ver=${1%.*}
+	pkgdesc="$pkgdesc - ${_ver/-/ }"
+	install_if="$pkgname=$pkgver-r$pkgrel ${1/-/+}"
+	cd "$pkgdir"
+	for dir in usr/lib/$1 usr/share/themes/*/$1; do
+		mkdir -p "$subpkgdir"/${dir%/*} || return 1
+		mv $dir "$subpkgdir"/${dir%/*} || return 1
+	done
+}
+
+_gtk2() { _split gtk-2.0; }
+_gtk3() { _split gtk-3.0; }
+
+md5sums="174e774d0debb052ec457640275f065d  gtk-xfce-engine-3.0.1.tar.bz2"
+sha256sums="eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d  gtk-xfce-engine-3.0.1.tar.bz2"
+sha512sums="0cd701cc485fcf7e112221c550f58078ca63773b0dd8c22d052b55564ad7954c721398735fbcf85b72f2b56ac5c65c1648522c1238fe97c274093d90f80af058  gtk-xfce-engine-3.0.1.tar.bz2"
diff --git a/main/gtk-xfce-engine/memleak.patch b/main/gtk-xfce-engine/memleak.patch
deleted file mode 100644
index 8c113445f6..0000000000
--- a/main/gtk-xfce-engine/memleak.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 964d4a05896bcb6dfbeec34dccb77e4f381363f1 Mon Sep 17 00:00:00 2001
-From: Landry Breuil <landry@xfce.org>
-Date: Wed, 22 Aug 2012 07:34:45 +0000
-Subject: Don't leak a graduent pattern at each draw (bug #8521)
-
----
-diff --git a/gtk-2.0/gradient_draw.c b/gtk-2.0/gradient_draw.c
-index 02deb88..37af559 100644
---- a/gtk-2.0/gradient_draw.c
-+++ b/gtk-2.0/gradient_draw.c
-@@ -278,4 +278,6 @@ void gradient_draw_shaded(cairo_t *cr, gint x, gint y, gint width, gint height,
-     cairo_fill (cr);
- 
-     cairo_restore(cr);
-+
-+    cairo_pattern_destroy(gradient);
- }
---
-cgit v0.9.0.3
-- 
cgit v1.2.3