[SVN-Commit] r697 - in branches/experimental/www/libxul: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Sat Feb 18 14:14:17 2012
New Revision: 697

Log:
update to 10.0.2

Modified:
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/libxul/distinfo
   branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h
   branches/experimental/www/libxul/files/patch-js-src-configure.in

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Sat Feb 18 12:36:10 2012	(r696)
+++ branches/experimental/www/libxul/Makefile	Sat Feb 18 14:14:17 2012	(r697)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxul
-DISTVERSION=	8.0
+DISTVERSION=	10.0.2
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	xulrunner/releases/${DISTVERSION}/source
@@ -49,8 +49,8 @@
 MOZILLA_EXEC_NAME=xulrunner
 MOZ_TOOLKIT=	cairo-gtk2
 USE_MOZILLA=	-png -nss -dbm -jpeg
-MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
-		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
+MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js mozilla-nss \
+			mozilla-plugin
 
 OPTIONS=	DBUS "Enable D-BUS support" on
 

Modified: branches/experimental/www/libxul/distinfo
==============================================================================
--- branches/experimental/www/libxul/distinfo	Sat Feb 18 12:36:10 2012	(r696)
+++ branches/experimental/www/libxul/distinfo	Sat Feb 18 14:14:17 2012	(r697)
@@ -1,2 +1,2 @@
-SHA256 (xulrunner-8.0.source.tar.bz2) = 202bdb3a74e4762fdfb8602a003084f00c8b88af2349fbb9ba59e8f516132207
-SIZE (xulrunner-8.0.source.tar.bz2) = 70376586
+SHA256 (xulrunner-10.0.2.source.tar.bz2) = d787ba9f77eab3d0015f9306587c6e9d7ac70e011c6ab941e7115a4a2b20ab49
+SIZE (xulrunner-10.0.2.source.tar.bz2) = 75540079

Modified: branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h	Sat Feb 18 12:36:10 2012	(r696)
+++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-build-build_config.h	Sat Feb 18 14:14:17 2012	(r697)
@@ -1,5 +1,5 @@
---- ipc/chromium/src/build/build_config.h.orig	2011-08-04 12:43:13.000000000 +0200
-+++ ipc/chromium/src/build/build_config.h	2011-08-27 22:09:08.000000000 +0200
+--- ipc/chromium/src/build/build_config.h~
++++ ipc/chromium/src/build/build_config.h
 @@ -17,7 +17,7 @@
  // A set of macros to use for platform detection.
  #if defined(__APPLE__)
@@ -9,13 +9,3 @@
  #define OS_LINUX 1
  #elif defined(_WIN32)
  #define OS_WIN 1
-@@ -57,6 +57,9 @@
- #define ARCH_CPU_ARMEL 1
- #define ARCH_CPU_32_BITS 1
- #define WCHAR_T_IS_UNSIGNED 1
-+#elif defined(__ppc64__) || defined(__powerpc64__)
-+#define ARCH_CPU_PPC 1
-+#define ARCH_CPU_64_BITS 1
- #elif defined(__ppc__) || defined(__powerpc__)
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1

Modified: branches/experimental/www/libxul/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-configure.in	Sat Feb 18 12:36:10 2012	(r696)
+++ branches/experimental/www/libxul/files/patch-js-src-configure.in	Sat Feb 18 14:14:17 2012	(r697)
@@ -1,6 +1,6 @@
---- js/src/configure.in.orig	2011-09-28 14:41:24.000000000 +0200
-+++ js/src/configure.in	2011-10-01 16:02:43.000000000 +0200
-@@ -1533,7 +1533,7 @@
+--- js/src/configure.in.orig	2012-01-29 11:24:33.000000000 +0100
++++ js/src/configure.in	2012-01-30 23:30:02.051087215 +0100
+@@ -1410,7 +1410,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1555,7 +1555,7 @@
+@@ -1432,7 +1432,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,7 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -2743,6 +2743,16 @@
+@@ -2713,6 +2713,16 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
@@ -33,9 +33,25 @@
 +    AC_DEFINE(JS_PUNBOX64)
 +    ;;
  x86_64*-*)
-     ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
-@@ -2827,6 +2837,10 @@
+     ENABLE_METHODJIT=1
+@@ -2732,6 +2742,7 @@
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+ sparc*-*)
++    if test ! "$HAVE_64BIT_OS" ; then
+     NANOJIT_ARCH=Sparc
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+@@ -2739,6 +2750,7 @@
+     ENABLE_METHODJIT_TYPED_ARRAY=1
+     AC_DEFINE(JS_CPU_SPARC)
+     AC_DEFINE(JS_NUNBOX32)
++    fi
+     ;;
+ esac
+ 
+@@ -2795,6 +2807,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;