cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to firefox 14.0.1.

Browse Source 
- see http://www.mozilla.org/en-US/firefox/14.0.1/releasenotes/
- enable H.264 video support through gstreamer. Mention that one needs to
  manually install gstreamer-ffmpeg. Not all videos/sites will work.
- backport cset from #776838 & #747257 for various gst fixes.
- backport cset from #750620 to fix ppc (and other exotic archs) build.
- backport cset from #752895 to fix packaging issues.
- remove patch-content_xslt_src_base_txDouble_cpp, useless since mozilla
  switched to mfbt/double-conversion.
- remove nss opening hack in Sync, it works fine without it.
- remove the -rpath hack, not needed since matthew's ld.so fix from 12/06
This commit is contained in:
landry 2012-08-07 08:55:40 +00:00
parent c4cebc1945
commit 4c781ead8a
30 changed files with 269 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.203 2012/08/04 15:01:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.204 2012/08/07 08:55:40 landry Exp $
COMMENT = Mozilla web browser
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -6,13 +6,12 @@ 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 = 13.0.1
REVISION = 0
MOZILLA_VERSION = 14.0.1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
SO_VERSION = 32.0
SO_VERSION = 33.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 \
@ -42,6 +41,14 @@ CONFIGURE_ARGS += --with-system-libevent=/usr/ --disable-gconf
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
WANTLIB += event
CONFIGURE_ARGS += --enable-gstreamer
LIB_DEPENDS += multimedia/gstreamer-0.10/plugins-base
WANTLIB += gmodule-2.0 gstapp-0.10 gstbase-0.10 gstreamer-0.10
WANTLIB += gstvideo-0.10 xml2
RUN_DEPENDS += multimedia/gstreamer-0.10/plugins-good
.if ${MACHINE_ARCH:Msparc64}
CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
.endif
@ -50,7 +57,7 @@ CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
BUILD_DEPENDS += archivers/unzip
# ensure we depend on cairo with tee backend enabled
LIB_DEPENDS = graphics/cairo>=1.10.2p0
LIB_DEPENDS += graphics/cairo>=1.10.2p0
# --with-system-png=${LOCALBASE}
# no system png : apng support not bundled in

7
www/mozilla-firefox/distinfo
View File

@ -1,5 +1,2 @@
MD5 (mozilla/firefox-13.0.1.source.tar.bz2) = gt6ttQHH/A6fprAl9R8FoQ==
RMD160 (mozilla/firefox-13.0.1.source.tar.bz2) = VxoFSQ4xO8f9adsN3WWnF17Tt/k=
SHA1 (mozilla/firefox-13.0.1.source.tar.bz2) = N1LxPyalHdLkLSgFpweoQub40bE=
SHA256 (mozilla/firefox-13.0.1.source.tar.bz2) = wZbQfbJJc1y+YZSeyv4gud8mK4F7RLilldPm2vLQm+M=
SIZE (mozilla/firefox-13.0.1.source.tar.bz2) = 79561773
SHA256 (mozilla/firefox-14.0.1.source.tar.bz2) = whmI8CB7Z4N2w9lvZHqt9taU6Dbwtckz7BXZO3Xqiao=
SIZE (mozilla/firefox-14.0.1.source.tar.bz2) = 82478218

14
www/mozilla-firefox/patches/patch-browser_app_profile_firefox_js
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.14 2012/06/11 15:29:56 landry Exp $
--- browser/app/profile/firefox.js.orig Wed May 2 05:16:33 2012
+++ browser/app/profile/firefox.js Wed May 9 23:06:34 2012
@@ -152,7 +152,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.15 2012/08/07 08:55:40 landry Exp $
--- browser/app/profile/firefox.js.orig Wed Jun 13 01:46:28 2012
+++ browser/app/profile/firefox.js Sun Jun 17 12:04:00 2012
@@ -157,7 +157,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.14 2012/06/11 15:29:56 landry
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
@@ -596,7 +596,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -616,7 +616,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
@ -19,7 +19,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.14 2012/06/11 15:29:56 landry
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -720,10 +720,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -742,10 +742,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.14 2012/06/11 15:29:56 landry
// Non-enhanced mode (local url lists) URL list to check for updates
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
@@ -777,10 +777,8 @@ pref("browser.EULA.version", 3);
@@ -799,10 +799,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

19
www/mozilla-firefox/patches/patch-browser_installer_Makefile_in Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-browser_installer_Makefile_in,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/ede54971747f
--- browser/installer/Makefile.in.orig Sun Jun 17 17:05:01 2012
+++ browser/installer/Makefile.in Sun Jun 17 17:05:53 2012
@@ -78,6 +78,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
DEFINES += -DMOZ_GTK2=1
endif
+ifdef MOZ_NATIVE_NSPR
+DEFINES += -DMOZ_NATIVE_NSPR=1
+endif
+
+ifdef MOZ_NATIVE_NSS
+DEFINES += -DMOZ_NATIVE_NSS=1
+endif
+
ifdef NSS_DISABLE_DBM
DEFINES += -DNSS_DISABLE_DBM=1
endif

42
www/mozilla-firefox/patches/patch-browser_installer_package-manifest_in Normal file
View File

@ -0,0 +1,42 @@
$OpenBSD: patch-browser_installer_package-manifest_in,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/ede54971747f
--- browser/installer/package-manifest.in.orig Sun Jun 17 17:00:56 2012
+++ browser/installer/package-manifest.in Sun Jun 17 17:02:09 2012
@@ -54,9 +54,11 @@
#ifndef MOZ_STATIC_JS
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
#endif
+#ifndef MOZ_NATIVE_NSPR
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+#endif
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
#ifdef XP_MACOSX
@BINPATH@/XUL
@@ -105,7 +107,9 @@
#endif
@BINPATH@/platform.ini
#ifndef XP_OS2
+#ifndef MOZ_NATIVE_SQLITE
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+#endif
#else
@BINPATH@/mozsqlt3@DLL_SUFFIX@
#endif
@@ -560,6 +564,7 @@
; NSS libraries are signed in the staging directory,
; meaning their .chk files are created there directly.
;
+#ifndef MOZ_NATIVE_NSS
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
@@ -570,6 +575,7 @@
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
+#endif
@BINPATH@/chrome/pippki@JAREXT@
@BINPATH@/chrome/pippki.manifest
@BINPATH@/components/pipboot.xpt

8
www/mozilla-firefox/patches/patch-config_autoconf_mk_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.19 2012/06/11 15:29:56 landry Exp $
--- config/autoconf.mk.in.orig Wed May 2 05:16:35 2012
+++ config/autoconf.mk.in Wed May 9 23:06:34 2012
@@ -320,7 +320,7 @@ OS_LDFLAGS = @LDFLAGS@
$OpenBSD: patch-config_autoconf_mk_in,v 1.20 2012/08/07 08:55:40 landry Exp $
--- config/autoconf.mk.in.orig Wed Jun 13 01:46:32 2012
+++ config/autoconf.mk.in Sun Jun 17 12:04:02 2012
@@ -324,7 +324,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@

21
www/mozilla-firefox/patches/patch-config_rules_mk
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-config_rules_mk,v 1.18 2012/06/11 15:29:56 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
https://bugzilla.mozilla.org/show_bug.cgi?id=552864
--- config/rules.mk.orig Wed May 2 05:16:35 2012
+++ config/rules.mk Wed May 9 23:06:34 2012
@@ -588,6 +588,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef IS_COMPONENT
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
+DSO_LDOPTS += -Wl,-rpath,'$(installdir)'
+OS_LDFLAGS += -Wl,-rpath,'$(installdir)'
+endif
+
ifeq ($(OS_ARCH),NetBSD)
ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
ifeq ($(MODULE),layout)

13
www/mozilla-firefox/patches/patch-configure_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-configure_in,v 1.24 2012/08/07 08:55:40 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=776838
--- configure.in.orig Tue Jul 24 11:02:39 2012
+++ configure.in Tue Jul 24 11:02:51 2012
@@ -5825,7 +5825,7 @@ if test "$MOZ_GSTREAMER"; then
gstreamer-plugins-base-$GST_API_VERSION)
if test -n "$GSTREAMER_LIBS"; then
_SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -lgstvideo-$GST_API_VERSION"
+ LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
if test -n "$_HAVE_LIBGSTVIDEO" ; then
GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"

26
www/mozilla-firefox/patches/patch-content_base_src_nsContentUtils_cpp Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-content_base_src_nsContentUtils_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/raw-rev/45118cc6518b
--- content/base/src/nsContentUtils.cpp.orig Fri Jul 13 23:42:48 2012
+++ content/base/src/nsContentUtils.cpp Wed Jul 25 00:02:48 2012
@@ -6324,6 +6324,21 @@ nsContentUtils::FindInternalContentViewer(const char*
}
}
#endif
+
+#ifdef MOZ_GSTREAMER
+ if (nsHTMLMediaElement::IsH264Enabled()) {
+ for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gH264Types); ++i) {
+ const char* type = nsHTMLMediaElement::gH264Types[i];
+ if (!strcmp(aType, type)) {
+ docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1");
+ if (docFactory && aLoaderType) {
+ *aLoaderType = TYPE_CONTENT;
+ }
+ return docFactory.forget();
+ }
+ }
+ }
+#endif
#endif // MOZ_MEDIA
return NULL;

15
www/mozilla-firefox/patches/patch-content_html_content_src_nsHTMLMediaElement_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-content_html_content_src_nsHTMLMediaElement_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/raw-rev/45118cc6518b
--- content/html/content/src/nsHTMLMediaElement.cpp.orig Fri Jul 13 23:42:49 2012
+++ content/html/content/src/nsHTMLMediaElement.cpp Wed Jul 25 00:02:48 2012
@@ -1942,6 +1942,10 @@ bool nsHTMLMediaElement::ShouldHandleMediaType(const c
if (IsWebMType(nsDependentCString(aMIMEType)))
return true;
#endif
+#ifdef MOZ_GSTREAMER
+ if (IsH264Type(nsDependentCString(aMIMEType)))
+ return true;
+#endif
// We should not return true for Wave types, since there are some
// Wave codecs actually in use in the wild that we don't support, and
// we should allow those to be handled by plugins or helper apps.

23
www/mozilla-firefox/patches/patch-content_xslt_src_base_txDouble_cpp
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.5 2012/03/16 21:31:24 landry Exp $
alignment issue on some arch ? been there since ffx3
--- content/xslt/src/base/txDouble.cpp.orig Thu Feb 2 00:38:56 2012
+++ content/xslt/src/base/txDouble.cpp Tue Feb 14 18:44:42 2012
@@ -50,13 +50,13 @@
*/
//-- Initialize Double related constants
-const dpun txDouble::NaN = DOUBLE_NaN;
+const dpun txDouble::NaN __attribute__ ((aligned (8))) = DOUBLE_NaN;
#ifdef IS_BIG_ENDIAN
-const dpun txDouble::POSITIVE_INFINITY = {{DOUBLE_HI32_EXPMASK, 0}};
-const dpun txDouble::NEGATIVE_INFINITY = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
+const dpun txDouble::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK, 0}};
+const dpun txDouble::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT, 0}};
#else
-const dpun txDouble::POSITIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK}};
-const dpun txDouble::NEGATIVE_INFINITY = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
+const dpun txDouble::POSITIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK}};
+const dpun txDouble::NEGATIVE_INFINITY __attribute__ ((aligned (8))) = {{0, DOUBLE_HI32_EXPMASK | DOUBLE_HI32_SIGNBIT}};
#endif
/*

8
www/mozilla-firefox/patches/patch-gfx_thebes_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.9 2012/06/11 15:29:56 landry Exp $
--- gfx/thebes/Makefile.in.orig Wed May 2 05:16:45 2012
+++ gfx/thebes/Makefile.in Wed May 9 23:06:34 2012
@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.10 2012/08/07 08:55:40 landry Exp $
--- gfx/thebes/Makefile.in.orig Wed Jun 13 01:46:41 2012
+++ gfx/thebes/Makefile.in Sun Jun 17 12:04:02 2012
@@ -388,6 +388,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

14
www/mozilla-firefox/patches/patch-gfx_thebes_gfxPlatform_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.3 2012/08/07 08:55:40 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=715658
--- gfx/thebes/gfxPlatform.cpp.orig Wed May 2 05:16:45 2012
+++ gfx/thebes/gfxPlatform.cpp Wed May 9 23:06:34 2012
@@ -458,6 +458,7 @@ void SourceBufferDestroy(void *srcBuffer)
--- gfx/thebes/gfxPlatform.cpp.orig Wed Jun 13 01:46:41 2012
+++ gfx/thebes/gfxPlatform.cpp Sun Jun 17 12:04:02 2012
@@ -459,6 +459,7 @@ void SourceBufferDestroy(void *srcBuffer)
static_cast<SourceSurface*>(srcBuffer)->Release();
}
@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=715658
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
@@ -465,6 +466,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -466,6 +467,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)
@@ -534,6 +536,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -535,6 +537,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
imgSurface->Stride(),
format);
@ -26,7 +26,7 @@ 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,
@@ -542,6 +545,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -543,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);

12
www/mozilla-firefox/patches/patch-js_src_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_src_Makefile_in,v 1.11 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-js_src_Makefile_in,v 1.12 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/Makefile.in.orig Wed May 2 05:16:48 2012
+++ js/src/Makefile.in Wed May 9 23:06:34 2012
@@ -337,20 +337,24 @@ CPPSRCS += checks.cc \
# END enclude sources for V8 dtoa
#############################################
--- js/src/Makefile.in.orig Wed Jun 13 01:46:43 2012
+++ js/src/Makefile.in Sun Jun 17 12:04:02 2012
@@ -320,20 +320,24 @@ endif
endif
-# For architectures without YARR JIT, PCRE is faster than the YARR
-# interpreter (bug 684559).

8
www/mozilla-firefox/patches/patch-js_src_assembler_jit_ExecutableAllocator_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-js_src_assembler_jit_ExecutableAllocator_h,v 1.2 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-js_src_assembler_jit_ExecutableAllocator_h,v 1.3 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/assembler/jit/ExecutableAllocator.h.orig Wed May 2 05:16:48 2012
+++ js/src/assembler/jit/ExecutableAllocator.h Wed May 9 23:06:34 2012
@@ -467,8 +467,6 @@ class ExecutableAllocator { (public)
--- js/src/assembler/jit/ExecutableAllocator.h.orig Wed Jun 13 01:46:43 2012
+++ js/src/assembler/jit/ExecutableAllocator.h Sun Jun 17 12:04:02 2012
@@ -468,8 +468,6 @@ class ExecutableAllocator { (public)
{
sync_instruction_memory((caddr_t)code, size);
}

10
www/mozilla-firefox/patches/patch-js_src_configure_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_src_configure_in,v 1.13 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-js_src_configure_in,v 1.14 2012/08/07 08:55:40 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
https://bugzilla.mozilla.org/show_bug.cgi?id=589754
chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
--- js/src/configure.in.orig Wed May 2 05:16:48 2012
+++ js/src/configure.in Wed May 9 23:06:34 2012
@@ -2583,7 +2583,12 @@ ia64*-hpux*)
--- js/src/configure.in.orig Wed Jun 13 01:46:43 2012
+++ js/src/configure.in Sun Jun 17 12:04:02 2012
@@ -2351,7 +2351,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -18,7 +18,7 @@ chunk 4 : https://bugzilla.mozilla.org/show_bug.cgi?id=714312
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2871,6 +2876,10 @@ mips*-*)
@@ -2639,6 +2644,10 @@ mips*-*)
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)

16
www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-js_src_vm_RegExpObject_cpp,v 1.5 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.cpp.orig Wed May 2 05:16:54 2012
+++ js/src/vm/RegExpObject.cpp Wed May 9 23:17:01 2012
@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLength)
--- js/src/vm/RegExpObject.cpp.orig Wed Jun 13 01:46:48 2012
+++ js/src/vm/RegExpObject.cpp Sun Jun 17 12:04:02 2012
@@ -168,7 +168,6 @@ MatchPairs::checkAgainst(size_t inputLength)
/* detail::RegExpCode */
@ -10,7 +10,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
void
RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
{
@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
@@ -200,46 +199,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
}
}
@ -57,7 +57,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
@@ -256,7 +218,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
* case we have to bytecode compile it.
*/
@ -66,7 +66,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
if (!execAlloc) {
@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
@@ -277,21 +239,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
return false;
}
@ -90,7 +90,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
}
RegExpRunStatus
@@ -305,18 +257,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
@@ -306,18 +258,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else

10
www/mozilla-firefox/patches/patch-js_src_vm_RegExpObject_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.5 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-js_src_vm_RegExpObject_h,v 1.6 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- js/src/vm/RegExpObject.h.orig Wed May 2 05:16:54 2012
+++ js/src/vm/RegExpObject.h Wed May 9 23:24:14 2012
@@ -51,10 +51,8 @@
--- js/src/vm/RegExpObject.h.orig Wed Jun 13 01:46:48 2012
+++ js/src/vm/RegExpObject.h Sun Jun 17 12:04:02 2012
@@ -52,10 +52,8 @@
#include "yarr/Yarr.h"
#if ENABLE_YARR_JIT
#include "yarr/YarrJIT.h"
@ -14,7 +14,7 @@ https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
/*
* JavaScript Regular Expressions
@@ -112,68 +110,51 @@ namespace detail {
@@ -113,68 +111,51 @@ namespace detail {
class RegExpCode
{

17
www/mozilla-firefox/patches/patch-mfbt_double-conversion_utils_h Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-mfbt_double-conversion_utils_h,v 1.1 2012/08/07 08:55:40 landry Exp $
http://hg.mozilla.org/mozilla-central/rev/72e4dea9d2b2
--- mfbt/double-conversion/utils.h.orig Wed Jul 18 09:14:14 2012
+++ mfbt/double-conversion/utils.h Wed Jul 18 09:14:30 2012
@@ -53,7 +53,11 @@
// disabled.)
// On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
#if defined(_M_X64) || defined(__x86_64__) || \
- defined(__ARMEL__) || \
+ defined(__ARMEL__) || defined(__avr32__) || \
+ defined(__hppa__) || defined(__ia64__) || \
+ defined(__mips__) || defined(__powerpc__) || \
+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+ defined(__SH4__) || defined(__alpha__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)

12
www/mozilla-firefox/patches/patch-netwerk_mime_nsMimeTypes_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-netwerk_mime_nsMimeTypes_h,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/a19f0356c09d
--- netwerk/mime/nsMimeTypes.h.orig Fri Jul 13 23:43:11 2012
+++ netwerk/mime/nsMimeTypes.h Wed Jul 25 00:01:44 2012
@@ -159,6 +159,7 @@
#define TEXT_EVENT_STREAM "text/event-stream"
#define VIDEO_MPEG "video/mpeg"
+#define VIDEO_MP4 "video/mp4"
#define VIDEO_RAW "video/x-raw-yuv"
#define VIDEO_OGG "video/ogg"
#define VIDEO_WEBM "video/webm"

18
www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.15 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.16 2012/08/07 08:55:40 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=706955, only needed on ppc ?
xpcshell hang during fake
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Wed May 2 05:17:09 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed May 9 23:06:35 2012
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Jun 13 01:47:04 2012
+++ security/manager/ssl/src/nsNSSComponent.cpp Sun Jun 17 12:04:03 2012
@@ -111,6 +111,7 @@
#include "secerr.h"
#include "sslerr.h"
@ -61,7 +61,7 @@ xpcshell hang during fake
}
else
{
@@ -1881,6 +1884,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
@@ -1907,6 +1910,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
LaunchSmartCardThreads();
@ -70,7 +70,7 @@ xpcshell hang during fake
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
}
@@ -2023,16 +2028,6 @@ nsNSSComponent::Init()
@@ -2049,16 +2054,6 @@ nsNSSComponent::Init()
if (mClientAuthRememberService)
mClientAuthRememberService->Init();
@ -87,7 +87,7 @@ xpcshell hang during fake
InitializeCRLUpdateTimer();
RegisterPSMContentListener();
@@ -2247,6 +2242,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2273,6 +2268,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
DoProfileChangeTeardown(aSubject);
}
else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
@ -95,7 +95,7 @@ xpcshell hang during fake
mShutdownObjectList->allowUI();
}
else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
@@ -2294,6 +2290,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2320,6 +2316,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
InitializeCRLUpdateTimer();
}
else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
@ -103,7 +103,7 @@ xpcshell hang during fake
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
@@ -2584,6 +2581,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
@@ -2610,6 +2607,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
void
nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
{
@ -113,7 +113,7 @@ xpcshell hang during fake
bool callVeto = false;
if (!mShutdownObjectList->ifPossibleDisallowUI()) {
@@ -2637,9 +2637,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
@@ -2663,9 +2663,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
void
nsNSSComponent::DoProfileChangeNetRestore()
{

19
www/mozilla-firefox/patches/patch-services_crypto_modules_WeaveCrypto_js
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.4 2012/06/11 15:29:56 landry Exp $
Fix libnss3 opening
--- services/crypto/modules/WeaveCrypto.js.orig Wed May 2 05:17:12 2012
+++ services/crypto/modules/WeaveCrypto.js Wed May 9 23:06:35 2012
@@ -157,12 +157,12 @@ WeaveCrypto.prototype = {
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
// Open the NSS library.
- let path = ctypes.libraryName("nss3");
+ let path = '${LOCALBASE}/lib/libnss3.so';
// XXX really want to be able to pass specific dlopen flags here.
var nsslib;
try {
- this.log("Trying NSS library without path");
+ this.log("Trying NSS library with path " + path);
nsslib = ctypes.open(path);
} catch(e) {
// In case opening the library without a full path fails,

10
www/mozilla-firefox/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.5 2012/06/11 15:29:56 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig Wed May 2 05:17:13 2012
+++ toolkit/components/downloads/nsDownloadManager.cpp Wed May 9 23:06:35 2012
@@ -1162,7 +1162,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.6 2012/08/07 08:55:40 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig Wed Jun 13 01:47:08 2012
+++ toolkit/components/downloads/nsDownloadManager.cpp Sun Jun 17 12:04:03 2012
@@ -1197,7 +1197,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.5 2012/06
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1270,7 +1270,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1305,7 +1305,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

10
www/mozilla-firefox/patches/patch-toolkit_library_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.16 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.17 2012/08/07 08:55:40 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 May 2 05:17:14 2012
+++ toolkit/library/Makefile.in Wed May 9 23:06:35 2012
@@ -455,6 +455,12 @@ OS_LIBS += \
--- toolkit/library/Makefile.in.orig Wed Jun 13 01:47:09 2012
+++ toolkit/library/Makefile.in Sun Jun 17 12:04:03 2012
@@ -457,6 +457,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 += \
@@ -466,12 +472,6 @@ OS_LIBS += \
@@ -468,12 +474,6 @@ OS_LIBS += \
-framework Foundation \
-framework AppKit \
$(NULL)

8
www/mozilla-firefox/patches/patch-toolkit_mozapps_installer_packager_mk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.12 2012/08/07 08:55:40 landry Exp $
install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012
+++ toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012
@@ -886,7 +886,7 @@ endif
--- toolkit/mozapps/installer/packager.mk.orig Fri Jul 13 23:43:16 2012
+++ toolkit/mozapps/installer/packager.mk Tue Jul 17 18:05:03 2012
@@ -934,7 +934,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

8
www/mozilla-firefox/patches/patch-toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.12 2012/06/11 15:29:56 landry Exp $
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.13 2012/08/07 08:55:40 landry Exp $
Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig Wed May 2 05:17:15 2012
+++ toolkit/xre/nsXREDirProvider.cpp Wed May 9 23:06:35 2012
@@ -1168,11 +1168,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
--- toolkit/xre/nsXREDirProvider.cpp.orig Wed Jun 13 01:47:14 2012
+++ toolkit/xre/nsXREDirProvider.cpp Sun Jun 17 12:04:03 2012
@@ -1171,11 +1171,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

22
www/mozilla-firefox/patches/patch-uriloader_exthandler_nsExternalHelperAppService_cpp Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-uriloader_exthandler_nsExternalHelperAppService_cpp,v 1.1 2012/08/07 08:55:40 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/a19f0356c09d
--- uriloader/exthandler/nsExternalHelperAppService.cpp.orig Fri Jul 13 23:43:17 2012
+++ uriloader/exthandler/nsExternalHelperAppService.cpp Wed Jul 25 00:02:32 2012
@@ -437,6 +437,9 @@ static nsDefaultMimeTypeEntry defaultMimeEntries [] =
{ VIDEO_WEBM, "webm" },
{ AUDIO_WEBM, "webm" },
#endif
+#ifdef MOZ_GSTREAMER
+ { VIDEO_MP4, "mp4" },
+#endif
#ifdef MOZ_RAW
{ VIDEO_RAW, "yuv" }
#endif
@@ -507,6 +510,7 @@ static nsExtraMimeTypeEntry extraMimeEntries [] =
{ AUDIO_OGG, "oga", "Ogg Audio" },
{ VIDEO_WEBM, "webm", "Web Media Video" },
{ AUDIO_WEBM, "webm", "Web Media Audio" },
+ { VIDEO_MP4, "mp4", "MPEG-4 Video" },
{ VIDEO_RAW, "yuv", "Raw YUV Video" },
{ AUDIO_WAV, "wav", "Waveform Audio" }
};

10
www/mozilla-firefox/patches/patch-xulrunner_app_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.7 2011/10/03 21:06:09 landry Exp $
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.8 2012/08/07 08:55:40 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- xulrunner/app/Makefile.in.orig Thu Aug 25 02:37:45 2011
+++ xulrunner/app/Makefile.in Mon Aug 29 14:55:04 2011
@@ -80,6 +80,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--- xulrunner/app/Makefile.in.orig Wed Jun 13 01:47:16 2012
+++ xulrunner/app/Makefile.in Sun Jun 17 12:04:03 2012
@@ -83,6 +83,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
TK_LIBS := -framework Cocoa $(TK_LIBS)
endif
@ -14,4 +14,4 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648726
+
LIBS += \
$(EXTRA_DSO_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \

3
www/mozilla-firefox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.44 2012/06/11 15:29:56 landry Exp $
@comment $OpenBSD: PLIST,v 1.45 2012/08/07 08:55:40 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@conflict mozilla-firefox-*
@ -54,7 +54,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/google.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/twitter.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/wikipedia.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/update-settings.ini
@man man/man1/${MOZILLA_PROJECT}.1
@man man/man1/mozilla-${MOZILLA_PROJECT}.1
share/applications/${MOZILLA_PROJECT}.desktop

7
www/mozilla-firefox/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.5 2012/08/04 15:01:50 ajacoutot Exp $
$OpenBSD: README,v 1.6 2012/08/07 08:55:40 landry Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -52,3 +52,8 @@ If you encounter crashes, you might want to build the debug FLAVOR of
this package, and run 'firefox -g' to run firefox inside gdb, so
that you can gather debugging logs and traces.
Bug reports without that information will be ignored.
H.264 support
Due to licensing reasons, you have to manually install the
gstreamer-ffmpeg package to play H.264 videos.