From 87948edeea257f3a31950f7c3ea215531a15af63 Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Sat, 15 Jun 2013 11:10:34 +0000 Subject: - Remove www/libxul19, is has been vulnerable and unsupported upstream for quite some time. - Switch all remaining consumers to depend on www/libxul - Mark ports that don't work with the new libxul BROKEN - Mark some old ports DEPRECATED with a reasonable timeout Approved by: portmgr (miwi) --- MOVED | 1 + Mk/bsd.gecko.mk | 21 +- audio/tuxguitar/Makefile | 2 +- deskutils/chmsee/Makefile | 7 +- deskutils/google-gadgets/Makefile | 2 +- editors/morla/Makefile | 2 +- java/icedtea-web/Makefile | 2 +- misc/xiphos/Makefile | 8 +- multimedia/gxine/Makefile | 2 +- net/libproxy-mozjs/Makefile | 8 +- science/gchemutils/Makefile | 3 +- www/Makefile | 1 - www/gecko-mediaplayer/Makefile | 2 +- www/gecko-sharp20/Makefile | 2 +- www/helixplugin/Makefile | 10 +- www/libxul19/Makefile | 90 --------- www/libxul19/distinfo | 2 - www/libxul19/files/patch-alsapulse | 122 ----------- www/libxul19/files/patch-bug351181 | 31 --- www/libxul19/files/patch-bug573210 | 223 --------------------- www/libxul19/files/patch-bug579689 | 66 ------ www/libxul19/files/patch-bug623126 | 49 ----- www/libxul19/files/patch-bug653551 | 24 --- www/libxul19/files/patch-bug685258 | 17 -- www/libxul19/files/patch-bug761077 | 110 ---------- www/libxul19/files/patch-bug778078 | 11 - www/libxul19/files/patch-bug781457 | 10 - www/libxul19/files/patch-config_autoconf.mk.in | 21 -- .../files/patch-content-xslt-public-txDouble.h | 11 - .../files/patch-dom-src-threads-nsDOMWorker.h | 11 - .../patch-dom-src-threads-nsDOMWorkerXHRProxy.h | 11 - ...atch-embedding-browser-gtk-src-EmbedPrivate.cpp | 10 - .../files/patch-embedding_base_nsEmbedAPI.cpp | 16 -- ...ensions-spellcheck-hunspell-src-mozHunspell.cpp | 15 -- www/libxul19/files/patch-gfx-ots-src-os2.cc | 11 - .../patch-intl-unicharutil-util-nsUnicharUtils.h | 11 - .../files/patch-js-ctypes-libffi-configure | 12 -- www/libxul19/files/patch-js-src-jslock.cpp | 18 -- ...dia-liboggz-include-oggz-oggz_off_t_generated.h | 11 - .../patch-media-libsydneyaudio-src-Makefile.in | 15 -- ...tch-media-libsydneyaudio-src-sydney_audio_oss.c | 13 -- ...h-modules-libpr0n-encoders-png-nsPNGDecoder.cpp | 74 ------- ...h-modules-libpr0n-encoders-png-nsPNGEncoder.cpp | 11 - .../files/patch-modules-libpref-src-prefapi.cpp | 102 ---------- ...tch-security_manager_ssl_src_nsNSSComponent.cpp | 10 - .../files/patch-toolkit_library_Makefile.in | 11 - .../files/patch-xpcom_base_nsStackWalk.cpp | 11 - ...atch-xulrunner_installer_libxul-embedding.pc.in | 9 - .../files/patch-xulrunner_installer_libxul.pc.in | 9 - www/libxul19/pkg-descr | 7 - www/moonshine/Makefile | 11 +- www/openvrml/Makefile | 2 +- www/xpi-conkeror/Makefile | 2 +- www/xpi-gwt-dev-plugin/Makefile | 7 +- x11-toolkits/swt-devel/Makefile | 3 +- x11-toolkits/swt/Makefile | 5 +- 56 files changed, 59 insertions(+), 1229 deletions(-) delete mode 100644 www/libxul19/Makefile delete mode 100644 www/libxul19/distinfo delete mode 100644 www/libxul19/files/patch-alsapulse delete mode 100644 www/libxul19/files/patch-bug351181 delete mode 100644 www/libxul19/files/patch-bug573210 delete mode 100644 www/libxul19/files/patch-bug579689 delete mode 100644 www/libxul19/files/patch-bug623126 delete mode 100644 www/libxul19/files/patch-bug653551 delete mode 100644 www/libxul19/files/patch-bug685258 delete mode 100644 www/libxul19/files/patch-bug761077 delete mode 100644 www/libxul19/files/patch-bug778078 delete mode 100644 www/libxul19/files/patch-bug781457 delete mode 100644 www/libxul19/files/patch-config_autoconf.mk.in delete mode 100644 www/libxul19/files/patch-content-xslt-public-txDouble.h delete mode 100644 www/libxul19/files/patch-dom-src-threads-nsDOMWorker.h delete mode 100644 www/libxul19/files/patch-dom-src-threads-nsDOMWorkerXHRProxy.h delete mode 100644 www/libxul19/files/patch-embedding-browser-gtk-src-EmbedPrivate.cpp delete mode 100644 www/libxul19/files/patch-embedding_base_nsEmbedAPI.cpp delete mode 100644 www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp delete mode 100644 www/libxul19/files/patch-gfx-ots-src-os2.cc delete mode 100644 www/libxul19/files/patch-intl-unicharutil-util-nsUnicharUtils.h delete mode 100644 www/libxul19/files/patch-js-ctypes-libffi-configure delete mode 100644 www/libxul19/files/patch-js-src-jslock.cpp delete mode 100644 www/libxul19/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h delete mode 100644 www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in delete mode 100644 www/libxul19/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c delete mode 100644 www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp delete mode 100644 www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp delete mode 100644 www/libxul19/files/patch-modules-libpref-src-prefapi.cpp delete mode 100644 www/libxul19/files/patch-security_manager_ssl_src_nsNSSComponent.cpp delete mode 100644 www/libxul19/files/patch-toolkit_library_Makefile.in delete mode 100644 www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp delete mode 100644 www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in delete mode 100644 www/libxul19/files/patch-xulrunner_installer_libxul.pc.in delete mode 100644 www/libxul19/pkg-descr diff --git a/MOVED b/MOVED index 427938a34466..bdbac701891d 100644 --- a/MOVED +++ b/MOVED @@ -4387,3 +4387,4 @@ devel/linuxthreads||2013-06-10|Has expired: Broken for more than 6 month mail/claws-mail-gtkhtml2_viewer|mail/claws-mail-fancy|2013-06-11|Has expired: No longer maintained, please use mail/claws-mail-fancy instead mail/claws-mail-cachesaver||2013-06-11|Has expired: No longer maintained by Claws Mail team deskutils/contacts||2013-06-13|Has expired: upstream project discontinued for years, upstream sources are gone +www/libxul19|www/libxul|2013-06-15|Has bee vulnerable for a long time, unsupported upstream diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 6ab94828089d..339cc34b6ffb 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -14,7 +14,7 @@ # WITH_GECKO= libxul # # The valid backends are: -# libxul libxul19 +# libxul # # See below for more details. # ======================= /USERS ================================ @@ -36,8 +36,8 @@ Gecko_Pre_Include= bsd.gecko.mk # Users should use the following syntax: # -# WITH_GECKO= libxul libxul19 -# Use libxul whenever a port supports it, falling back on libxul19. +# WITH_GECKO= libxul +# Use libxul whenever a port supports it # WITH_GECKO= libxul # Sets your preferred backend. With this example, libxul will always # be chosen, unless the port doesn't support a libxul backend. In that @@ -47,19 +47,17 @@ Gecko_Pre_Include= bsd.gecko.mk # # Ports should use the following: # -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul # The list of gecko backends that the port supports. Unless the user # overrides it with WITH_GECKO, the first gecko listed in USE_GECKO -# will be the default. In the above example, www/libxul will be used -# as a gecko backend unless WITH_GECKO=libxul19 is defined by the -# user. +# will be the default. # # USE_GECKO= libxul19<->libxul # This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure # if ${GECKO}=="libxul19" # # Example: -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul # # post-patch: # @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \ @@ -69,7 +67,7 @@ Gecko_Pre_Include= bsd.gecko.mk # has been chosen. # # Example: -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul # # post-patch: # .if ${GECKO}=="libxul19" @@ -77,10 +75,9 @@ Gecko_Pre_Include= bsd.gecko.mk # ${MOZSRC}/configure # .endif -_GECKO_ALL= libxul libxul19 +_GECKO_ALL= libxul -libxul_PLIST= libxul>=10 -libxul19_PLIST= libxul<2 +libxul_PLIST= libxul>=17 .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile index 5465f4d27dcb..aa9f09658116 100644 --- a/audio/tuxguitar/Makefile +++ b/audio/tuxguitar/Makefile @@ -29,7 +29,7 @@ MAKE_ENV+= PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \ USES= pkgconfig USE_JAVA= yes USE_ANT= yes -USE_GECKO= libxul19 +USE_GECKO= libxul USE_GMAKE= yes USE_LDCONFIG= yes JAVA_VERSION= 1.6+ diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile index 7906306a46e8..d93eb94d56c7 100644 --- a/deskutils/chmsee/Makefile +++ b/deskutils/chmsee/Makefile @@ -10,13 +10,18 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= sylvio@FreeBSD.org COMMENT= A viewer for Microsoft Help "CHM" files +BROKEN= Does not work with newer libxul + +DEPRECATED= Does not work with newer libxul +EXPIRATION_DATE= 2013-09-01 + LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib \ gcrypt:${PORTSDIR}/security/libgcrypt LICENSE= GPLv2 USE_GNOME= gnomehier libglade2 -USE_GECKO= libxul19 +USE_GECKO= libxul USES= cmake gettext CMAKE_ARGS= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE INSTALLS_ICONS= yes diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile index 5545528e6fb1..eb9a4e9be151 100644 --- a/deskutils/google-gadgets/Makefile +++ b/deskutils/google-gadgets/Makefile @@ -65,7 +65,7 @@ LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 .endif .if ${PORT_OPTIONS:MMOZILLA} -USE_GECKO= libxul19 +USE_GECKO= libxul .endif .if ${PORT_OPTIONS:MGTKWEBKIT} && ! ${PORT_OPTIONS:MGTK} diff --git a/editors/morla/Makefile b/editors/morla/Makefile index 415b3b30bb7c..e2f728b41873 100644 --- a/editors/morla/Makefile +++ b/editors/morla/Makefile @@ -45,7 +45,7 @@ post-patch: .include .if ${PORT_OPTIONS:MXULRUNNER} -USE_GECKO= libxul19 +USE_GECKO= libxul CONFIGURE_ARGS+= --with-javascript=xulrunner .else CONFIGURE_ARGS+= --with-javascript=none diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 36a96474c794..e7acc0baac80 100644 --- a/java/icedtea-web/Makefile +++ b/java/icedtea-web/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ARGS+=--disable-docs .endif .if ${PORT_OPTIONS:MPLUGIN} -USE_GECKO= libxul libxul19 +USE_GECKO= libxul USE_GNOME= glib20 USE_WEBPLUGINS= native WEBPLUGINS_DIR= ${PREFIX}/lib diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile index d5890fb269cd..e96416daff6e 100644 --- a/misc/xiphos/Makefile +++ b/misc/xiphos/Makefile @@ -25,9 +25,8 @@ INSTALLS_ICONS= yes USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgsf OPTIONS_SINGLE= BACKEND -OPTIONS_SINGLE_BACKEND= GTKHTML LIBXUL WEBKIT +OPTIONS_SINGLE_BACKEND= GTKHTML WEBKIT GTKHTML_DESC= Use gtkhtml for rendering -LIBXUL_DESC= Use xulrunner for rendering WEBKIT_DESC= Use webkit for rendering (preferred) OPTIONS_DEFAULT= WEBKIT @@ -39,11 +38,6 @@ WAF_CONFIGURE_ARGS= --backend=webkit LIB_DEPENDS= webkitgtk:${PORTSDIR}/www/webkit-gtk2 .endif -.if ${PORT_OPTIONS:MLIBXUL} -WAF_CONFIGURE_ARGS= --backend=xulrunner -USE_GECKO= libxul19 -.endif - .if ${PORT_OPTIONS:MGTKHTML} WAF_CONFIGURE_ARGS= --backend=gtkhtml .endif diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index 10b62aa52137..709422d143ec 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -21,7 +21,7 @@ MOZILLA_PLUGIN_DESC= Mozilla plugin USE_XZ= yes USES= pathfix USE_GNOME= gtk20 -USE_GECKO= libxul19 +USE_GECKO= libxul USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ENV= MKDIR_P="${MKDIR}" diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile index c45127bc7551..8d1d5054bb15 100644 --- a/net/libproxy-mozjs/Makefile +++ b/net/libproxy-mozjs/Makefile @@ -12,12 +12,18 @@ PKGNAMESUFFIX= -mozjs MAINTAINER= gnome@FreeBSD.org COMMENT= Mozilla JavaScript plug-in for libproxy +BROKEN= Does not work with newer libxul + +DEPRECATED= Does not work with newer libxul +EXPIRATION_DATE= 2013-09-01 + + LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy MASTERDIR= ${.CURDIR}/../libproxy DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GECKO= libxul19 +USE_GECKO= libxul LIBPROXY_SLAVE= mozjs diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile index d6ea8189b167..3ce411e5172b 100644 --- a/science/gchemutils/Makefile +++ b/science/gchemutils/Makefile @@ -55,7 +55,8 @@ XUL_DESC= Build browser plugin (requires Xulrunner) .include .if ${PORT_OPTIONS:MXUL} -USE_GECKO= libxul19 +BROKEN= Does not work with newer libxul +USE_GECKO= libxul CONFIGURE_ARGS+=--enable-mozilla-plugin PLIST_SUB+= XUL="" .else diff --git a/www/Makefile b/www/Makefile index b01f39e6440f..140b3c7f798a 100644 --- a/www/Makefile +++ b/www/Makefile @@ -398,7 +398,6 @@ SUBDIR += libmicrohttpd SUBDIR += libwww SUBDIR += libxul - SUBDIR += libxul19 SUBDIR += lifetype SUBDIR += lightsquid SUBDIR += lighttpd diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile index 2d2daaf785ed..a9d9882bb570 100644 --- a/www/gecko-mediaplayer/Makefile +++ b/www/gecko-mediaplayer/Makefile @@ -25,7 +25,7 @@ CACHE_DESC= Enable caching of remote media to local storage GNU_CONFIGURE= yes USES= pkgconfig USE_GNOME= glib20 -USE_GECKO= libxul libxul19 +USE_GECKO= libxul USE_WEBPLUGINS= native WEBPLUGINS_FILES= ${PORTNAME}.so diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile index 9fcba6e3e59e..885e9652e7c9 100644 --- a/www/gecko-sharp20/Makefile +++ b/www/gecko-sharp20/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-2.0-${PORTVERSION} MAINTAINER= mono@FreeBSD.org COMMENT= Mono bindings to embed Mozilla -USE_GECKO= libxul19 +USE_GECKO= libxul USE_GNOME= gtksharp20 LATEST_LINK= gecko-sharp20 GNU_CONFIGURE= yes diff --git a/www/helixplugin/Makefile b/www/helixplugin/Makefile index a8dce0e69245..697bde9e9130 100644 --- a/www/helixplugin/Makefile +++ b/www/helixplugin/Makefile @@ -14,11 +14,17 @@ MASTER_SITES= http://virtual-estates.net/~mi/port-stuff/ MAINTAINER= mi@aldan.algebra.com COMMENT= Browser plugin for Real or Helix Players +BROKEN= Does not work with newer libxul + +DEPRECATED= Does not work with newer libxul +EXPIRATION_DATE= 2013-09-01 + + USE_BZIP2 = yes USE_DOS2UNIX = yes MAKEFILE = ${FILESDIR}/BSDmakefile -USE_GECKO = libxul19 -MAKE_ENV += TOP="${WRKSRC}" GECKO=${GECKO:S/19//} +USE_GECKO = libxul +MAKE_ENV += TOP="${WRKSRC}" GECKO=${GECKO} MAKE_JOBS_UNSAFE = yes USE_WEBPLUGINS= native diff --git a/www/libxul19/Makefile b/www/libxul19/Makefile deleted file mode 100644 index a719643934c1..000000000000 --- a/www/libxul19/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: xulrunner -# Date created: 2006-02-20 -# Whom: Michael Johnson -# -# $FreeBSD$ -# - -PORTNAME= libxul -DISTVERSION= 1.9.2.28 -PORTREVISION= 1 -CATEGORIES?= www devel -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= firefox/releases/3.6.28/source -DISTNAME= firefox-3.6.28.source - -MAINTAINER?= gecko@FreeBSD.org -COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps - -BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ - nss>=3.13.6_1:${PORTSDIR}/security/nss - -WRKSRC= ${WRKDIR}/mozilla-1.9.2 -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 - -LATEST_LINK= libxul19 -USE_AUTOTOOLS= autoconf213:env -WANT_GNOME= yes -WANT_PERL= yes -ALL_TARGET= default -GNU_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_JOBS_SAFE= yes -MAKE_ENV= SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA} -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} -USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA} - -MOZ_OPTIONS?= --enable-application=xulrunner \ - --disable-ipc -MOZ_EXTENSIONS= default,cookie,permissions -USE_GECKO= gecko -MOZILLA_EXEC_NAME=xulrunner -USE_MOZILLA= -event -ffi -vpx -MOZ_CHROME= jar -MOZILLA_PLIST_DIRS= bin include lib share/idl -PLIST_DIRSTRY= share/idl -MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ - mozilla-gtkmozembed mozilla-js mozilla-plugin - -OPTIONS_DEFINE= JAVA -JAVA_DESC?= JAVA xpcom - -.include "${.CURDIR}/../../www/firefox/Makefile.options" - -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO} -OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} - -.include - -.if ${USE_MOZILLA:M-nss} -MOZ_PKGCONFIG_FILES+= mozilla-nss -.endif - -.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 -MOZ_OPTIONS+= --disable-javaxpcom -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \ - ${WRKSRC}/js/src/config/mkdepend/Makefile.in - -pre-configure: - (cd ${WRKSRC} && ${AUTOCONF}) - (cd ${WRKSRC}/js/src/ && ${AUTOCONF}) - -post-build: - @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \ - s|%sdkdir%|%sdkdir%/sdk|g ; \ - s|%%MOZ_LIBDIR%%|${PREFIX}/lib/${MOZILLA}|g" \ - ${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE} - -.include diff --git a/www/libxul19/distinfo b/www/libxul19/distinfo deleted file mode 100644 index 83cfbc26e75c..000000000000 --- a/www/libxul19/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (firefox-3.6.28.source.tar.bz2) = a6c4bc52095194428cf3b17341b68ac473b7654984000c45d1be3eae55d78260 -SIZE (firefox-3.6.28.source.tar.bz2) = 51698958 diff --git a/www/libxul19/files/patch-alsapulse b/www/libxul19/files/patch-alsapulse deleted file mode 100644 index f3e0ffb31f6d..000000000000 --- a/www/libxul19/files/patch-alsapulse +++ /dev/null @@ -1,122 +0,0 @@ ---- 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/libxul19/files/patch-bug351181 b/www/libxul19/files/patch-bug351181 deleted file mode 100644 index c997f4c6b8ba..000000000000 --- a/www/libxul19/files/patch-bug351181 +++ /dev/null @@ -1,31 +0,0 @@ ---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#if defined(__FreeBSD__) -+#include -+#endif - #ifdef XP_OS2 - #define _PC_53 PC_53 - #define _MCW_EM MCW_EM -@@ -691,8 +694,18 @@ - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#if __BSD_VISIBLE == 0 -+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined -+#endif -+#include -+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) -+#else -+ - #define FIX_FPU() ((void)0) - -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ -+ - #endif - - JSBool diff --git a/www/libxul19/files/patch-bug573210 b/www/libxul19/files/patch-bug573210 deleted file mode 100644 index 754c3eaf2062..000000000000 --- a/www/libxul19/files/patch-bug573210 +++ /dev/null @@ -1,223 +0,0 @@ -changeset: 46457:2c778979f15a -user: Eli Friedman -date: Wed Jun 30 23:11:43 2010 +0200 -summary: Bug 573210 - Consistently qualify accesses to dependent base classes in xpcom C++ code. r=dbaron - -diff -r 93fabb73299b -r 2c778979f15a xpcom/base/nsAutoRef.h ---- xpcom/base/nsAutoRef.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/base/nsAutoRef.h Wed Jun 30 23:11:43 2010 +0200 -@@ -301,7 +301,7 @@ - } - ThisClass& operator=(RawRef aRefToCopy) - { -- own(aRefToCopy); -+ this->own(aRefToCopy); - SafeAddRef(); - return *this; - } -@@ -323,7 +323,7 @@ - void SafeAddRef() - { - if (this->HaveResource()) -- AddRef(this->get()); -+ this->AddRef(this->get()); - } - }; - -@@ -690,7 +690,7 @@ - void SafeRelease() - { - if (this->HaveResource()) -- Release(this->get()); -+ this->Release(this->get()); - } - }; - -diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsBaseHashtable.h ---- xpcom/glue/nsBaseHashtable.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/glue/nsBaseHashtable.h Wed Jun 30 23:11:43 2010 +0200 -@@ -123,7 +123,7 @@ - */ - PRBool Get(KeyType aKey, UserDataType* pData NS_OUTPARAM) const - { -- EntryType* ent = GetEntry(aKey); -+ EntryType* ent = this->GetEntry(aKey); - - if (!ent) - return PR_FALSE; -@@ -160,7 +160,7 @@ - */ - PRBool Put(KeyType aKey, UserDataType aData) - { -- EntryType* ent = PutEntry(aKey); -+ EntryType* ent = this->PutEntry(aKey); - - if (!ent) - return PR_FALSE; -@@ -174,7 +174,7 @@ - * remove the data for the associated key - * @param aKey the key to remove from the hashtable - */ -- void Remove(KeyType aKey) { RemoveEntry(aKey); } -+ void Remove(KeyType aKey) { this->RemoveEntry(aKey); } - - /** - * function type provided by the application for enumeration. -diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsClassHashtable.h ---- xpcom/glue/nsClassHashtable.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/glue/nsClassHashtable.h Wed Jun 30 23:11:43 2010 +0200 -@@ -57,6 +57,7 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef T* UserDataType; -+ typedef nsBaseHashtable< KeyClass, nsAutoPtr, T* > base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -80,6 +81,7 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef T* UserDataType; -+ typedef nsBaseHashtableMT< KeyClass, nsAutoPtr, T* > base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -97,8 +99,7 @@ - PRBool - nsClassHashtable::Get(KeyType aKey, T** retVal) const - { -- typename nsBaseHashtable,T*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -@@ -125,8 +126,7 @@ - { - PR_Lock(this->mLock); - -- typename nsBaseHashtableMT,T*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsInterfaceHashtable.h ---- xpcom/glue/nsInterfaceHashtable.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/glue/nsInterfaceHashtable.h Wed Jun 30 23:11:43 2010 +0200 -@@ -57,6 +57,8 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef Interface* UserDataType; -+ typedef nsBaseHashtable< KeyClass, nsCOMPtr , Interface* > -+ base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -87,6 +89,8 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef Interface* UserDataType; -+ typedef nsBaseHashtableMT< KeyClass, nsCOMPtr , Interface* > -+ base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -110,8 +114,7 @@ - nsInterfaceHashtable::Get - (KeyType aKey, UserDataType* pInterface) const - { -- typename nsBaseHashtable, Interface*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -@@ -138,8 +141,7 @@ - nsInterfaceHashtable::GetWeak - (KeyType aKey, PRBool* aFound) const - { -- typename nsBaseHashtable, Interface*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -@@ -166,8 +168,7 @@ - { - PR_Lock(this->mLock); - -- typename nsBaseHashtableMT, Interface*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsRefPtrHashtable.h ---- xpcom/glue/nsRefPtrHashtable.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/glue/nsRefPtrHashtable.h Wed Jun 30 23:11:43 2010 +0200 -@@ -58,6 +58,7 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef RefPtr* UserDataType; -+ typedef nsBaseHashtable< KeyClass, nsRefPtr , RefPtr* > base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -88,6 +89,7 @@ - public: - typedef typename KeyClass::KeyType KeyType; - typedef RefPtr* UserDataType; -+ typedef nsBaseHashtableMT< KeyClass, nsRefPtr , RefPtr* > base_type; - - /** - * @copydoc nsBaseHashtable::Get -@@ -111,8 +113,7 @@ - nsRefPtrHashtable::Get - (KeyType aKey, UserDataType* pRefPtr) const - { -- typename nsBaseHashtable, RefPtr*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -@@ -139,8 +140,7 @@ - nsRefPtrHashtable::GetWeak - (KeyType aKey, PRBool* aFound) const - { -- typename nsBaseHashtable, RefPtr*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -@@ -167,8 +167,7 @@ - { - PR_Lock(this->mLock); - -- typename nsBaseHashtableMT, RefPtr*>::EntryType* ent = -- GetEntry(aKey); -+ typename base_type::EntryType* ent = this->GetEntry(aKey); - - if (ent) - { -diff -r 93fabb73299b -r 2c778979f15a xpcom/glue/nsTPtrArray.h ---- xpcom/glue/nsTPtrArray.h Wed Jun 30 23:11:41 2010 +0200 -+++ xpcom/glue/nsTPtrArray.h Wed Jun 30 23:11:43 2010 +0200 -@@ -64,13 +64,13 @@ - - // Initialize this array and pre-allocate some number of elements. - explicit nsTPtrArray(size_type capacity) { -- SetCapacity(capacity); -+ this->SetCapacity(capacity); - } - - // The array's copy-constructor performs a 'deep' copy of the given array. - // @param other The array object to copy. - nsTPtrArray(const self_type& other) { -- AppendElements(other); -+ this->AppendElements(other); - } - - // diff --git a/www/libxul19/files/patch-bug579689 b/www/libxul19/files/patch-bug579689 deleted file mode 100644 index 1e8ce2b06557..000000000000 --- a/www/libxul19/files/patch-bug579689 +++ /dev/null @@ -1,66 +0,0 @@ -changeset: 47875:d9d236a8d274 -user: Eli Friedman -date: Sun Jul 18 11:19:48 2010 +0200 -summary: Bug 579689 - Fix cases of return without expression in a function returning "int". r=khuey - -diff -r d9555a5522cf -r d9d236a8d274 build/autoconf/moznbytetype.m4 ---- build/autoconf/moznbytetype.m4 Sun Jul 18 11:17:14 2010 +0200 -+++ build/autoconf/moznbytetype.m4 Sun Jul 18 11:19:48 2010 +0200 -@@ -60,7 +60,7 @@ - AC_TRY_COMPILE([], - [ - int a[sizeof ($type) == $2 ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_n_byte_type_$1=$type; break], []) - done -@@ -91,7 +91,7 @@ - AC_TRY_COMPILE([], - [ - int a[sizeof ($2) == $size ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_size_of_$1=$size; break], []) - done -@@ -124,7 +124,7 @@ - ], - [ - int a[offsetof(struct aligner, a) == $align ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_align_of_$1=$align; break], []) - done -diff -r d9555a5522cf -r d9d236a8d274 js/src/build/autoconf/moznbytetype.m4 ---- js/src/build/autoconf/moznbytetype.m4 Sun Jul 18 11:17:14 2010 +0200 -+++ js/src/build/autoconf/moznbytetype.m4 Sun Jul 18 11:19:48 2010 +0200 -@@ -60,7 +60,7 @@ - AC_TRY_COMPILE([], - [ - int a[sizeof ($type) == $2 ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_n_byte_type_$1=$type; break], []) - done -@@ -91,7 +91,7 @@ - AC_TRY_COMPILE([], - [ - int a[sizeof ($2) == $size ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_size_of_$1=$size; break], []) - done -@@ -124,7 +124,7 @@ - ], - [ - int a[offsetof(struct aligner, a) == $align ? 1 : -1]; -- return; -+ return 0; - ], - [moz_cv_align_of_$1=$align; break], []) - done - diff --git a/www/libxul19/files/patch-bug623126 b/www/libxul19/files/patch-bug623126 deleted file mode 100644 index 3e61c8997636..000000000000 --- a/www/libxul19/files/patch-bug623126 +++ /dev/null @@ -1,49 +0,0 @@ -changeset: 63904:ca41c5663999 -user: Rafael ?vila de Esp?ndola -date: Thu Mar 24 19:26:55 2011 -0400 -summary: Bug 623126 - Add constructor for nsDebugImpl, nsTraceRefcntImpl, EmptyEnumeratorImpl, and nsSimpleUnicharStreamFactory to placate CLang; r=bsmedberg - -diff -r 92b43aa07b7d -r ca41c5663999 xpcom/base/nsDebugImpl.h ---- xpcom/base/nsDebugImpl.h Thu Mar 24 16:45:07 2011 -0400 -+++ xpcom/base/nsDebugImpl.h Thu Mar 24 19:26:55 2011 -0400 -@@ -40,6 +40,7 @@ - class nsDebugImpl : public nsIDebug2 - { - public: -+ nsDebugImpl() {} - NS_DECL_ISUPPORTS - NS_DECL_NSIDEBUG - NS_DECL_NSIDEBUG2 -diff -r 92b43aa07b7d -r ca41c5663999 xpcom/base/nsTraceRefcntImpl.h ---- xpcom/base/nsTraceRefcntImpl.h Thu Mar 24 16:45:07 2011 -0400 -+++ xpcom/base/nsTraceRefcntImpl.h Thu Mar 24 19:26:55 2011 -0400 -@@ -44,6 +44,7 @@ - class nsTraceRefcntImpl : public nsITraceRefcnt - { - public: -+ nsTraceRefcntImpl() {} - NS_DECL_ISUPPORTS - NS_DECL_NSITRACEREFCNT - -diff -r 92b43aa07b7d -r ca41c5663999 xpcom/glue/nsEnumeratorUtils.cpp ---- xpcom/glue/nsEnumeratorUtils.cpp Thu Mar 24 16:45:07 2011 -0400 -+++ xpcom/glue/nsEnumeratorUtils.cpp Thu Mar 24 19:26:55 2011 -0400 -@@ -52,6 +52,7 @@ - public nsIStringEnumerator - { - public: -+ EmptyEnumeratorImpl() {} - // nsISupports interface - NS_DECL_ISUPPORTS_INHERITED // not really inherited, but no mRefCnt - -diff -r 92b43aa07b7d -r ca41c5663999 xpcom/io/nsUnicharInputStream.h ---- xpcom/io/nsUnicharInputStream.h Thu Mar 24 16:45:07 2011 -0400 -+++ xpcom/io/nsUnicharInputStream.h Thu Mar 24 19:26:55 2011 -0400 -@@ -51,6 +51,7 @@ - private nsISimpleUnicharStreamFactory - { - public: -+ nsSimpleUnicharStreamFactory() {} - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIFACTORY - NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY diff --git a/www/libxul19/files/patch-bug653551 b/www/libxul19/files/patch-bug653551 deleted file mode 100644 index 733da79a9fd8..000000000000 --- a/www/libxul19/files/patch-bug653551 +++ /dev/null @@ -1,24 +0,0 @@ -commit 47ea30f -Author: Landry Breuil -Date: Thu Feb 2 15:31:56 2012 +0900 - - Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha ---- - js/src/configure.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git js/src/configure.in js/src/configure.in -index 84390cf..d663c46 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -2471,8 +2471,10 @@ arm*-*) - NANOJIT_ARCH=ARM - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - ENABLE_JIT=1 - NANOJIT_ARCH=Sparc -+ fi - ;; - esac - diff --git a/www/libxul19/files/patch-bug685258 b/www/libxul19/files/patch-bug685258 deleted file mode 100644 index 598a6ea5f3d5..000000000000 --- a/www/libxul19/files/patch-bug685258 +++ /dev/null @@ -1,17 +0,0 @@ -# HG changeset patch -# User Oleg Romashin -# 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(&mAudioHandle), -- NULL, -+ "Mozilla", - SA_MODE_WRONLY, - SA_PCM_FORMAT_S16_NE, - aRate, diff --git a/www/libxul19/files/patch-bug761077 b/www/libxul19/files/patch-bug761077 deleted file mode 100644 index fb12c5b15021..000000000000 --- a/www/libxul19/files/patch-bug761077 +++ /dev/null @@ -1,110 +0,0 @@ -diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl -index b8a87a5..918c4cf 100644 ---- xpcom/reflect/xptcall/public/genstubs.pl -+++ xpcom/reflect/xptcall/public/genstubs.pl -@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n"; - print OUTFILE "* 1 is AddRef\n"; - print OUTFILE "* 2 is Release\n"; - print OUTFILE "*/\n"; --print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n"; -+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n"; - for($i = 0; $i < $entry_count; $i++) { - print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n"; - } -diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc -index eb66761..807db26 100644 ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); -diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in -index ae6ed66..2783957 100644 ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -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 - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -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 --endif --# - # BeOS/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - 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 -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+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 - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ endif - # - # OpenBSD/SPARC64 - # --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 xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h -index d903ced..e4ec832 100644 ---- xpcom/reflect/xptcall/src/xptcprivate.h -+++ xpcom/reflect/xptcall/src/xptcprivate.h -@@ -14,7 +14,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -31,7 +31,7 @@ public: - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__)) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/libxul19/files/patch-bug778078 b/www/libxul19/files/patch-bug778078 deleted file mode 100644 index c3d42c391a98..000000000000 --- a/www/libxul19/files/patch-bug778078 +++ /dev/null @@ -1,11 +0,0 @@ ---- 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__) || defined(__NetBSD__) - // 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/libxul19/files/patch-bug781457 b/www/libxul19/files/patch-bug781457 deleted file mode 100644 index 8a790ccf84a9..000000000000 --- a/www/libxul19/files/patch-bug781457 +++ /dev/null @@ -1,10 +0,0 @@ ---- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200 -+++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200 -@@ -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 - diff --git a/www/libxul19/files/patch-config_autoconf.mk.in b/www/libxul19/files/patch-config_autoconf.mk.in deleted file mode 100644 index b39d9bacf0d7..000000000000 --- a/www/libxul19/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400 -+++ config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400 -@@ -58,14 +58,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ diff --git a/www/libxul19/files/patch-content-xslt-public-txDouble.h b/www/libxul19/files/patch-content-xslt-public-txDouble.h deleted file mode 100644 index cd4acfc534bf..000000000000 --- a/www/libxul19/files/patch-content-xslt-public-txDouble.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200 -+++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200 -@@ -43,7 +43,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include --#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; diff --git a/www/libxul19/files/patch-dom-src-threads-nsDOMWorker.h b/www/libxul19/files/patch-dom-src-threads-nsDOMWorker.h deleted file mode 100644 index dcb741066eaf..000000000000 --- a/www/libxul19/files/patch-dom-src-threads-nsDOMWorker.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dom/src/threads/nsDOMWorker.h.orig 2012-03-06 15:45:25.000000000 +0100 -+++ dom/src/threads/nsDOMWorker.h 2012-10-28 01:42:16.000000000 +0200 -@@ -74,7 +74,7 @@ class nsDOMWorkerScope : public nsDOMWor - { - friend class nsDOMWorker; - -- typedef nsresult (NS_STDCALL nsDOMWorkerScope::*SetListenerFunc) -+ typedef nsresult (NS_DEFCALL nsDOMWorkerScope::*SetListenerFunc) - (nsIDOMEventListener*); - - public: diff --git a/www/libxul19/files/patch-dom-src-threads-nsDOMWorkerXHRProxy.h b/www/libxul19/files/patch-dom-src-threads-nsDOMWorkerXHRProxy.h deleted file mode 100644 index b9f0c1d23b96..000000000000 --- a/www/libxul19/files/patch-dom-src-threads-nsDOMWorkerXHRProxy.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dom/src/threads/nsDOMWorkerXHRProxy.h.orig 2012-10-28 01:49:37.000000000 +0200 -+++ dom/src/threads/nsDOMWorkerXHRProxy.h 2012-10-28 01:49:45.000000000 +0200 -@@ -74,7 +74,7 @@ class nsDOMWorkerXHRProxy : public nsIRu - friend class nsDOMWorkerXHR; - friend class nsDOMWorkerXHRUpload; - -- typedef nsresult (NS_STDCALL nsIDOMEventTarget::*EventListenerFunction) -+ typedef nsresult (NS_DEFCALL nsIDOMEventTarget::*EventListenerFunction) - (const nsAString&, nsIDOMEventListener*, PRBool); - - public: diff --git a/www/libxul19/files/patch-embedding-browser-gtk-src-EmbedPrivate.cpp b/www/libxul19/files/patch-embedding-browser-gtk-src-EmbedPrivate.cpp deleted file mode 100644 index 433cc9e4db57..000000000000 --- a/www/libxul19/files/patch-embedding-browser-gtk-src-EmbedPrivate.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- embedding/browser/gtk/src/EmbedPrivate.cpp.orig 2012-03-06 15:45:28.000000000 +0100 -+++ embedding/browser/gtk/src/EmbedPrivate.cpp 2012-10-28 12:09:45.000000000 +0100 -@@ -104,6 +104,7 @@ nsIDirectoryServiceProvider *EmbedPrivat - class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2 - { - public: -+ GTKEmbedDirectoryProvider() {} - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIDIRECTORYSERVICEPROVIDER - NS_DECL_NSIDIRECTORYSERVICEPROVIDER2 diff --git a/www/libxul19/files/patch-embedding_base_nsEmbedAPI.cpp b/www/libxul19/files/patch-embedding_base_nsEmbedAPI.cpp deleted file mode 100644 index 2cc9823fed1c..000000000000 --- a/www/libxul19/files/patch-embedding_base_nsEmbedAPI.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 -+++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 -@@ -53,7 +53,12 @@ static PRBool sRegistryIniti - static PRUint32 sInitCounter = 0; - - #define HACK_AROUND_THREADING_ISSUES --//#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#ifdef __FreeBSD__ -+#include -+#if __FreeBSD_version < 700042 -+#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#endif -+#endif - - #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM - // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp deleted file mode 100644 index ef4484ea6eb9..000000000000 --- a/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ -+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() - } - } - -+ // load system hunspell dictionaries -+ nsIFile* hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, (nsILocalFile**)&hunDir); -+ LoadDictionariesFromDir(hunDir); -+ - nsCOMPtr dictDirs; - rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, - NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); diff --git a/www/libxul19/files/patch-gfx-ots-src-os2.cc b/www/libxul19/files/patch-gfx-ots-src-os2.cc deleted file mode 100644 index 231508b06a6d..000000000000 --- a/www/libxul19/files/patch-gfx-ots-src-os2.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gfx/ots/src/os2.cc.orig 2012-02-01 23:05:19.933087647 +0200 -+++ gfx/ots/src/os2.cc 2012-02-01 23:09:48.507582408 +0200 -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "os2.h" - - #include "head.h" diff --git a/www/libxul19/files/patch-intl-unicharutil-util-nsUnicharUtils.h b/www/libxul19/files/patch-intl-unicharutil-util-nsUnicharUtils.h deleted file mode 100644 index e2ab2c4108d8..000000000000 --- a/www/libxul19/files/patch-intl-unicharutil-util-nsUnicharUtils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- intl/unicharutil/util/nsUnicharUtils.h.orig 2012-10-28 10:53:41.000000000 +0100 -+++ intl/unicharutil/util/nsUnicharUtils.h 2012-10-28 10:54:01.000000000 +0100 -@@ -72,6 +72,8 @@ inline PRBool IsLowerCase(PRUnichar c) { - class nsCaseInsensitiveStringComparator : public nsStringComparator - { - public: -+ nsCaseInsensitiveStringComparator() {} -+ - virtual int operator() (const PRUnichar*, - const PRUnichar*, - PRUint32 aLength) const; diff --git a/www/libxul19/files/patch-js-ctypes-libffi-configure b/www/libxul19/files/patch-js-ctypes-libffi-configure deleted file mode 100644 index 3f6b66e1d628..000000000000 --- a/www/libxul19/files/patch-js-ctypes-libffi-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- js/ctypes/libffi/configure.orig 2010-07-22 23:54:58.000000000 +0200 -+++ js/ctypes/libffi/configure 2010-08-05 07:34:44.000000000 +0200 -@@ -21033,6 +21033,9 @@ - powerpc-*-aix* | rs6000-*-aix*) - TARGET=POWERPC_AIX; TARGETDIR=powerpc - ;; -+ powerpc64-*-freebsd*) -+ TARGET=POWERPC; TARGETDIR=powerpc -+ ;; - powerpc-*-freebsd*) - TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc - ;; diff --git a/www/libxul19/files/patch-js-src-jslock.cpp b/www/libxul19/files/patch-js-src-jslock.cpp deleted file mode 100644 index 7aea14d0ebaf..000000000000 --- a/www/libxul19/files/patch-js-src-jslock.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- js/src/jslock.cpp.orig 2009-10-07 20:15:38.000000000 +0200 -+++ js/src/jslock.cpp 2009-10-07 21:36:14.000000000 +0200 -@@ -160,8 +160,13 @@ - unsigned int res; - - __asm__ __volatile__ ( -- "stbar\n" -- "cas [%1],%2,%3\n" -+ "membar #StoreLoad | #LoadLoad\n" -+# if defined (__sparc64__) -+ "casx [%1],%2,%3\n" -+# else -+ "cas [%1],%2,%3\n" /* 32-bit version */ -+# endif -+ "membar #StoreLoad | #LoadLoad\n" - "cmp %2,%3\n" - "be,a 1f\n" - "mov 1,%0\n" diff --git a/www/libxul19/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h b/www/libxul19/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h deleted file mode 100644 index 60d8988b9f17..000000000000 --- a/www/libxul19/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200 -+++ media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200 -@@ -59,7 +59,7 @@ - - #include - --#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__) - typedef off_t oggz_off_t; - #else - typedef loff_t oggz_off_t; diff --git a/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in b/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in deleted file mode 100644 index 0812d1af8d4d..000000000000 --- a/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ ---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-17 14:21:06.000000000 +0200 -+++ media/libsydneyaudio/src/Makefile.in 2009-08-17 14:21:53.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) - CSRCS = \ - sydney_audio_waveapi.c \ diff --git a/www/libxul19/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c b/www/libxul19/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c deleted file mode 100644 index a7fd5f1ffd09..000000000000 --- a/www/libxul19/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp b/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp deleted file mode 100644 index c3c6dd3a2a57..000000000000 --- a/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp +++ /dev/null @@ -1,74 +0,0 @@ ---- 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/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp deleted file mode 100644 index 9e474153007d..000000000000 --- a/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/libxul19/files/patch-modules-libpref-src-prefapi.cpp b/www/libxul19/files/patch-modules-libpref-src-prefapi.cpp deleted file mode 100644 index 159f0d4340ab..000000000000 --- a/www/libxul19/files/patch-modules-libpref-src-prefapi.cpp +++ /dev/null @@ -1,102 +0,0 @@ - -This bug is due to the fact, applications are restarted before extension -defaults are loaded. - -To reproduce, choose any preference and set the values like: -system default: - pref("prefkey",systemvalue); -extension default: - pref("prefkey", extensiondefault); -user pref: - user_pref("prefkey", systemvalue); - -Next, trigger application behaviour similar to upgrade by removing compreg.dat -from profile and start the application. - -Result: -User sees extensiondefault after upgrade, because the user_pref has been -eliminated ... which is definitly not what the user expects because he explicitly -had *systemvalue* set before the upgrade. - -Evaluation: -The bug happens because restart is performed *before* extension defaults have been -loaded and the prefapi.cpp always eliminate user preference if the user preference -is equal to the actual default (which happens to be extensiondefault normally - so -no reset, but is systemvalue during restart). - -Fix: -1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses -whether a setting can be eliminated or not; it should be sufficient to only eliminate -prefs in hashPrefs. - -2. This patch prevents hashPrefs from eliminating the user pref in case we are in -*startup* ... unfortunately no such state info exists, which lets us guess that -we are in startup for the previously not dealt case: !set_default && -!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref). - -If is the case we explicitly remember that this setting is a user-pref ... -even though it might be temporarily equal to the default pref. - ---- - modules/libpref/src/prefapi.cpp | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -Index: modules/libpref/src/prefapi.cpp -=================================================================== ---- modules/libpref/src/prefapi.cpp -+++ modules/libpref/src/prefapi.cpp -@@ -324,23 +324,20 @@ - if (!pref) - return PL_DHASH_NEXT; - - nsCAutoString prefValue; - - // where we're getting our pref from - PrefValue* sourcePref; - -- if (PREF_HAS_USER_VALUE(pref) && -- pref_ValueChanged(pref->defaultPref, -- pref->userPref, -- (PrefType) PREF_TYPE(pref))) -- sourcePref = &pref->userPref; -- else if (PREF_IS_LOCKED(pref)) -+ if (PREF_IS_LOCKED(pref)) - sourcePref = &pref->defaultPref; -+ else if (PREF_HAS_USER_VALUE(pref)) -+ sourcePref = &pref->userPref; - else - // do not save default prefs that haven't changed - return PL_DHASH_NEXT; - - // strings are in quotes! - if (pref->flags & PREF_STRING) { - prefValue = '\"'; - str_escape(sourcePref->stringVal, prefValue); -@@ -742,16 +739,27 @@ - Otherwise, set the user value only if it has changed */ - if ( !pref_ValueChanged(pref->defaultPref, value, type) ) - { - if (PREF_HAS_USER_VALUE(pref)) - { - pref->flags &= ~PREF_USERSET; - if (!PREF_IS_LOCKED(pref)) - valueChanged = PR_TRUE; -+ } else { -+ // this is tricky: we have !set_default ... -+ // thus we are setting a user pref; however the user -+ // pref set is same as *current default*; this normally -+ // means to un-set ... however since we have -+ // !PREF_HAS_USER_VALUE(pref) this can only be during -+ // startup -+ pref_SetValue(&pref->userPref, value, type); -+ pref->flags |= PREF_USERSET; -+ if (!PREF_IS_LOCKED(pref)) -+ valueChanged = PR_TRUE; - } - } - else if ( !PREF_HAS_USER_VALUE(pref) || - pref_ValueChanged(pref->userPref, value, type) ) - { - pref_SetValue(&pref->userPref, value, type); - pref->flags |= PREF_USERSET; - if (!PREF_IS_LOCKED(pref)) diff --git a/www/libxul19/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/libxul19/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/libxul19/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/libxul19/files/patch-toolkit_library_Makefile.in b/www/libxul19/files/patch-toolkit_library_Makefile.in deleted file mode 100644 index d905acd5bf67..000000000000 --- a/www/libxul19/files/patch-toolkit_library_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . - --EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS) - - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk diff --git a/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp b/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp deleted file mode 100644 index 3485b1509ad1..000000000000 --- a/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/base/nsStackWalk.cpp.orig 2010-01-11 02:11:49.000000000 -0500 -+++ xpcom/base/nsStackWalk.cpp 2010-01-11 02:13:26.000000000 -0500 -@@ -1132,7 +1132,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_LIBDL) || defined(XP_MACOSX) -+#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include - #endif - diff --git a/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in b/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in deleted file mode 100644 index e7ffbd5d1a9d..000000000000 --- a/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/libxul19/files/patch-xulrunner_installer_libxul.pc.in b/www/libxul19/files/patch-xulrunner_installer_libxul.pc.in deleted file mode 100644 index 279e6cd2f614..000000000000 --- a/www/libxul19/files/patch-xulrunner_installer_libxul.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- xulrunner/installer/libxul.pc.in.orig 2010-01-21 04:31:27.000000000 +0100 -+++ xulrunner/installer/libxul.pc.in 2010-06-21 19:39:57.000000000 +0200 -@@ -7,5 +7,5 @@ - Description: The Mozilla Runtime and Embedding Engine - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -+Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue_s -lxul -lxpcom - Cflags: -I${includedir} %WCHAR_CFLAGS% diff --git a/www/libxul19/pkg-descr b/www/libxul19/pkg-descr deleted file mode 100644 index a4c33d7dfb77..000000000000 --- a/www/libxul19/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications -that are as rich as Firefox and Thunderbird. It will provide mechanisms for -installing, upgrading, and uninstalling these applications. XULRunner will -also provide libxul, a solution which allows the embedding of Mozilla -technologies in other projects and products. - -WWW: http://developer.mozilla.org/en/docs/XULRunner diff --git a/www/moonshine/Makefile b/www/moonshine/Makefile index cadc8a202327..a2d1720ba8fd 100644 --- a/www/moonshine/Makefile +++ b/www/moonshine/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: moonshine -# Date created: May 14 2009 -# Whom: Florent Thoumie -# +# Created by: Florent Thoumie # $FreeBSD$ -# PORTNAME= moonshine PORTVERSION= 0.7 @@ -15,11 +11,14 @@ DISTNAME= abock-${PORTNAME}-${GITCOMMIT} MAINTAINER= mono@FreeBSD.org COMMENT= Windows Media playback through Moonlight and Firefox +DEPRECATED= Does not work with newer libxul +EXPIRATION_DATE= 2013-09-01 + BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash GITCOMMIT= 35085a4 USE_GMAKE= yes -USE_GECKO= libxul19 +USE_GECKO= libxul USE_AUTOTOOLS= libtool libtoolize aclocal autoconf autoheader automake LIBTOOLIZE_ARGS= --force --copy --automake AUTOMAKE_ARGS= --gnu --add-missing --force --copy -Wno-portability diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index fbbbfbdc76b1..fe44eb1b83c2 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -36,7 +36,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/ LDFLAGS+= -L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client -pthread USE_GMAKE= yes USE_LDCONFIG= yes -USE_GECKO= libxul19 +USE_GECKO= libxul USE_WEBPLUGINS= native WEBPLUGINS_FILES=openvrml.so diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile index ee953d8bdd29..e5101cde4871 100644 --- a/www/xpi-conkeror/Makefile +++ b/www/xpi-conkeror/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ashish@FreeBSD.org COMMENT= A completely keyboard driven browser based on firefox WRKSRC= ${WRKDIR}/conkeror -USE_GECKO= libxul19 +USE_GECKO= libxul BUILD_ID=echo -n `whoami`@`hostname`_`date +%s` diff --git a/www/xpi-gwt-dev-plugin/Makefile b/www/xpi-gwt-dev-plugin/Makefile index 26f4096556f3..c39e58dfe35e 100644 --- a/www/xpi-gwt-dev-plugin/Makefile +++ b/www/xpi-gwt-dev-plugin/Makefile @@ -15,7 +15,12 @@ DISTNAME= gwt-dev-plugin-${PORTVERSION}-partial MAINTAINER= ports@FreeBSD.org COMMENT= Google Web Toolkit Developer Plugin for Firefox -BUILD_DEPENDS= ${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul19 +BROKEN= Does not build + +DEPRECATED= Requires an ancient version of Firefox to build +EXPIRATION_DATE= 2013-07-15 + +BUILD_DEPENDS= ${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul ONLY_FOR_ARCHS= amd64 i386 diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile index 4ed0910a2be0..7526b0b7c5c0 100644 --- a/x11-toolkits/swt-devel/Makefile +++ b/x11-toolkits/swt-devel/Makefile @@ -60,7 +60,8 @@ MAKE_GNOME= make_gnome .endif .if ${PORT_OPTIONS:MMOZILLA} -USE_GECKO= libxul19 +USE_GECKO= libxul +BROKEN= Does now work with newer libxul PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so MAKE_MOZILLA= make_xulrunner .endif diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile index 9d1c94133d29..5a668ef38a2f 100644 --- a/x11-toolkits/swt/Makefile +++ b/x11-toolkits/swt/Makefile @@ -43,7 +43,7 @@ PLIST_FILES= %%JAVAJARDIR%%/${OUTPUT_JAR} \ NO_WRKSUBDIR= yes OPTIONS_DEFINE= CAIRO GNOMEVFS BROWSER -OPTIONS_DEFAULT= CAIRO GNOMEVFS BROWSER +OPTIONS_DEFAULT= CAIRO GNOMEVFS GNOMEVFS_DESC= Gnome VFS Support BROWSER_DESC= Gecko Browser Support @@ -62,7 +62,8 @@ MAKE_GNOME= make_gnome .endif .if ${PORT_OPTIONS:MBROWSER} -USE_GECKO= libxul19 +USE_GECKO= libxul +BROKEN= Does not build with newer libxul PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so MAKE_MOZILLA= make_xulrunner .endif -- cgit v1.2.3