pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/xulrunner sync patches from www/firefox
details: https://anonhg.NetBSD.org/pkgsrc/rev/b14f2dbe8c2b
branches: trunk
changeset: 564691:b14f2dbe8c2b
user: tnn <tnn%pkgsrc.org@localhost>
date: Wed Sep 09 17:01:07 2009 +0000
description:
sync patches from www/firefox
diffstat:
devel/xulrunner/Makefile | 4 +-
devel/xulrunner/distinfo | 6 +-
devel/xulrunner/patches/patch-na | 122 +++++++++++++++++++++++++++++++++++++++
devel/xulrunner/patches/patch-nb | 35 +++++++++++
devel/xulrunner/patches/patch-nc | 20 ++++++
devel/xulrunner/patches/patch-nd | 37 +++++++++++
6 files changed, 221 insertions(+), 3 deletions(-)
diffs (266 lines):
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/Makefile
--- a/devel/xulrunner/Makefile Wed Sep 09 16:59:17 2009 +0000
+++ b/devel/xulrunner/Makefile Wed Sep 09 17:01:07 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:56:54 sno Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/09 17:01:07 tnn Exp $
#
DISTNAME= xulrunner-${XULRUNNER_VER}-source
PKGNAME= ${DISTNAME:S/-source//}
XULRUNNER_VER= 1.9.1.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/}
EXTRACT_SUFX= .tar.bz2
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/distinfo
--- a/devel/xulrunner/distinfo Wed Sep 09 16:59:17 2009 +0000
+++ b/devel/xulrunner/distinfo Wed Sep 09 17:01:07 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/08/06 10:42:50 tnn Exp $
+$NetBSD: distinfo,v 1.4 2009/09/09 17:01:07 tnn Exp $
SHA1 (xulrunner-1.9.1.2-source.tar.bz2) = 6439923ff9d316297926ebe193bac3ac1a41b494
RMD160 (xulrunner-1.9.1.2-source.tar.bz2) = d5e0b5f0e8b19b216394584ccabf37d776b89a39
@@ -38,6 +38,10 @@
SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0
SHA1 (patch-mn) = 17641f46ecf1019f3cc02583a22baa9f9a327d1f
SHA1 (patch-mp) = 33128f10b6146419bcebd85f7e6e7fa72e770be1
+SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7
+SHA1 (patch-nb) = 6b1719219df7cdd7bf5335fcf7f48567a37ffa87
+SHA1 (patch-nc) = f2a3cc803a114702e856947c25fd79baa85b0e26
+SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
SHA1 (patch-pa) = d03ef72ea7efceef5e2f12a245950b9a587ace82
SHA1 (patch-pb) = 32da908450ab463971bea1aafc9d6e37b1e78c0f
SHA1 (patch-pc) = baa2c72df21c6ddda65bdb435561323f4ee008ff
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/patches/patch-na
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner/patches/patch-na Wed Sep 09 17:01:07 2009 +0000
@@ -0,0 +1,122 @@
+$NetBSD: patch-na,v 1.1 2009/09/09 17:01:07 tnn Exp $
+
+# reported upstream as:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=512802
+
+--- js/src/jsscript.cpp.orig 2009-08-24 01:32:14.000000000 +0200
++++ js/src/jsscript.cpp 2009-08-24 01:36:20.000000000 +0200
+@@ -1370,19 +1370,49 @@ js_NewScript(JSContext *cx, uint32 lengt
+ size_t size, vectorSize;
+ JSScript *script;
+ uint8 *cursor;
++#ifdef _LP64
++#define LP64_ALIGN(V) if ((V) & 7) (V) = (((V)|7) + 1)
++#define LP64_ALIGNP(P) if ((uintptr_t)(P) & 7) (P) = (uint8*)(((uintptr_t)(P)|7) + 1)
++#else
++#define LP64_ALIGN(V)
++#define LP64_ALIGNP(V)
++#endif
+
+- size = sizeof(JSScript) +
+- sizeof(JSAtom *) * natoms +
+- length * sizeof(jsbytecode) +
+- nsrcnotes * sizeof(jssrcnote);
+- if (nobjects != 0)
+- size += sizeof(JSObjectArray) + nobjects * sizeof(JSObject *);
+- if (nupvars != 0)
+- size += sizeof(JSUpvarArray) + nupvars * sizeof(uint32);
+- if (nregexps != 0)
+- size += sizeof(JSObjectArray) + nregexps * sizeof(JSObject *);
+- if (ntrynotes != 0)
+- size += sizeof(JSTryNoteArray) + ntrynotes * sizeof(JSTryNote);
++ size = sizeof(JSScript);
++ if (nobjects != 0) {
++ LP64_ALIGN(size);
++ size += sizeof(JSObjectArray);
++ }
++ if (nupvars != 0) {
++ LP64_ALIGN(size);
++ size += sizeof(JSUpvarArray);
++ }
++ if (nregexps != 0) {
++ LP64_ALIGN(size);
++ size += sizeof(JSObjectArray);
++ }
++ if (ntrynotes != 0) {
++ LP64_ALIGN(size);
++ size += sizeof(JSTryNoteArray);
++ }
++ if (natoms != 0) {
++ LP64_ALIGN(size);
++ size += sizeof(JSAtom *) * natoms;
++ }
++ if (nobjects != 0) {
++ LP64_ALIGN(size);
++ size += nobjects * sizeof(JSObject *);
++ }
++ if (nupvars != 0) {
++ size += nupvars * sizeof(uint32);
++ }
++ if (nregexps != 0) {
++ LP64_ALIGN(size);
++ size += nregexps * sizeof(JSObject *);
++ }
++ size += length * sizeof(jsbytecode) +
++ nsrcnotes * sizeof(jssrcnote) +
++ ntrynotes * sizeof(JSTryNote);
+
+ script = (JSScript *) JS_malloc(cx, size);
+ if (!script)
+@@ -1393,23 +1423,28 @@ js_NewScript(JSContext *cx, uint32 lengt
+
+ cursor = (uint8 *)script + sizeof(JSScript);
+ if (nobjects != 0) {
++ LP64_ALIGNP(cursor);
+ script->objectsOffset = (uint8)(cursor - (uint8 *)script);
+ cursor += sizeof(JSObjectArray);
+ }
+ if (nupvars != 0) {
++ LP64_ALIGNP(cursor);
+ script->upvarsOffset = (uint8)(cursor - (uint8 *)script);
+ cursor += sizeof(JSUpvarArray);
+ }
+ if (nregexps != 0) {
++ LP64_ALIGNP(cursor);
+ script->regexpsOffset = (uint8)(cursor - (uint8 *)script);
+ cursor += sizeof(JSObjectArray);
+ }
+ if (ntrynotes != 0) {
++ LP64_ALIGNP(cursor);
+ script->trynotesOffset = (uint8)(cursor - (uint8 *)script);
+ cursor += sizeof(JSTryNoteArray);
+ }
+
+ if (natoms != 0) {
++ LP64_ALIGNP(cursor);
+ script->atomMap.length = natoms;
+ script->atomMap.vector = (JSAtom **)cursor;
+ vectorSize = natoms * sizeof(script->atomMap.vector[0]);
+@@ -1423,6 +1458,7 @@ js_NewScript(JSContext *cx, uint32 lengt
+ }
+
+ if (nobjects != 0) {
++ LP64_ALIGNP(cursor);
+ JS_SCRIPT_OBJECTS(script)->length = nobjects;
+ JS_SCRIPT_OBJECTS(script)->vector = (JSObject **)cursor;
+ vectorSize = nobjects * sizeof(JS_SCRIPT_OBJECTS(script)->vector[0]);
+@@ -1431,6 +1467,7 @@ js_NewScript(JSContext *cx, uint32 lengt
+ }
+
+ if (nupvars != 0) {
++ LP64_ALIGNP(cursor);
+ JS_SCRIPT_UPVARS(script)->length = nupvars;
+ JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
+ vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
+@@ -1439,6 +1476,7 @@ js_NewScript(JSContext *cx, uint32 lengt
+ }
+
+ if (nregexps != 0) {
++ LP64_ALIGNP(cursor);
+ JS_SCRIPT_REGEXPS(script)->length = nregexps;
+ JS_SCRIPT_REGEXPS(script)->vector = (JSObject **)cursor;
+ vectorSize = nregexps * sizeof(JS_SCRIPT_REGEXPS(script)->vector[0]);
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/patches/patch-nb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner/patches/patch-nb Wed Sep 09 17:01:07 2009 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-nb,v 1.1 2009/09/09 17:01:07 tnn Exp $
+
+# reported upstream as:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=512792
+
+--- media/liboggz/src/liboggz/oggz_byteorder.h.orig 2009-08-26 22:28:18.000000000 +0200
++++ media/liboggz/src/liboggz/oggz_byteorder.h 2009-08-26 22:41:39.000000000 +0200
+@@ -123,4 +123,27 @@ int32_be_at (unsigned char *c)
+ return (c [0] << 24) + (c [1] << 16) + (c [2] << 8) + c [3] ;
+ }
+
++static ogg_uint32_t
++_le_32_at (unsigned char *c)
++{
++ return (c [3] << 24) + (c [2] << 16) + (c [1] << 8) + c [0] ;
++}
++
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++static uint64_t
++_le_64_at (unsigned char *c)
++{
++ return (uint64_t)((uint64_t)c[7] << 56) + ((uint64_t)c[6] << 48)
++ + ((uint64_t)c[5] << 40) + ((uint64_t)c[4] << 32)
++ + (c [3] << 24) + (c [2] << 16) + (c [1] << 8) + c [0] ;
++}
++
++static ogg_uint16_t
++_be_16_at (unsigned char *c)
++{
++ return (c [0] << 8) + c [1] ;
++}
++
+ #endif /* __OGGZ_BYTEORDER_H__ */
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/patches/patch-nc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner/patches/patch-nc Wed Sep 09 17:01:07 2009 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-nc,v 1.1 2009/09/09 17:01:07 tnn Exp $
+
+# reported upstream as:
+# https://bugzilla.mozilla.org/show_bug.cgi?id=512792
+
+--- media/liboggz/src/liboggz/oggz_auto.c.orig 2009-08-26 22:20:35.000000000 +0200
++++ media/liboggz/src/liboggz/oggz_auto.c 2009-08-26 22:40:51.000000000 +0200
+@@ -62,9 +62,9 @@ int oggz_set_metric_linear (OGGZ * oggz,
+ ogg_int64_t granule_rate_numerator,
+ ogg_int64_t granule_rate_denominator);
+
+-#define INT16_BE_AT(x) _be_16((*(ogg_int32_t *)(x)))
+-#define INT32_LE_AT(x) _le_32((*(ogg_int32_t *)(x)))
+-#define INT64_LE_AT(x) _le_64((*(ogg_int64_t *)(x)))
++#define INT16_BE_AT(x) _be_16_at(x)
++#define INT32_LE_AT(x) _le_32_at(x)
++#define INT64_LE_AT(x) _le_64_at(x)
+
+ static int
+ oggz_stream_set_numheaders (OGGZ * oggz, long serialno, int numheaders)
diff -r 212b95674956 -r b14f2dbe8c2b devel/xulrunner/patches/patch-nd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/xulrunner/patches/patch-nd Wed Sep 09 17:01:07 2009 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-nd,v 1.1 2009/09/09 17:01:07 tnn Exp $
+
+# reported upstream as
+# https://bugzilla.mozilla.org/show_bug.cgi?id=514002
+
+--- gfx/qcms/iccread.c.orig 2009-07-30 17:30:16.000000000 +0200
++++ gfx/qcms/iccread.c 2009-09-01 21:29:29.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "qcmsint.h"
+
+ //XXX: use a better typename
+@@ -84,7 +85,9 @@ static uint32_t read_u32(struct mem_sour
+ invalid_source(mem, "Invalid offset");
+ return 0;
+ } else {
+- return be32_to_cpu(*(__be32*)(mem->buf + offset));
++ uint32_t v;
++ memcpy(&v, mem->buf + offset, 4);
++ return be32_to_cpu(v);
+ }
+ }
+
+@@ -94,7 +97,9 @@ static uint16_t read_u16(struct mem_sour
+ invalid_source(mem, "Invalid offset");
+ return 0;
+ } else {
+- return be16_to_cpu(*(__be16*)(mem->buf + offset));
++ uint16_t v;
++ memcpy(&v, mem->buf + offset, 2);
++ return be16_to_cpu(v);
+ }
+ }
+
Home |
Main Index |
Thread Index |
Old Index