summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-03-20 15:40:13 +0100
committerKoen Kooi <koen@openembedded.org>2009-03-20 15:40:13 +0100
commitb3f902c51428af11d721a7ab71de19b89f866dd7 (patch)
treeb375d380d387a0afe25f0bfb252d9e4b14ca8b52 /recipes
parentd094b05396f90895c89322236fb4049741b3ebdb (diff)
fennec: update from alpha to beta release, work around latest mozilla bugs (filed upstream)
Diffstat (limited to 'recipes')
-rw-r--r--recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch18
-rw-r--r--recipes/mozilla/fennec_hg.bb16
2 files changed, 20 insertions, 14 deletions
diff --git a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
index 39978cfd11..b3188de32f 100644
--- a/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
+++ b/recipes/mozilla/fennec/jsautocfg-dontoverwrite.patch
@@ -1,17 +1,17 @@
---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000
-+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000
-@@ -319,20 +319,8 @@
+--- /tmp/Makefile.in 2009-03-20 10:34:54.000000000 +0100
++++ mozilla-central/js/src/Makefile.in 2009-03-20 10:35:18.000000000 +0100
+@@ -507,20 +507,8 @@
- jsopcode.h jsopcode.c: jsopcode.tbl
+ export:: jsautocfg.h
--ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
- jsautocfg.h:
- touch $@
--else
--ifeq ($(OS_ARCH),WINCE)
+-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
-jsautocfg.h:
- touch $@
-else
+-ifeq ($(OS_ARCH),WINCE)
+ jsautocfg.h:
+ touch $@
+-else
-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX)
- @rm -f $@ jsautocfg.tmp
- ./jscpucfg > jsautocfg.tmp
diff --git a/recipes/mozilla/fennec_hg.bb b/recipes/mozilla/fennec_hg.bb
index a714c882c7..fad2203ed5 100644
--- a/recipes/mozilla/fennec_hg.bb
+++ b/recipes/mozilla/fennec_hg.bb
@@ -1,13 +1,13 @@
DESCRIPTION = "Mozilla Mobile browser"
DEPENDS += "cairo alsa-lib "
-PV = "0.9+1.0a2"
-MOZPV = "1.0a2"
-PR = "r2"
+PV = "0.9+1.0b2pre"
+MOZPV = "1.0b2pre"
+PR = "r3"
PE = "1"
-SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=df94feb90a4f \
- hg://hg.mozilla.org/;module=mobile-browser;rev=0361cd36d50d \
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=451c1f1753f0 \
+ hg://hg.mozilla.org/;module=mobile-browser;rev=9435ee77dda3 \
file://jsautocfg.h \
file://jsautocfg-dontoverwrite.patch;patch=1 \
"
@@ -33,6 +33,12 @@ do_configure_prepend() {
}
do_compile_prepend() {
+ # A compile time assert is broken:
+ # http://mxr.mozilla.org/mozilla-central/source/nsprpub/pr/include/prlog.h#259
+ for i in $(find ${S} -name "autoconf.mk") ; do
+ sed -i -e s:fsigned-char:fno-signed-char:g $i
+ done
+
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
cp ${WORKDIR}/jsautocfg.h ${S}/objdir/xulrunner/js/src/
sed -i -e "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" \