summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-07-06 14:58:33 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-13 15:21:43 +0100
commit13a8dc590394569428cc3768ef94c9b6251eaaeb (patch)
tree98a0ce026f94bffb244d4861d13695306de39e96
parent608909d02601b253ad9e6a3f35663fcf6e76af3d (diff)
downloadopenembedded-core-13a8dc590394569428cc3768ef94c9b6251eaaeb.tar.gz
openembedded-core-13a8dc590394569428cc3768ef94c9b6251eaaeb.tar.bz2
openembedded-core-13a8dc590394569428cc3768ef94c9b6251eaaeb.tar.xz
openembedded-core-13a8dc590394569428cc3768ef94c9b6251eaaeb.zip
gtk-sato-engine: Update to 0.3.2
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc1
-rw-r--r--meta/packages/gtk-engines/gtk-sato-engine.inc2
-rw-r--r--meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb6
-rw-r--r--meta/packages/gtk-engines/gtk-sato-engine_svn.bb7
5 files changed, 8 insertions, 10 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index d719b39db..955403070 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -38,7 +38,7 @@ SRCREV_pn-gaku ??= "399"
SRCREV_pn-gconf-dbus ??= "693"
SRCREV_pn-gconf-dbus-native ??= "693"
SRCREV_pn-gtkhtml2 ??= "1144"
-SRCREV_pn-gtk-sato-engine ??= "90"
+SRCREV_pn-gtk-sato-engine ??= "163"
SRCREV_pn-gtk-theme-torturer ??= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
SRCREV_pn-gtk-theme-darkilouche ??= "b4ce102a303d1176107a9d9d28c14f7da78feedd"
SRCREV_pn-gobject-introspection ??= "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 669946916..3a82f5f39 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -6,7 +6,6 @@
# Preferred Versions:
#
PREFERRED_VERSION_libmatchbox ?= "1.9"
-PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
PREFERRED_VERSION_glib-2.0 ?= "2.24.1"
diff --git a/meta/packages/gtk-engines/gtk-sato-engine.inc b/meta/packages/gtk-engines/gtk-sato-engine.inc
index f9ab14c8b..a7ebddff9 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine.inc
+++ b/meta/packages/gtk-engines/gtk-sato-engine.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Sato theme engine for GTK"
HOMEPAGE = "http://www.o-hand.com"
BUGTRACKER = "http://bugzilla.openedhand.com/"
-LICENSE = "LGPLv2+"
+LICENSE = "LGPLv2.1 & LGPLv2+"
SECTION = "x11/base"
DEPENDS = "gtk+"
diff --git a/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb b/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
deleted file mode 100644
index 2b12d2d9e..000000000
--- a/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-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/meta/packages/gtk-engines/gtk-sato-engine_svn.bb b/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
index 6fbb7ccdb..a7ee6c6e4 100644
--- a/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
+++ b/meta/packages/gtk-engines/gtk-sato-engine_svn.bb
@@ -1,6 +1,11 @@
require gtk-sato-engine.inc
-PV = "0.3.1+svnr${SRCREV}"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+ file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \
+ file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a"
+
+PV = "0.3.2+svnr${SRCREV}"
+PR = "r0"
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http"