diff options
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 d719b39db9..9554030703 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" | |||
38 | SRCREV_pn-gconf-dbus ??= "693" | 38 | SRCREV_pn-gconf-dbus ??= "693" |
39 | SRCREV_pn-gconf-dbus-native ??= "693" | 39 | SRCREV_pn-gconf-dbus-native ??= "693" |
40 | SRCREV_pn-gtkhtml2 ??= "1144" | 40 | SRCREV_pn-gtkhtml2 ??= "1144" |
41 | SRCREV_pn-gtk-sato-engine ??= "90" | 41 | SRCREV_pn-gtk-sato-engine ??= "163" |
42 | SRCREV_pn-gtk-theme-torturer ??= "99962ae39bb5aadb31929b25c58e1a053f9c9545" | 42 | SRCREV_pn-gtk-theme-torturer ??= "99962ae39bb5aadb31929b25c58e1a053f9c9545" |
43 | SRCREV_pn-gtk-theme-darkilouche ??= "b4ce102a303d1176107a9d9d28c14f7da78feedd" | 43 | SRCREV_pn-gtk-theme-darkilouche ??= "b4ce102a303d1176107a9d9d28c14f7da78feedd" |
44 | SRCREV_pn-gobject-introspection ??= "efa7266bcf78478ce62e8dd778a4f0417bfd4d15" | 44 | 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 669946916d..3a82f5f39f 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -6,7 +6,6 @@ | |||
6 | # Preferred Versions: | 6 | # Preferred Versions: |
7 | # | 7 | # |
8 | PREFERRED_VERSION_libmatchbox ?= "1.9" | 8 | PREFERRED_VERSION_libmatchbox ?= "1.9" |
9 | PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1" | ||
10 | PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" | 9 | PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" |
11 | 10 | ||
12 | PREFERRED_VERSION_glib-2.0 ?= "2.24.1" | 11 | 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 f9ab14c8b0..a7ebddff99 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" | |||
2 | HOMEPAGE = "http://www.o-hand.com" | 2 | HOMEPAGE = "http://www.o-hand.com" |
3 | BUGTRACKER = "http://bugzilla.openedhand.com/" | 3 | BUGTRACKER = "http://bugzilla.openedhand.com/" |
4 | 4 | ||
5 | LICENSE = "LGPLv2+" | 5 | LICENSE = "LGPLv2.1 & LGPLv2+" |
6 | 6 | ||
7 | SECTION = "x11/base" | 7 | SECTION = "x11/base" |
8 | DEPENDS = "gtk+" | 8 | 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 2b12d2d9e8..0000000000 --- a/meta/packages/gtk-engines/gtk-sato-engine_0.3.1.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require gtk-sato-engine.inc | ||
2 | |||
3 | PR = "r4" | ||
4 | |||
5 | SRC_URI = "http://pokylinux.org/releases/sato/sato-engine-${PV}.tar.gz" | ||
6 | 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 6fbb7ccdbc..a7ee6c6e43 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 @@ | |||
1 | require gtk-sato-engine.inc | 1 | require gtk-sato-engine.inc |
2 | 2 | ||
3 | PV = "0.3.1+svnr${SRCREV}" | 3 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
4 | file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \ | ||
5 | file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a" | ||
6 | |||
7 | PV = "0.3.2+svnr${SRCREV}" | ||
8 | PR = "r0" | ||
4 | 9 | ||
5 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http" | 10 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http" |
6 | 11 | ||