From 355d03d5b192555e9445e5265b22331fe4d07f52 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 9 Jul 2010 16:08:36 +0200
Subject: fennec: update to fennec2

---
 recipes/mozilla/fennec/use-native-bpp.patch | 6 +++---
 recipes/mozilla/fennec_hg.bb                | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'recipes')

diff --git a/recipes/mozilla/fennec/use-native-bpp.patch b/recipes/mozilla/fennec/use-native-bpp.patch
index 1ecb9f3922..e693f639b9 100644
--- a/recipes/mozilla/fennec/use-native-bpp.patch
+++ b/recipes/mozilla/fennec/use-native-bpp.patch
@@ -1,5 +1,5 @@
---- a/gfx/thebes/src/gfxPlatformGtk.cpp	2010-04-19 18:02:04.000000000 +0000
-+++ b/gfx/thebes/src/gfxPlatformGtk.cpp	2010-04-25 11:36:49.000000000 +0000
+--- a/gfx/thebes/gfxPlatformGtk.cpp	2010-04-19 18:02:04.000000000 +0000
++++ b/gfx/thebes/gfxPlatformGtk.cpp	2010-04-25 11:36:49.000000000 +0000
 @@ -91,7 +91,12 @@
  #include FT_FREETYPE_H
  #endif
@@ -45,5 +45,5 @@
 +    }
 +    if (!xrenderFormat) xrenderFormat = XRenderFindStandardFormat(display, xrenderFormatID);
  
-     if (xrenderFormat && sizeOk) {
+     if (xrenderFormat) {
          pixmap = gdk_pixmap_new(nsnull, size.width, size.height,
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index 482ea1da82..2d44e9ae10 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -1,13 +1,12 @@
 DESCRIPTION = "Mozilla Mobile browser"
 
 PV = "0.9+${MOZPV}"
-MOZPV = "1.1b2"
-PR = "r9"
+MOZPV = "2.0a1pre"
+PR = "r10"
 PE = "1"
 
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=060ddfe5aa48 \
-           hg://hg.mozilla.org/;module=mobile-browser;rev=ad254d8abbc9 \
-           file://use-native-bpp.patch \
+SRC_URI = "hg://hg.mozilla.org;module=mozilla-central;rev=ad5644e101fd \
+           hg://hg.mozilla.org;module=mobile-browser;rev=457ffb726aeb \
            file://jsautocfg.h \
            file://jsautocfg-dontoverwrite.patch \
 "
-- 
cgit 1.2.3-korg