Update to firefox 18.0 :

- see http://www.mozilla.org/en-US/firefox/18.0/releasenotes/ - fixes MFSA 2013-14 -> 20 - build with clang on i386/amd64 and with gcc 4.6 on powerpc. Required since upstream dropped support for gcc < 4.4. - don't build against systemwide jpeg anymore since it now needs its internal libjpeg-turbo. - add a stub method to sydney_audio_sndio.c in post-patch. Cant add it to the file in cvs directly otherwise it breaks other mozillas - remove patch-ipc_chromium_src_base_atomicops_h, not needed anymore ok sthen@
2013-01-11 22:57:14 +00:00 · 2013-01-11 22:57:14 +00:00 · c7958be068
commit c7958be068
parent 2f2f96f253
11 changed files with 65 additions and 61 deletions
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.219 2012/12/04 21:24:33 landry Exp $
+# $OpenBSD: Makefile,v 1.220 2013/01/11 22:57:14 landry Exp $

 COMMENT =	Mozilla web browser
 BROKEN-sparc64 =	https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -6,13 +6,13 @@ BROKEN-sparc64 =	https://bugzilla.mozilla.org/show_bug.cgi?id=577056
 # Don't forget to bump www/firefox-i18n after updates.
 # Don't forget to update devel/xulrunner/2.0 if patches changes.

-MOZILLA_VERSION =	17.0.1
+MOZILLA_VERSION =	18.0
 MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	firefox
 MOZILLA_CODENAME =	browser

 #MASTER_SITES=	ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
-SO_VERSION =	36.0
+SO_VERSION =	37.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
 MOZILLA_LIBS =	browsercomps mozalloc mozgnome \
@ -31,14 +31,20 @@ MODULES =	www/mozilla devel/gettext lang/python

 MODPY_RUNDEP =	No

+# necessary glue to build with the correct compiler after fx 17
+MODULES +=		gcc4 lang/clang
+MODGCC4_VERSION =	4.6
+MODGCC4_ARCHS =		powerpc
+MODGCC4_LANGS =		c c++
+MODCLANG_ARCHS =	i386 amd64
+MODCLANG_LANGS =	c c++
+
 USE_GROFF =	Yes
 # Regression tests are too hard to adapt to run here
 NO_REGRESS =	Yes

 CONFIGURE_STYLE =	autoconf no-autoheader
-# to remove in 18
-CONFIGURE_ARGS +=	--with-system-jpeg=${LOCALBASE}
-WANTLIB +=	jpeg
+WANTLIB +=	kvm

 CONFIGURE_ARGS +=	--enable-gstreamer
 LIB_DEPENDS +=	multimedia/gstreamer-0.10/plugins-base
@ -53,6 +59,11 @@ RUN_DEPENDS +=	multimedia/gstreamer-0.10/plugins-good

 MOZILLA_AUTOCONF_DIRS +=	js/src

+# add method appeared in 18
+post-patch:
+	echo "UNSUPPORTED(int sa_stream_set_stream_type(sa_stream_t *s,  const sa_stream_type_t stream_type))" \
+		>> ${WRKSRC}/${_MOZDIR}/media/libsydneyaudio/src/sydney_audio_sndio.c
+
 post-install:
 	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/mozilla-firefox.1 \
 		${PREFIX}/man/man1/mozilla-firefox.1
--- a/www/mozilla-firefox/distinfo
+++ b/www/mozilla-firefox/distinfo
@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-17.0.1.source.tar.bz2) = vsaynl0p+gVQ6V5I7BxoQtxWmB40JYDqBIdtD40qblY=
-SIZE (mozilla/firefox-17.0.1.source.tar.bz2) = 90785127
+SHA256 (mozilla/firefox-18.0.source.tar.bz2) = U/Bv9JiCBg6BGwbOtdWeWohRvaI+TMgkJgEN6WdWUBQ=
+SIZE (mozilla/firefox-18.0.source.tar.bz2) = 96948716
--- a/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
+++ b/www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
@ -1,7 +1,7 @@
-$OpenBSD: patch-browser_app_profile_firefox_js,v 1.17 2012/11/24 10:21:50 landry Exp $
--- browser/app/profile/firefox.js.orig	Tue Nov 20 03:45:49 2012
-+++ browser/app/profile/firefox.js	Wed Nov 21 08:27:50 2012
-@@ -586,7 +586,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
+$OpenBSD: patch-browser_app_profile_firefox_js,v 1.18 2013/01/11 22:57:14 landry Exp $
+--- browser/app/profile/firefox.js.orig	Sat Jan  5 00:44:27 2013
+++ browser/app/profile/firefox.js	Sat Jan  5 11:46:48 2013
+@@ -574,7 +574,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
 pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
 
 // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.17 2012/11/24 10:21:50 landry
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 #ifdef XP_MACOSX
-@@ -714,8 +714,8 @@ pref("gecko.handlerService.schemes.ircs.3.uriTemplate"
+@@ -701,8 +701,8 @@ pref("gecko.handlerService.schemes.ircs.3.uriTemplate"
 pref("gecko.handlerService.allowRegisterFromDifferentHost", false);
 
 #ifdef MOZ_SAFE_BROWSING
--- a/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
+++ b/www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
@ -1,16 +1,16 @@
-$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.6 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.7 2013/01/11 22:57:14 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=715658
--- gfx/thebes/gfxPlatform.cpp.orig	Wed Oct 17 16:32:38 2012
-+++ gfx/thebes/gfxPlatform.cpp	Wed Oct 17 21:59:03 2012
-@@ -490,6 +490,7 @@ void SourceBufferDestroy(void *srcBuffer)
-   static_cast<SourceSurface*>(srcBuffer)->Release();
+--- gfx/thebes/gfxPlatform.cpp.orig	Wed Nov 21 17:10:38 2012
+++ gfx/thebes/gfxPlatform.cpp	Mon Nov 26 22:15:19 2012
+@@ -507,6 +507,7 @@ void SourceBufferDestroy(void *srcSurfUD)
+   delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
 }
 
 +#ifdef MOZ_TREE_CAIRO
 void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 {
   gfxImageSurface* origSurf =
-@@ -497,6 +498,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+@@ -514,6 +515,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
 
   origSurf->SetData(&kSourceSurface, NULL, NULL);
 }
@ -18,7 +18,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
 
 RefPtr<SourceSurface>
 gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -594,6 +596,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -626,6 +628,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
 
     }
 
@ -26,11 +26,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
     cairo_surface_t *nullSurf =
 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
     cairo_surface_set_user_data(nullSurf,
-@@ -602,6 +605,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
+@@ -634,6 +637,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
                                 NULL);
     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
     cairo_surface_destroy(nullSurf);
 +    #endif
   }
 
-   srcBuffer->AddRef();
+   SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
--- a/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h
+++ b/www/mozilla-firefox/patches/patch-ipc_chromium_src_base_atomicops_h
@ -1,13 +0,0 @@
-$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.4 2012/05/09 17:16:01 landry Exp $
-../../ipc/chromium/src/base/singleton.h:118: error: invalid conversion from 'base::subtle::AtomicWord*' to 'const volatile base::subtle::Atomic64*'
--- ipc/chromium/src/base/atomicops.h.orig	Wed Dec  7 06:27:43 2011
-+++ ipc/chromium/src/base/atomicops.h	Sat Dec 10 17:33:13 2011
-@@ -40,7 +40,7 @@ namespace subtle {
- #endif
- typedef __w64 int32 Atomic32;
- #ifdef ARCH_CPU_64_BITS
-typedef int64 Atomic64;
-+typedef intptr_t Atomic64;
- #endif
- 
- // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
--- a/www/mozilla-firefox/patches/patch-js_src_configure_in
+++ b/www/mozilla-firefox/patches/patch-js_src_configure_in
@ -1,8 +1,8 @@
-$OpenBSD: patch-js_src_configure_in,v 1.17 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-js_src_configure_in,v 1.18 2013/01/11 22:57:14 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648721
 https://bugzilla.mozilla.org/show_bug.cgi?id=589754
--- js/src/configure.in.orig	Wed Oct 17 16:32:43 2012
-+++ js/src/configure.in	Wed Oct 17 21:59:03 2012
+--- js/src/configure.in.orig	Wed Nov 21 17:10:41 2012
+++ js/src/configure.in	Mon Nov 26 22:15:19 2012
@@ -1912,7 +1912,12 @@ ia64*-hpux*)
     ;;
 
@ -17,7 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
-@@ -2200,6 +2205,10 @@ mips*-*)
+@@ -2203,6 +2208,10 @@ mips*-*)
     ENABLE_METHODJIT_TYPED_ARRAY=1
     AC_DEFINE(JS_CPU_MIPS)
     AC_DEFINE(JS_NUNBOX32)
--- a/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
+++ b/www/mozilla-firefox/patches/patch-storage_src_mozStorageConnection_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.15 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.16 2013/01/11 22:57:14 landry Exp $
 set secure_delete PRAGMA on by default, instead of using internal sqlite copy
 https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig	Wed Oct 17 16:33:06 2012
-+++ storage/src/mozStorageConnection.cpp	Wed Oct 17 21:59:04 2012
-@@ -554,6 +554,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
+--- storage/src/mozStorageConnection.cpp.orig	Wed Nov 21 17:11:26 2012
+++ storage/src/mozStorageConnection.cpp	Mon Nov 26 22:15:20 2012
+@@ -567,6 +567,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
     return convertResultCode(srv);
   }
 
--- a/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.8 2012/10/10 20:56:14 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Tue Aug 28 17:34:45 2012
-+++ toolkit/components/downloads/nsDownloadManager.cpp	Sun Sep  2 00:10:39 2012
-@@ -1165,7 +1165,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsIFil
+$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.9 2013/01/11 22:57:14 landry Exp $
+--- toolkit/components/downloads/nsDownloadManager.cpp.orig	Wed Nov 21 17:11:27 2012
+++ toolkit/components/downloads/nsDownloadManager.cpp	Mon Nov 26 22:15:20 2012
+@@ -1167,7 +1167,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsIFil
     rv = downloadDir->Exists(&exists);
     NS_ENSURE_SUCCESS(rv, rv);
     if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.8 2012/10
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
-@@ -1273,7 +1273,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsIFile *
+@@ -1275,7 +1275,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsIFile *
           (void)customDirectory->Exists(&exists);
 
           if (!exists) {
--- a/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-toolkit_library_Makefile_in,v 1.20 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-toolkit_library_Makefile_in,v 1.21 2013/01/11 22:57:14 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
 https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig	Wed Oct 17 16:33:08 2012
-+++ toolkit/library/Makefile.in	Wed Oct 17 21:59:04 2012
-@@ -461,6 +461,12 @@ OS_LIBS += \
+--- toolkit/library/Makefile.in.orig	Wed Nov 21 17:11:32 2012
+++ toolkit/library/Makefile.in	Mon Nov 26 22:15:20 2012
+@@ -502,6 +502,12 @@ OS_LIBS += \
   $(NULL)
 endif
 
@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
 ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_SYDNEYAUDIO
 OS_LIBS += \
-@@ -473,12 +479,6 @@ OS_LIBS += \
+@@ -514,12 +520,6 @@ OS_LIBS += \
   -framework AppKit \
   -framework Security \
   $(NULL)
--- a/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
+++ b/www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
@ -1,8 +1,14 @@
-$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.15 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.16 2013/01/11 22:57:14 landry Exp $
 install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig	Wed Oct 31 14:59:56 2012
-+++ toolkit/mozapps/installer/packager.mk	Mon Nov  5 18:22:57 2012
-@@ -907,7 +907,7 @@ endif
+--- toolkit/mozapps/installer/packager.mk.orig	Wed Nov 21 17:11:34 2012
+++ toolkit/mozapps/installer/packager.mk	Tue Nov 27 16:38:51 2012
+@@ -890,12 +890,12 @@ ifeq (bundle,$(MOZ_FS_LAYOUT))
+ 	$(error "make install" is not supported on this platform. Use "make package" instead.)
+ endif
+ 	$(NSINSTALL) -D $(DESTDIR)$(installdir)
+-	(cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
+	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(installdir) && tar -xf -)
 	$(NSINSTALL) -D $(DESTDIR)$(bindir)
 	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
 	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
--- a/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
+++ b/www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.16 2012/11/24 10:21:50 landry Exp $
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.17 2013/01/11 22:57:14 landry Exp $
 Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed Oct 17 16:33:09 2012
-+++ toolkit/xre/nsXREDirProvider.cpp	Wed Oct 17 21:59:04 2012
-@@ -1186,11 +1186,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Wed Dec  5 15:20:21 2012
+++ toolkit/xre/nsXREDirProvider.cpp	Wed Dec 19 21:11:39 2012
+@@ -1229,11 +1229,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsIFile
   NS_ENSURE_SUCCESS(rv, rv);
 #elif defined(XP_UNIX)
   static const char *const sysSExtDir =