- update firefox/thunderbird ESR versions to 10.0.6

- update firefox 14.0.1 - update thunderbird to 14.0 - update seamonkey to 2.11 - switch to new options framework - add experimental rendering via cairo-qt (QT4 option) - add audio backend options (ALSA and PulseAudio) - rename SMB option to GNOMEVFS2 - turn on LOGGING by default (like upstream linux builds) - improve about:memory output - unbreak PGO - use system libs [1] - switch to libevent2 [2] - fix conflict with devel/libunwind and base gcc [3] - unbreak clang/libc++ build [4] - unbreak build with base gcc on >= 9.x [5] - use common IPC code with other BSDs[6] - and *miscellaneous improvements* PR: ports/146231 [1], ports/161421 [2] ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3] ports/163454, ports/164905, ports/169231 [4] ports/169389, ports/169479 [5] Obtained from: pkgsrc via bugzilla #753046 [6] In collaboration with: Jan Beich (who did the major part of this work and deserves a special thank you!)
author: flo <flo@FreeBSD.org> 2012-07-27 05:49:58 +0800
committer: flo <flo@FreeBSD.org> 2012-07-27 05:49:58 +0800
commit: 85b904b679203420da0f901ae5b1f3bb29dfb7cd (patch)
tree: 89c0045d73cc71a8a86842d8aa10f24e71cb5f26 /www/libxul
parent: 864283a90c51467eba734e03bd14aeec892b4542 (diff)
download: freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.tar.gz
freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.tar.zst
freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.zip
22 files changed, 372 insertions, 1922 deletions
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 1eb971003dc8..bd5ceb2d22fe 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -17,15 +17,15 @@ MAINTAINER?=	gecko@FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
 WRKSRC=		${WRKDIR}/mozilla-1.9.2
-CONFLICTS=	mozilla-[0-9]*
+CONFLICTS=	mozilla-[0-9]* libxul-[0-9][0-9].*
 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
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -34,60 +34,56 @@ LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 USE_LDCONFIG=	${PREFIX}/lib/${MOZILLA}
 
 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
+MOZ_OPTIONS?=	--disable-ipc
 MOZ_EXTENSIONS=	default,cookie,permissions
-OPTIONS=	# Empty, used for generic gecko OPTIONS
-USE_GECKO_OPTIONS=	java debug logging optimized_cflags
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner
-MOZ_TOOLKIT=	cairo-gtk2
-USE_MOZILLA=	-png -nss -dbm -jpeg
+USE_MOZILLA=	-event -ffi -vpx
+MOZ_CHROME=	jar
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
-		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
+		mozilla-gtkmozembed mozilla-js mozilla-plugin
 
-OPTIONS=	DBUS "Enable D-BUS support" on
+OPTIONS_DEFINE=	JAVA
+JAVA_DESC?=	JAVA xpcom
+
+.include "${.CURDIR}/../../www/firefox/Makefile.options"
+
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
+.if ${USE_MOZILLA:M-nss}
+MOZ_PKGCONFIG_FILES+=	mozilla-nss
 .endif
 
-.if ${ARCH} == powerpc64
+.if ${ARCH} == amd64
+CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
+.elif ${ARCH} == powerpc64
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
 .else
-CONFIGURE_ENV+=	UNAME_m="powerpc64"
+MOZ_EXPORT+=	UNAME_m="powerpc64"
 CFLAGS+=	-mminimal-toc
 .endif
 .endif
 
-.if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
+.if ${PORT_OPTIONS:MJAVA}
+USE_JAVA=	yes
+JAVA_VERSION+=	1.5+
+JAVA_OS+=	native
+MOZ_EXPORT+=	JAVA_HOME="${JAVA_HOME}"
+MOZ_OPTIONS+=	--enable-javaxpcom
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		notify.4:${PORTSDIR}/devel/libnotify
+MOZ_OPTIONS+=	--disable-javaxpcom
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-	    	${WRKSRC}/storage/build/Makefile.in \
-		${WRKSRC}/db/sqlite3/src/Makefile.in
 	${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \
 	    	${WRKSRC}/js/src/config/mkdepend/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|echo aout|echo elf|g ; \
-		s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/js/src/configure
 
 pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
 	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
 
 post-build:
diff --git a/www/libxul/files/patch-alsapulse b/www/libxul/files/patch-alsapulse
new file mode 100644
index 000000000000..f3e0ffb31f6d
--- /dev/null
+++ b/www/libxul/files/patch-alsapulse
@@ -0,0 +1,122 @@
+--- config/autoconf.mk.in~
++++ config/autoconf.mk.in
+@@ -555,6 +555,14 @@ MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CF
+ MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS@
+ MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
+ 
++MOZ_ALSA                = @MOZ_ALSA@
++MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
++MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
++
++MOZ_PULSEAUDIO          = @MOZ_PULSEAUDIO@
++MOZ_PULSEAUDIO_LIBS     = @MOZ_PULSEAUDIO_LIBS@
++MOZ_PULSEAUDIO_CFLAGS   = @MOZ_PULSEAUDIO_CFLAGS@
++
+ GLIB_CFLAGS	= @GLIB_CFLAGS@
+ GLIB_LIBS	= @GLIB_LIBS@
+ GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
+--- configure.in~
++++ configure.in
+@@ -5660,15 +5660,49 @@ dnl ====================================
+ 
+ dnl If using sydneyaudio with Linux, ensure that the alsa library is available
+ if test "$COMPILE_ENVIRONMENT"; then
+-if test -n "$MOZ_SYDNEYAUDIO"; then
++MOZ_ARG_ENABLE_BOOL(alsa,
++[  --enable-alsa          Enable Alsa support],
++MOZ_ALSA=1,
++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
++
++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
+    case "$target_os" in
+ linux*)
+-      AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library]))
++      MOZ_ALSA=1
+       ;;
+    esac
+ fi
++
++if test -n "$MOZ_ALSA"; then
++      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++         [echo "$MOZ_ALSA_PKG_ERRORS"
++          AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
++fi
+ fi
+ 
++AC_SUBST(MOZ_ALSA_CFLAGS)
++AC_SUBST(MOZ_ALSA_LIBS)
++AC_SUBST(MOZ_ALSA)
++
++dnl ========================================================
++dnl = Enable PulseAudio
++dnl ========================================================
++
++MOZ_ARG_ENABLE_BOOL(pulseaudio,
++[  --enable-pulseaudio          Enable PulseAudio support],
++MOZ_PULSEAUDIO=1,
++MOZ_PULSEAUDIO=)
++
++if test -n "$MOZ_PULSEAUDIO"; then
++    PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
++         [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
++          AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
++fi
++
++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
++AC_SUBST(MOZ_PULSEAUDIO_LIBS)
++AC_SUBST(MOZ_PULSEAUDIO)
++
+ dnl ========================================================
+ dnl Splashscreen
+ dnl ========================================================
+--- media/libsydneyaudio/src/Makefile.in~
++++ media/libsydneyaudio/src/Makefile.in
+@@ -45,12 +45,6 @@ MODULE		= sydneyaudio
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
+-ifeq ($(OS_ARCH),Linux)
+-CSRCS		= \
+-		sydney_audio_alsa.c \
+-		$(NULL)
+-endif
+-
+ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ CSRCS		= \
+ 		sydney_audio_waveapi.c \
+@@ -83,6 +83,18 @@ CSRCS         = \
+               $(NULL)
+ endif
+ 
++ifdef MOZ_ALSA
++CSRCS		= \
++		sydney_audio_alsa.c \
++		$(NULL)
++endif
++
++ifdef MOZ_PULSEAUDIO
++CSRCS		= \
++		sydney_audio_pulseaudio.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
+ endif
+--- toolkit/library/libxul-config.mk~
++++ toolkit/library/libxul-config.mk
+@@ -90,6 +90,14 @@ endif
+ LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
+ endif
+ 
++ifdef MOZ_ALSA
++EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
++endif
++
++ifdef MOZ_PULSEAUDIO
++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
++endif
++
+ # dependent libraries
+ ifdef MOZ_IPC
+ STATIC_LIBS += \
diff --git a/www/libxul/files/patch-bug685258 b/www/libxul/files/patch-bug685258
new file mode 100644
index 000000000000..598a6ea5f3d5
--- /dev/null
+++ b/www/libxul/files/patch-bug685258
@@ -0,0 +1,17 @@
+# HG changeset patch
+# User Oleg Romashin <romaxa@gmail.com>
+# Parent a2291c212856ad27622416e83c8311b6a33b52f1
+Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
+
+diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
+--- content/media/nsAudioStream.cpp
++++ content/media/nsAudioStream.cpp
+@@ -83,7 +83,7 @@ void nsAudioStream::Init(PRInt32 aNumCha
+   mChannels = aNumChannels;
+   mFormat = aFormat;
+   if (sa_stream_create_pcm(reinterpret_cast<sa_stream_t**>(&mAudioHandle),
+-                           NULL, 
++                           "Mozilla",
+                            SA_MODE_WRONLY, 
+                            SA_PCM_FORMAT_S16_NE,
+                            aRate,
diff --git a/www/libxul/files/patch-configure.in b/www/libxul/files/patch-configure.in
deleted file mode 100644
index aab5aa4ba2df..000000000000
--- a/www/libxul/files/patch-configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	2009-10-29 23:11:31.000000000 +0100
-+++ configure.in	2009-11-16 19:51:19.000000000 +0100
-@@ -1352,7 +1352,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- 
-@@ -3582,8 +3582,8 @@
-     *)
-     
- AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
--    AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
--        AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
-+    AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"],
-+        AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"])))
- _SAVE_LIBS=$LIBS
- LIBS="$LIBS $_ICONV_LIBS"
- AC_CACHE_CHECK(
diff --git a/www/libxul/files/patch-db_sqlite3_src_Makefile.in b/www/libxul/files/patch-db_sqlite3_src_Makefile.in
deleted file mode 100644
index 71b84da6d4c2..000000000000
--- a/www/libxul/files/patch-db_sqlite3_src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
- 
- include $(DEPTH)/config/autoconf.mk
- 
-+OS_CFLAGS	 = -I../../../dist/include/sqlite3
-+OS_LIBS		 = %%PTHREAD_LIBS%%
- MODULE           = sqlite3
- LIBRARY_NAME     = sqlite3
- FORCE_SHARED_LIB = 1
diff --git a/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in b/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
index e65ee360d347..871f914f1b86 100644
--- a/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
+++ b/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
@@ -5,7 +5,7 @@
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS	+= -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/libxul/files/libsydney_oss b/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
index a68d549b2fef..0812d1af8d4d 100644
--- a/www/libxul/files/libsydney_oss
+++ b/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
@@ -10,6 +10,6 @@
 +		$(NULL)
 +endif
 +
- ifeq ($(OS_ARCH),Linux)
+ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
  CSRCS		= \
- 		sydney_audio_alsa.c \
+ 		sydney_audio_waveapi.c \
diff --git a/www/libxul/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c b/www/libxul/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c
new file mode 100644
index 000000000000..a7fd5f1ffd09
--- /dev/null
+++ b/www/libxul/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c
@@ -0,0 +1,13 @@
+--- media/libsydneyaudio/src/sydney_audio_oss.c~
++++ media/libsydneyaudio/src/sydney_audio_oss.c
+@@ -446,6 +446,10 @@ static void audio_callback(void* data)
+           printf("!");  /* not enough audio data */
+ #endif
+           bytes = bytes-bytes_to_copy;
++          struct timespec ts = {0, 1000000};
++          pthread_mutex_unlock(&s->mutex);
++          nanosleep(&ts, NULL);
++          pthread_mutex_lock(&s->mutex);
+           break;
+         }
+         free(s->bl_head);
diff --git a/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp b/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
new file mode 100644
index 000000000000..c3c6dd3a2a57
--- /dev/null
+++ b/www/libxul/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);
+ }
+ 
+ 
diff --git a/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
new file mode 100644
index 000000000000..9e474153007d
--- /dev/null
+++ b/www/libxul/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)
diff --git a/www/libxul/files/patch-security-nss-lib-Makefile b/www/libxul/files/patch-security-nss-lib-Makefile
new file mode 100644
index 000000000000..51304f730c92
--- /dev/null
+++ b/www/libxul/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
diff --git a/www/libxul/files/patch-security_coreconf_FreeBSD.mk b/www/libxul/files/patch-security_coreconf_FreeBSD.mk
index 2ae0716f1bb1..7aa6a8a0fbe1 100644
--- a/www/libxul/files/patch-security_coreconf_FreeBSD.mk
+++ b/www/libxul/files/patch-security_coreconf_FreeBSD.mk
@@ -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),x86_64)
++CPU_ARCH		= x86_64
++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
diff --git a/www/libxul/files/patch-storage_build_Makefile.in b/www/libxul/files/patch-storage_build_Makefile.in
deleted file mode 100644
index 18202a5a61d8..000000000000
--- a/www/libxul/files/patch-storage_build_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp b/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp
new file mode 100644
index 000000000000..4e9a34873720
--- /dev/null
+++ b/www/libxul/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.
diff --git a/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp b/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
index 3485b1509ad1..76a5dc8b9f7c 100644
--- a/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
+++ b/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
@@ -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>
+ 
diff --git a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
index 124e86202838..21314a4eec66 100644
--- a/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ b/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@@ -1,16 +1,15 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-04-02 16:03:13.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2010-06-06 19:19:44.000000000 +0000
-@@ -73,6 +73,9 @@
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
- 
-@@ -96,7 +99,7 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2011-04-26 23:22:05.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2011-04-26 23:48:09.637442986 +0200
+@@ -85,7 +85,7 @@
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -70,7 +70,7 @@
  endif
  endif
  # IA64 Linux
@@ -19,35 +18,20 @@
  ifneq (,$(findstring ia64,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
  ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -111,8 +114,8 @@
- #
- # FreeBSD/amd64
+@@ -109,12 +109,6 @@ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64
+ CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
  #
+-# FreeBSD/amd64
+-#
 -ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
 -CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
+-endif
+-#
  # BeOS/Intel (uses the same unixish_x86 code)
-@@ -165,9 +168,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
  #
-@@ -322,7 +331,7 @@
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -341,7 +356,7 @@
  #
  # Linux/PPC
  #
@@ -56,32 +40,21 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
-@@ -331,9 +340,9 @@
+@@ -350,7 +365,7 @@
  #
  # Linux/PPC64
  #
 -ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
--CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
--ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
 +ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
-+CPPSRCS        := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
-+ASFILES        := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
  AS             := $(CC) -c -x assembler-with-cpp
- endif
- 
-@@ -400,6 +409,15 @@
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
+@@ -350,7 +350,7 @@
  #
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
-+endif
-+endif
-+#
- # OpenBSD/SPARC
+ # OpenBSD/SPARC64
  #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
++ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
+ ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
+ endif
diff --git a/www/libxul/files/patch-xptcall-alpha b/www/libxul/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/www/libxul/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/www/libxul/files/patch-xptcall-amd64 b/www/libxul/files/patch-xptcall-amd64
deleted file mode 100644
index 908b5fc7401c..000000000000
--- a/www/libxul/files/patch-xptcall-amd64
+++ /dev/null
@@ -1,380 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp.orig	2009-10-02 22:13:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	2009-10-02 22:41:36.000000000 +0200
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp.orig	2009-10-02 22:13:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	2009-10-02 22:39:37.000000000 +0200
-@@ -0,0 +1,200 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->mOuter->CallMethod((PRUint16)methodIndex, info,
-+                                      dispatchParams);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/www/libxul/files/patch-xptcall-powerpc b/www/libxul/files/patch-xptcall-powerpc
deleted file mode 100644
index 6824d8a31260..000000000000
--- a/www/libxul/files/patch-xptcall-powerpc
+++ /dev/null
@@ -1,580 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s.orig	2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s	2009-09-27 10:01:48.000000000 +0200
-@@ -0,0 +1,110 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+#   beard@netscape.com (Patrick Beard)
-+#   waterson@netscape.com (Chris Waterson)
-+#
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+		      
-+        .section ".text"
-+	.align 2
-+	.globl NS_InvokeByIndex_P
-+	.type  NS_InvokeByIndex_P,@function
-+
-+#
-+# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+#                    PRUint32 paramCount, nsXPTCVariant* params)
-+#
-+
-+NS_InvokeByIndex_P:
-+	stwu    sp,-32(sp)			# setup standard stack frame
-+	mflr    r0				# save LR
-+	stw     r3,8(sp)			# r3 <= that
-+	stw     r4,12(sp)			# r4 <= methodIndex
-+	stw     r30,16(sp)
-+	stw     r31,20(sp)
-+
-+	stw     r0,36(sp)			# store LR backchain
-+	mr      r31,sp
-+
-+	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
-+	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
-+	lwz     r9,0(sp)			# r9 = backchain
-+	neg     r0,r0
-+	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
-+	
-+	addi    r3,sp,8				# r3 <= args
-+	mr      r4,r5				# r4 <= paramCount
-+	mr      r5,r6				# r5 <= params
-+	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
-+	mr      r30,r6				# store in r30 for use later...
-+	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
-+
-+	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
-+
-+	lfd     f1,32(r30)			# load FP registers with method parameters
-+	lfd     f2,40(r30)   
-+	lfd     f3,48(r30)  
-+	lfd     f4,56(r30)  
-+	lfd     f5,64(r30)  
-+	lfd     f6,72(r30)  
-+	lfd     f7,80(r30)  
-+	lfd     f8,88(r30)
-+
-+	lwz     r3,8(r31)			# r3 <= that
-+	lwz     r4,12(r31)			# r4 <= methodIndex
-+	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
-+	
-+	slwi    r4,r4,2				# convert to offset ( *= 4 )
-+	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
-+
-+        lwz     r4,4(r30)			# load GP regs with method parameters
-+	lwz     r5,8(r30)   
-+	lwz     r6,12(r30)  
-+	lwz     r7,16(r30)  
-+	lwz     r8,20(r30)  
-+	lwz     r9,24(r30)  
-+	lwz     r10,28(r30)
-+
-+	mtlr    r0				# copy methodpointer to LR    
-+	blrl					# call method
-+	
-+	lwz     r30,16(r31)			# restore r30 & r31
-+	lwz     r31,20(r31)
-+	
-+	lwz     r11,0(sp)			# clean up the stack
-+	lwz     r0,4(r11)
-+	mtlr    r0
-+	mr      sp,r11
-+	blr
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp.orig	2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp	2009-09-27 09:58:59.000000000 +0200
-@@ -0,0 +1,141 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ *   beard@netscape.com (Patrick Beard)
-+ *   waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+// The purpose of NS_InvokeByIndex_P() is to map a platform
-+// indepenpent call to the platform ABI. To do that,
-+// NS_InvokeByIndex_P() has to determine the method to call via vtable
-+// access. The parameters for the method are read from the
-+// nsXPTCVariant* and prepared for th native ABI.  For the Linux/PPC
-+// ABI this means that the first 8 integral and floating point
-+// parameters are passed in registers.
-+
-+#include "xptcprivate.h"
-+
-+// 8 integral parameters are passed in registers
-+#define GPR_COUNT     8
-+
-+// 8 floating point parameters are passed in registers, floats are
-+// promoted to doubles when passed in registers
-+#define FPR_COUNT     8
-+
-+extern "C" PRUint32
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  return PRUint32(((paramCount * 2) + 3) & ~3);
-+}
-+
-+extern "C" void
-+invoke_copy_to_stack(PRUint32* d,
-+                     PRUint32 paramCount,
-+                     nsXPTCVariant* s, 
-+                     PRUint32* gpregs,
-+                     double* fpregs)
-+{
-+    PRUint32 gpr = 1; // skip one GP reg for 'that'
-+    PRUint32 fpr = 0;
-+    PRUint32 tempu32;
-+    PRUint64 tempu64;
-+    
-+    for(uint32 i = 0; i < paramCount; i++, s++) {
-+        if(s->IsPtrData())
-+            tempu32 = (PRUint32) s->ptr;
-+        else {
-+            switch(s->type) {
-+            case nsXPTType::T_FLOAT:                                  break;
-+            case nsXPTType::T_DOUBLE:                                 break;
-+            case nsXPTType::T_I8:     tempu32 = s->val.i8;            break;
-+            case nsXPTType::T_I16:    tempu32 = s->val.i16;           break;
-+            case nsXPTType::T_I32:    tempu32 = s->val.i32;           break;
-+            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
-+            case nsXPTType::T_U8:     tempu32 = s->val.u8;            break;
-+            case nsXPTType::T_U16:    tempu32 = s->val.u16;           break;
-+            case nsXPTType::T_U32:    tempu32 = s->val.u32;           break;
-+            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   tempu32 = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   tempu32 = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  tempu32 = s->val.wc;            break;
-+            default:                  tempu32 = (PRUint32) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (fpr < FPR_COUNT)
-+                fpregs[fpr++]    = s->val.d;
-+            else {
-+                if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-+                *((double*) d) = s->val.d;
-+                d += 2;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (fpr < FPR_COUNT)
-+                fpregs[fpr++]   = s->val.f; // if passed in registers, floats are promoted to doubles
-+            else
-+                *((float*) d++) = s->val.f;
-+        }
-+        else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-+                                     || s->type == nsXPTType::T_U64)) {
-+            if ((gpr + 1) < GPR_COUNT) {
-+                if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+                *((PRUint64*) &gpregs[gpr]) = tempu64;
-+                gpr += 2;
-+            }
-+            else {
-+                if ((PRUint32) d & 4) d++; // longlongs are 8-byte aligned on stack
-+                *((PRUint64*) d)            = tempu64;
-+                d += 2;
-+            }
-+        }
-+        else {
-+            if (gpr < GPR_COUNT)
-+                gpregs[gpr++] = tempu32;
-+            else
-+                *d++          = tempu32;
-+        }
-+        
-+    }
-+}
-+
-+extern "C"
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s.orig	2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s	2009-09-26 22:23:56.000000000 +0200
-@@ -0,0 +1,89 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s): 
-+#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+#   beard@netscape.com (Patrick Beard)
-+#   waterson@netscape.com (Chris Waterson)
-+#
-+
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+
-+        .section ".text"
-+        .align 2
-+	.globl SharedStub
-+	.type  SharedStub,@function
-+
-+SharedStub:
-+        stwu	sp,-112(sp)			# room for 
-+						# linkage (8),
-+						# gprData (32),
-+						# fprData (64), 
-+						# stack alignment(8)
-+        mflr	r0
-+	stw	r0,116(sp)			# save LR backchain
-+
-+	stw	r4,12(sp)			# save GP registers
-+	stw	r5,16(sp)			# (n.b. that we don't save r3
-+	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
-+	stw	r7,24(sp)
-+	stw	r8,28(sp)
-+	stw	r9,32(sp)
-+	stw	r10,36(sp)
-+
-+	stfd	f1,40(sp)			# save FP registers
-+	stfd	f2,48(sp)
-+	stfd	f3,56(sp)
-+	stfd	f4,64(sp)
-+	stfd	f5,72(sp)
-+	stfd	f6,80(sp)
-+	stfd	f7,88(sp)
-+	stfd	f8,96(sp)
-+
-+						# r3 has the 'self' pointer already
-+	
-+	mr      r4,r11				# r4 <= methodIndex selector, passed
-+						# via r11 in the nsXPTCStubBase::StubXX() call
-+	
-+	addi	r5,sp,120			# r5 <= pointer to callers args area,
-+						# beyond r3-r10/f1-f8 mapped range
-+	
-+	addi	r6,sp,8				# r6 <= gprData
-+	addi	r7,sp,40			# r7 <= fprData
-+      
-+	bl	PrepareAndDispatch@local	# Go!
-+    
-+	lwz	r0,116(sp)			# restore LR
-+	mtlr	r0
-+	la	sp,112(sp)			# clean up the stack
-+	blr
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp.orig	2009-09-26 22:23:56.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp	2009-09-26 22:43:57.000000000 +0200
-@@ -0,0 +1,228 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ *   beard@netscape.com (Patrick Beard)
-+ *   waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+// The PPC/SYSV ABI passes the first 8 integral
-+// parameters and the first 8 floating point parameters in registers
-+// (r3-r10 and f1-f8), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area. The stack pointer has to retain 16-byte alignment, longlongs
-+// and doubles are aligned on 8-byte boundaries.
-+
-+#define PARAM_BUFFER_COUNT     16
-+#define GPR_COUNT               8
-+#define FPR_COUNT               8
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gprData[]' contains the arguments passed in integer registers
-+// - 'fprData[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self,
-+                   PRUint32 methodIndex,
-+                   PRUint32* args,
-+                   PRUint32 *gprData,
-+                   double *fprData)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    const nsXPTMethodInfo* info = NULL;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint32* ap = args;
-+    PRUint32 gpr = 1;    // skip one GPR register
-+    PRUint32 fpr = 0;
-+    PRUint32 tempu32;
-+    PRUint64 tempu64;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (fpr < FPR_COUNT)
-+                dp->val.d = fprData[fpr++];
-+            else {
-+                if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
-+                dp->val.d = *(double*) ap;
-+                ap += 2;
-+            }
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (fpr < FPR_COUNT)
-+                dp->val.f = (float) fprData[fpr++]; // in registers floats are passed as doubles
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && (type == nsXPTType::T_I64
-+                                    || type == nsXPTType::T_U64)) {
-+            if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+            if ((gpr + 1) < GPR_COUNT) {
-+                tempu64 = *(PRUint64*) &gprData[gpr];
-+                gpr += 2;
-+            }
-+            else {
-+                if ((PRUint32) ap & 4) ap++; // longlongs are 8-byte aligned on stack
-+                tempu64 = *(PRUint64*) ap;
-+                ap += 2;
-+            }
-+        }
-+        else {
-+            if (gpr < GPR_COUNT)
-+                tempu32 = gprData[gpr++];
-+            else
-+                tempu32 = *ap++;
-+        }
-+
-+        if(param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) tempu32;
-+            continue;
-+        }
-+
-+        switch(type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   tempu32; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  tempu32; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  tempu32; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  tempu64; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  tempu32; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) tempu32; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) tempu32; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) tempu64; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   tempu32; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     tempu32; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  tempu32; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->mOuter->CallMethod((PRUint16)methodIndex,
-+                                      info,
-+                                      dispatchParams);
-+    
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+
-+}
-+
-+// Load r11 with the constant 'n' and branch to SharedStub().
-+
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n)							\
-+__asm__ (								\
-+	".align	2 \n\t"							\
-+	".if	"#n" < 10 \n\t"						\
-+	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 100 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 1000 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
-+									\
-+	".else \n\t"							\
-+	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
-+	".endif \n\t"							\
-+									\
-+	"li	11,"#n" \n\t"						\
-+	"b	SharedStub@local \n"					\
-+);
-+
-+#define SENTINEL_ENTRY(n)                            \
-+nsresult nsXPTCStubBase::Sentinel##n()               \
-+{                                                    \
-+  NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+  return NS_ERROR_NOT_IMPLEMENTED;                   \
-+}
-+
-+#include "xptcstubsdef.inc"
diff --git a/www/libxul/files/patch-xptcall-sparc64 b/www/libxul/files/patch-xptcall-sparc64
deleted file mode 100644
index 8d87d8cbd8d4..000000000000
--- a/www/libxul/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,329 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp.orig	2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	2009-09-30 23:09:48.000000000 +0200
-@@ -0,0 +1,125 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+#include "xptiprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+
-+    if (! dispatchParams)
-+      return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       break;
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->mOuter->CallMethod((PRUint16)methodIndex, info,
-+                                      dispatchParams);
-+ 
-+    if(dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s.orig	2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	2009-09-30 22:48:25.000000000 +0200
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global NS_InvokeByIndex_P
-+        .type   NS_InvokeByIndex_P, #function
-+
-+/*
-+    NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+NS_InvokeByIndex_P:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    NS_InvokeByIndex_P, .-NS_InvokeByIndex_P
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp.orig	2009-09-30 22:48:25.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	2009-09-30 22:48:25.000000000 +0200
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in b/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in
new file mode 100644
index 000000000000..e7ffbd5d1a9d
--- /dev/null
+++ b/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%
diff --git a/www/libxul/files/releng6_pulseaudio b/www/libxul/files/releng6_pulseaudio
deleted file mode 100644
index 2d83f3c1c441..000000000000
--- a/www/libxul/files/releng6_pulseaudio
+++ /dev/null
@@ -1,32 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_pulseaudio.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
---- toolkit/library/Makefile.in.orig	2009-08-11 17:22:45.000000000 +0200
-+++ toolkit/library/Makefile.in	2009-08-11 17:23:22.000000000 +0200
-@@ -231,12 +231,12 @@
- endif
- 
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0  -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
author	flo <flo@FreeBSD.org>	2012-07-27 05:49:58 +0800
committer	flo <flo@FreeBSD.org>	2012-07-27 05:49:58 +0800
commit	85b904b679203420da0f901ae5b1f3bb29dfb7cd (patch)
tree	89c0045d73cc71a8a86842d8aa10f24e71cb5f26 /www/libxul
parent	864283a90c51467eba734e03bd14aeec892b4542 (diff)
download	freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.tar.gz freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.tar.zst freebsd-ports-gnome-85b904b679203420da0f901ae5b1f3bb29dfb7cd.zip