diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-12-10 20:32:05 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-12-10 20:32:05 +0000 |
| commit | 87baee08fa2aba4cbda3735c37da19b7e6e7eb07 (patch) | |
| tree | 7526cbdf497321fd9eaad8ab71fb9da3269b4720 | |
| parent | 86ab268f5f8e0057a42ccbeec66fa3231845ffc7 (diff) | |
| parent | 2dbb9dbe3151d0b83c46c91cd7ea4b2c37d1fcd5 (diff) | |
merge of 38257702404c262d564d18a82a4c034de93cbe95
and f364e3e809950cf1c1059b61206516bd02506cf9
| -rw-r--r-- | packages/mozilla/minimo/bug-322806.diff | 13 | ||||
| -rw-r--r-- | packages/mozilla/minimo_0.016+cvs.bb | 5 |
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 |