[SVN-Commit] r771 - in branches/experimental/www/libxul19: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Mon Jun 18 13:59:37 UTC 2012 

Author: jbeich
Date: Mon Jun 18 13:59:30 2012
New Revision: 771

Log:
add/sync a port for libxul as it's in CVS

Added:
   branches/experimental/www/libxul19/
      - copied from r765, trunk/www/libxul/
   branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in
      - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in
   branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
      - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
   branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
      - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
   branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile
      - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile
   branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp
      - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp
   branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in
      - copied unchanged from r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in
Modified:
   branches/experimental/www/libxul19/Makefile
   branches/experimental/www/libxul19/files/patch-configure.in
   branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk
   branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp

Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Sun Jun 17 14:42:13 2012	(r765)
+++ branches/experimental/www/libxul19/Makefile	Mon Jun 18 13:59:30 2012	(r771)
@@ -20,7 +20,7 @@
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
-USE_AUTOTOOLS=	autoconf213
+USE_AUTOTOOLS=	autoconf213:env
 WANT_GNOME=	yes
 WANT_PERL=	yes
 ALL_TARGET=	default
@@ -34,21 +34,19 @@
 
 PORT_MOZCONFIG=	${WRKSRC}/xulrunner/config/mozconfig
 MOZ_OPTIONS?=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--disable-javaxpcom --enable-canvas \
-		--enable-system-cairo --disable-updater \
-		--disable-necko-wifi --disable-ipc
+		--disable-javaxpcom \
+		--disable-ipc \
+		--disable-updater \
+		--disable-necko-wifi
 MOZ_EXTENSIONS=	default,cookie,permissions
 OPTIONS=	# Empty, used for generic gecko OPTIONS
-USE_GECKO_OPTIONS=	java debug logging optimized_cflags
+USE_GECKO_OPTIONS=+java
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner
-MOZ_TOOLKIT=	cairo-gtk2
-USE_MOZILLA=	-png -nss -dbm -jpeg
+USE_MOZILLA=	-nss -dbm -event -ffi -vpx
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
 		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
 
-OPTIONS=	DBUS "Enable D-BUS support" on
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
@@ -67,13 +65,6 @@
 .endif
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 	    	${WRKSRC}/storage/build/Makefile.in \
@@ -87,6 +78,7 @@
 		${WRKSRC}/js/src/configure
 
 pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
 
 post-build:

Copied: branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in (from r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in)
@@ -0,0 +1,16 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -46,10 +46,12 @@
+ #else
+ @BINPATH@/@DLL_PREFIX at mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX at plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX at plds4@DLL_SUFFIX@
+- at BINPATH@/@DLL_PREFIX at xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
++#endif
++ at BINPATH@/@DLL_PREFIX at xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else

Modified: branches/experimental/www/libxul19/files/patch-configure.in
==============================================================================
--- trunk/www/libxul/files/patch-configure.in	Sun Jun 17 14:42:13 2012	(r765)
+++ branches/experimental/www/libxul19/files/patch-configure.in	Mon Jun 18 13:59:30 2012	(r771)
@@ -20,3 +20,13 @@
  _SAVE_LIBS=$LIBS
  LIBS="$LIBS $_ICONV_LIBS"
  AC_CACHE_CHECK(
+@@ -4252,6 +4252,9 @@ else
+         NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+     fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++    AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+ 
+ dnl system libevent Support
+ dnl ========================================================

Copied: branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp (from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp)
@@ -0,0 +1,74 @@
+--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig	2009-05-02 18:39:49.000000000 +0200
++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2012-05-09 13:14:57.000000000 +0200
+@@ -116,7 +116,7 @@ void nsPNGDecoder::CreateFrame(png_uint_
+   nsresult rv = mImage->AppendFrame(x_offset, y_offset, width, height, format,
+                                     &mImageData, &imageDataLength);
+   if (NS_FAILED(rv))
+-    longjmp(mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++    longjmp(png_jmpbuf(mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ 
+   mFrameRect.x = x_offset;
+   mFrameRect.y = y_offset;
+@@ -376,7 +376,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
+   }
+ 
+   // we need to do the setjmp here otherwise bad things will happen
+-  if (setjmp(decoder->mPNG->jmpbuf)) {
++  if (setjmp(png_jmpbuf(decoder->mPNG))) {
+     png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+ 
+     decoder->mError = PR_TRUE;
+@@ -443,7 +443,8 @@ PNGGetColorProfile(png_structp png_ptr, 
+   // First try to see if iCCP chunk is present
+   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) {
+     png_uint_32 profileLen;
+-    char *profileData, *profileName;
++    unsigned char *profileData;
++    char *profileName;
+     int compression;
+ 
+     png_get_iCCP(png_ptr, info_ptr, &profileName, &compression,
+@@ -551,7 +552,7 @@ info_callback(png_structp png_ptr, png_i
+   /* limit image dimensions (bug #251381) */
+ #define MOZ_PNG_MAX_DIMENSION 1000000L
+   if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION)
+-    longjmp(decoder->mPNG->jmpbuf, 1);
++    longjmp(png_jmpbuf(decoder->mPNG), 1);
+ #undef MOZ_PNG_MAX_DIMENSION
+ 
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+@@ -667,7 +668,7 @@ info_callback(png_structp png_ptr, png_i
+     // the image hasn't been inited yet
+     decoder->mImage->Init(width, height, decoder->mObserver);
+   } else if (containerWidth != PRInt32(width) || containerHeight != PRInt32(height)) {
+-    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_UNEXPECTED
++    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_UNEXPECTED
+   }
+ 
+   if (decoder->mObserver)
+@@ -693,14 +694,14 @@ info_callback(png_structp png_ptr, png_i
+     decoder->mCMSLine =
+       (PRUint8 *)nsMemory::Alloc(bpp[channels] * width);
+     if (!decoder->mCMSLine)
+-      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++      longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+   }
+ 
+   if (interlace_type == PNG_INTERLACE_ADAM7) {
+     if (height < PR_INT32_MAX / (width * channels))
+       decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels * width * height);
+     if (!decoder->interlacebuf) {
+-      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++      longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+     }
+   }
+   
+@@ -920,7 +921,7 @@ void
+ error_callback(png_structp png_ptr, png_const_charp error_msg)
+ {
+   PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+-  longjmp(png_ptr->jmpbuf, 1);
++  longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 

Copied: branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp (from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp)
@@ -0,0 +1,11 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
+@@ -135,7 +135,7 @@ NS_IMETHODIMP nsPNGEncoder::StartImageEn
+ 
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)

Copied: branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile (from r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile)
@@ -0,0 +1,11 @@
+--- security/nss/lib/Makefile~
++++ security/nss/lib/Makefile
+@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib  # Add the zlib direc
+ endif
+ 
+ ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
++ifndef MOZ_NATIVE_SQLITE
+ SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
+ endif
+ endif

Modified: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk
==============================================================================
--- trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk	Sun Jun 17 14:42:13 2012	(r765)
+++ branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk	Mon Jun 18 13:59:30 2012	(r771)
@@ -1,18 +1,46 @@
---- security/coreconf/FreeBSD.mk.orig	2010-06-26 07:29:06.000000000 +0200
-+++ security/coreconf/FreeBSD.mk	2010-07-18 13:25:06.000000000 +0200
-@@ -49,9 +49,6 @@
+--- security/coreconf/FreeBSD.mk.orig	2010-03-16 09:57:06.000000000 +0000
++++ security/coreconf/FreeBSD.mk	2010-03-20 17:40:12.000000000 +0000
+@@ -49,8 +49,24 @@
  ifeq ($(CPU_ARCH),pc98)
  CPU_ARCH		= x86
  endif
 -ifeq ($(CPU_ARCH),amd64)
 -CPU_ARCH		= x86_64
--endif
++ifeq ($(OS_TEST),alpha)
++CPU_ARCH		= alpha
++endif
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH		= amd64
++endif
++ifeq ($(OS_TEST),ia64) 
++CPU_ARCH		= ia64
++endif
++ifeq ($(OS_TEST),powerpc64)
++CPU_ARCH		= powerpc
++USE_64			= 1
++endif
++ifeq ($(OS_TEST),powerpc)
++CPU_ARCH		= powerpc
++endif
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH		= sparc64
+ endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+@@ -78,7 +90,7 @@
+ DLL_SUFFIX		= so.1.0
+ endif
  
-@@ -87,4 +84,4 @@
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -87,4 +99,6 @@
  
  G++INCLUDES		= -I/usr/include/g++
  
 -INCLUDES		+= -I/usr/X11R6/include
-+#INCLUDES		+= -I/usr/X11R6/include
++USE_SYSTEM_ZLIB		= 1
++ZLIB_LIBS		= -lz
++INCLUDES		+= -I$(LOCALBASE)/include

Copied: branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp (from r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp)
@@ -0,0 +1,11 @@
+--- toolkit/xre/nsAppRunner.cpp~
++++ toolkit/xre/nsAppRunner.cpp
+@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n
+     QApplication app(gArgc, gArgv);
+ #endif
+ #if defined(MOZ_WIDGET_GTK2)
+-#ifdef MOZ_MEMORY
++#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
+     // Disable the slice allocator, since jemalloc already uses similar layout
+     // algorithms, and using a sub-allocator tends to increase fragmentation.
+     // This must be done before g_thread_init() is called.

Modified: branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp
==============================================================================
--- trunk/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp	Sun Jun 17 14:42:13 2012	(r765)
+++ branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp	Mon Jun 18 13:59:30 2012	(r771)
@@ -9,3 +9,11 @@
  #include <dlfcn.h>
  #endif
  
+@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
+ 
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+ 
++#define _GNU_SOURCE
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+ #include <unwind.h>
+ 

Copied: branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in (from r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in	Mon Jun 18 13:59:30 2012	(r771, copy of r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in)
@@ -0,0 +1,9 @@
+--- xulrunner/installer/libxul-embedding.pc.in~
++++ xulrunner/installer/libxul-embedding.pc.in
+@@ -6,5 +6,5 @@ idldir=%idldir%
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue -ldl
++Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%

More information about the freebsd-gecko mailing list