[PATCH 0/2] [PULL] X apps/UX upgrade, edwin, Apr20, 2011

[PATCH 0/2] [PULL] X apps/UX upgrade, edwin, Apr20, 2011

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

Saul,
Some simple upgrade. Pls. pull.

Thanks,
edwin

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: gzhai/upgrade04
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/upgrade04

Thanks,
    Zhai Edwin <edwin.zhai@intel.com>
---


Zhai Edwin (2):
  gtkhtml2: Upgrade to svn r1161 (from r1144)
  puzzles: Upgrade to svn r9151 (from r9084)

 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
 .../puzzles/files/oh-puzzles-owl-menu.patch        |    5 +++++
 .../puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename meta/recipes-sato/puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} (94%)

[PATCH 1/2] gtkhtml2: Upgrade to svn r1161 (from r1144)

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../conf/distro/include/poky-default-revisions.inc |    2 +-
 meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 9a3ae7e..4da44ce 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -49,7 +49,7 @@ SRCREV_pn-fstests ??= "426"
 SRCREV_pn-gaku ??= "399"
 SRCREV_pn-gconf-dbus ??= "705"
 SRCREV_pn-gconf-dbus-native ??= "705"
-SRCREV_pn-gtkhtml2 ??= "1144"
+SRCREV_pn-gtkhtml2 ??= "1161"
 SRCREV_pn-gtk-sato-engine ??= "163"
 SRCREV_pn-gtk-theme-torturer ??= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
 SRCREV_pn-gtk-theme-darkilouche ??= "b4ce102a303d1176107a9d9d28c14f7da78feedd"
diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index ac921bf..ea99b23 100644
--- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "A GTK+ HTML rendering library."
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 PV = "2.11.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \
 	http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0;maxrev=1157;name=patch1 \
-- 
1.7.1

[PATCH 2/2] puzzles: Upgrade to svn r9151 (from r9084)

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../puzzles/files/oh-puzzles-owl-menu.patch        |    5 +++++
 .../puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
 rename meta/recipes-sato/puzzles/{puzzles_r9084.bb => puzzles_r9151.bb} (94%)

diff --git a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
index 61da919..7e2c3ab 100644
--- a/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
+++ b/meta/recipes-sato/puzzles/files/oh-puzzles-owl-menu.patch
@@ -1,3 +1,8 @@
+This patch enable owl menu, which is hidden in the title bar to save space on
+small screen. It has not been used for a long time, rebase needed.
+
+Upstream-Status: Inappropriate [enable feature]
+
 Index: src/gtk.c
 ===================================================================
 --- src/gtk.c	(revision 22)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9084.bb b/meta/recipes-sato/puzzles/puzzles_r9151.bb
similarity index 94%
rename from meta/recipes-sato/puzzles/puzzles_r9084.bb
rename to meta/recipes-sato/puzzles/puzzles_r9151.bb
index fbd0e37..5cd8bb9 100644
--- a/meta/recipes-sato/puzzles/puzzles_r9084.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9151.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5"
 
 SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
 
-# Checksums seem to be changing regularly right now, need to verify with upstream
+# Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now
 #SRC_URI[md5sum] = "e8b4c7e2341264789f3cd6733857bf1c"
 #SRC_URI[sha256sum] = "69f37e497e63b2f7ab44e7bbd50aee078269c16dbc2d78ec1b00257678f2cbd2"
 #SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
-- 
1.7.1

Re: [PATCH 0/2] [PULL] X apps/UX upgrade, edwin, Apr20, 2011

[Saul Wold]

On 04/20/2011 05:58 AM, Zhai Edwin wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> Saul,
> Some simple upgrade. Pls. pull.
>
> Thanks,
> edwin
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: gzhai/upgrade04
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/upgrade04
>
> Thanks,
>      Zhai Edwin<edwin.zhai@intel.com>
> ---
>
>
> Zhai Edwin (2):
>    gtkhtml2: Upgrade to svn r1161 (from r1144)
>    puzzles: Upgrade to svn r9151 (from r9084)
>
>   .../conf/distro/include/poky-default-revisions.inc |    2 +-
>   meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb        |    2 +-
>   .../puzzles/files/oh-puzzles-owl-menu.patch        |    5 +++++
>   .../puzzles/{puzzles_r9084.bb =>  puzzles_r9151.bb} |    2 +-
>   4 files changed, 8 insertions(+), 3 deletions(-)
>   rename meta/recipes-sato/puzzles/{puzzles_r9084.bb =>  puzzles_r9151.bb} (94%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

Pulled into ie-core and poky/master

Thanks
	Sau!