summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2006-12-10 21:00:38 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2006-12-10 21:00:38 +0000
commite38c46cff172df7934471ee397aa9b92729259c7 (patch)
treee4d2f75592a5f78b519d15ae612137d91cc7c73f
parentdd4380869f19be2f69502c711938acef7bb350cc (diff)
parent2dbb9dbe3151d0b83c46c91cd7ea4b2c37d1fcd5 (diff)
merge of '66ac81e5457735c2fdeaffebbea0e83ef0b97877'
and 'f364e3e809950cf1c1059b61206516bd02506cf9'
-rw-r--r--packages/mozilla/minimo/bug-322806.diff13
-rw-r--r--packages/mozilla/minimo_0.016+cvs.bb5
2 files changed, 16 insertions, 2 deletions
diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff
new file mode 100644
index 0000000000..e001e3fc67
--- /dev/null
+++ b/packages/mozilla/minimo/bug-322806.diff
@@ -0,0 +1,13 @@
+See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600
+
+--- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100
+@@ -212,7 +212,7 @@
+ "add sp, sp, r4 \n\t" /* restore stack pointer */
+ "mov %0, r0 \n\t" /* the result... */
+ : "=r" (result)
+- : "r" (&my_params)
++ : "r" (&my_params), "m" (my_params)
+ : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp"
+ );
+
diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb
index b7c7792879..dcd22b3dd9 100644
--- a/packages/mozilla/minimo_0.016+cvs.bb
+++ b/packages/mozilla/minimo_0.016+cvs.bb
@@ -11,11 +11,12 @@ BRTAG = "MOZILLA_1_8_BRANCH"
MOZDATE = "20060720"
PV = "0.016+cvs${MOZDATE}"
-PR = "r3"
+PR = "r4"
SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \
file://minimo.patch;patch=1 \
- file://mozconfig file://minimo \
+ file://bug-322806.diff;patch=1 \
+ file://mozconfig file://minimo \
file://minimo.desktop file://minimo.png"
inherit autotools