xulrunner: update to 2.0, bump abi_depends.

This commit is contained in:
Juan RP
2011-04-08 22:23:08 +02:00
parent 7b89c7288d
commit f410cfbac9
10 changed files with 3169 additions and 76 deletions

View File

@@ -1,25 +0,0 @@
--- js/src/configure.in.old 2009-11-08 19:50:54.299642792 -0500
+++ js/src/configure.in 2009-11-08 19:57:49.235621814 -0500
@@ -2465,6 +2465,10 @@
ENABLE_JIT=1
NANOJIT_ARCH=i386
;;
+x86_64*-*)
+ ENABLE_JIT=1
+ NANOJIT_ARCH=X64
+ ;;
arm*-*)
ENABLE_JIT=1
NANOJIT_ARCH=ARM
@@ -2488,7 +2492,10 @@
i?86-*)
AC_DEFINE(AVMPLUS_IA32)
;;
-
+x86_64*-*)
+ AC_DEFINE(AVMPLUS_AMD64)
+ AC_DEFINE(AVMPLUS_64BIT)
+ ;;
arm*-*)
AC_DEFINE(AVMPLUS_ARM)
;;

View File

@@ -1,14 +1,16 @@
--- xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in
--- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in 2011-03-13 03:25:12.350027359 -0700
@@ -6,5 +6,6 @@
Name: libxul-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
Libs: -L${sdkdir}/lib -lxpcomglue -ldl
Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
--- xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in
--- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/libxul.pc.in 2011-03-13 03:25:28.010027359 -0700
@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
@@ -16,8 +18,9 @@
includedir=%includedir%
idldir=%idldir%
--- xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
--- mozilla-2.0.orig/xulrunner/installer/Makefile.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/Makefile.in 2011-03-13 03:25:55.570027359 -0700
@@ -121,6 +121,7 @@
-e "s|%includedir%|$(includedir)|" \
-e "s|%idldir%|$(idldir)|" \
@@ -26,8 +29,9 @@
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
--- xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
--- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-13 03:26:18.676694023 -0700
@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
@@ -35,8 +39,9 @@
includedir=%includedir%
Name: mozilla-gtkembedmoz
--- xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in
--- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-13 03:26:41.566694025 -0700
@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
@@ -44,11 +49,12 @@
includedir=%includedir%
Name: mozilla-gtkembedmoz
--- xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200
+++ xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200
diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in
--- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in 2011-03-13 03:27:19.680027357 -0700
@@ -7,4 +7,4 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lmozjs
Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +0,0 @@
--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100
+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100
@@ -135,7 +135,7 @@
// initialize
mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
- png_voidp_NULL,
+ NULL,
ErrorCallback,
ErrorCallback);
if (! mPNG)

View File

@@ -1,10 +1,11 @@
--- xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100
+++ xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100
@@ -44,6 +44,8 @@ VPATH = @srcdir@
diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in
--- mozilla-2.0.orig/xulrunner/installer/Makefile.in 2011-03-03 14:12:04.000000000 -0800
+++ mozilla-2.0/xulrunner/installer/Makefile.in 2011-03-13 01:58:19.663360705 -0800
@@ -44,6 +44,8 @@
include $(DEPTH)/config/autoconf.mk
+MOZ_APP_VERSION="1.9.2"
+MOZ_APP_VERSION="2.0"
+
NO_PKG_FILES = \
xulrunner-config \