gtk-xfce-engine: update to 3.0.1 and restructure

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

3 files changed, 23 insertions, 48 deletions

diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch b/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch
deleted file mode 100644
index 89fddb301..000000000
--- a/meta-xfce/recipes-xfce/gtk-xfce-engine/files/0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 868e3fcbb14b836b6f5f1cc73314aebe8453a939 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 29 Aug 2012 19:59:24 +0200
-Subject: [PATCH] Don't leak a graduent pattern at each draw (bug #8521)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport [1]
-[1] http://git.xfce.org/xfce/gtk-xfce-engine/commit/?id=964d4a05896bcb6dfbeec34dccb77e4f381363f1
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/gradient_draw.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/gradient_draw.c b/src/gradient_draw.c
-index 02deb88..37af559 100644
---- a/src/gradient_draw.c
-+++ b/src/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);
- }
--- 
-1.7.6.5
-
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb
deleted file mode 100644
index 71310b35e..000000000
--- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_2.9.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "XFCE theme for GTK"
-SECTION = "x11/libs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "gtk+ xfce4-dev-tools-native"
-
-PR = "r1"
-
-inherit xfce
-
-SRC_URI += "file://0001-Don-t-leak-a-graduent-pattern-at-each-draw-bug-8521.patch"
-SRC_URI[md5sum] = "e2bc76ab5093ff8472e728e6d6ad5da2"
-SRC_URI[sha256sum] = "55604002526c800539f2a8a79e7df3bf23717f45e4bfab31c154c8d01caf3af7"
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/engines \
-                ${datadir}/themes/"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_${PN}-staticdev += "${libdir}/gtk-2.0/*/engines/*.a"
diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb
new file mode 100644
index 000000000..3ccd2e628
--- /dev/null
+++ b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.0.1.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "XFCE theme for GTK"
+SECTION = "x11/libs"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "gtk+ gtk+3 xfce4-dev-tools-native"
+
+inherit xfce
+
+SRC_URI[md5sum] = "174e774d0debb052ec457640275f065d"
+SRC_URI[sha256sum] = "eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d"
+
+PACKAGES += "${PN}-themes gtk3-xfce-engine"
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so"
+FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so"
+FILES_${PN}-themes += "${datadir}/themes"
+
+FILES_${PN}-dbg += "${libdir}/gtk-3.0/*/theming-engines/.debug \
+                    ${libdir}/gtk-2.0/*/engines/.debug"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la \
+                    ${libdir}/gtk-3.0/*/theming-engines/*.la"
+
+RDEPENDS_${PN} += "${PN}-themes"
+RDEPENDS_gtk3-xfce-engine += "${PN}-themes"