gtk-sato-engine add latest from poky

3 files changed, 17 insertions, 34 deletions

diff --git a/packages/gtk-engines/gtk-sato-engine_0.1.bb b/packages/gtk-engines/gtk-sato-engine.inc
index 85720fbdd2..5ac690d630 100644
--- a/packages/gtk-engines/gtk-sato-engine_0.1.bb
+++ b/packages/gtk-engines/gtk-sato-engine.inc
@@ -1,11 +1,14 @@
-SECTION = "x11/base"
 DESCRIPTION = "Sato theme engine for GTK"
+SECTION = "x11/base"
 LICENSE = "LGPL"
 DEPENDS = "gtk+"
-PR = "r0"
+RDEPENDS_gtk-theme-sato = "gtk-sato-engine"
 
-SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-0.1.tar.gz"
-S = "${WORKDIR}/sato-engine-0.1"
+PACKAGES += "gtk-theme-sato"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg = "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
 
 inherit autotools  pkgconfig
 
@@ -14,13 +17,3 @@ do_configure_prepend() {
 		ln -sf ../gtk-common/$i gtk2-engine/$i
 	done
 }
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-
-RDEPENDS_gtk-theme-sato = "${PN}"
-
-
diff --git a/packages/gtk-engines/gtk-sato-engine_0.3.1.bb b/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
new file mode 100644
index 0000000000..2b12d2d9e8
--- /dev/null
+++ b/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
@@ -0,0 +1,6 @@
+require gtk-sato-engine.inc
+
+PR = "r4"
+
+SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-${PV}.tar.gz"
+S = "${WORKDIR}/sato-engine-${PV}"
diff --git a/packages/gtk-engines/gtk-sato-engine_svn.bb b/packages/gtk-engines/gtk-sato-engine_svn.bb
index 39829984d3..6fbb7ccdbc 100644
--- a/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/packages/gtk-engines/gtk-sato-engine_svn.bb
@@ -1,25 +1,9 @@
-LICENSE = "GPL"
-SECTION = "x11/base"
-DESCRIPTION = "GTK theme engine SATO from O-Hand"
-DEPENDS = "gtk+"
+require gtk-sato-engine.inc
 
-DEFAULT_PREFERENCE = "-1"
-
-PV = "0.1+svn${SRCDATE}"
-PR = "r0"
-
-S = "${WORKDIR}/gtk-engine"
+PV = "0.3.1+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"
 
-inherit autotools pkgconfig
-
-PACKAGES += "gtk-theme-sato"
-FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
-FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-FILES_gtk-theme-sato = "${datadir}/icons ${datadir}/themes"
-
-RDEPENDS_gtk-theme-sato = "${PN}"
-
+EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
 
+S = "${WORKDIR}/gtk-engine"