diff options
Diffstat (limited to 'www/firefox68')
| -rw-r--r-- | www/firefox68/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 6 | ||||
| -rw-r--r-- | www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h | 29 |
3 files changed, 33 insertions, 5 deletions
diff --git a/www/firefox68/distinfo b/www/firefox68/distinfo index 916a2b6c9e9..0ceaf1a4001 100644 --- a/www/firefox68/distinfo +++ b/www/firefox68/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2020/03/12 19:39:35 nia Exp $ +$NetBSD: distinfo,v 1.12 2020/03/30 19:46:03 joerg Exp $ SHA1 (firefox-68.6.0esr.source.tar.xz) = 85d35d0a0190d56585f93c9f117d5c0f52bcbc44 RMD160 (firefox-68.6.0esr.source.tar.xz) = d11d44f5400ca1f5c3b721dd974a77fbf7cf7e7a @@ -6,6 +6,7 @@ SHA512 (firefox-68.6.0esr.source.tar.xz) = 84565d654ed8bd2d036d08de4d16e41ae8881 Size (firefox-68.6.0esr.source.tar.xz) = 313814396 bytes SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e +SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index 6a616511f7c..b4e8ba00d84 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.8 2020/03/18 01:33:58 gutteridge Exp $ +# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:03 joerg Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -23,7 +23,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip USE_LANGUAGES+= c99 gnu++14 -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize virtualsize TOOL_DEPENDS+= cbindgen>=0.8.7:../../devel/cbindgen .if ${MACHINE_ARCH} == "sparc64" @@ -64,8 +64,6 @@ CXXFLAGS+= -march=i586 CXXFLAGS+= -mstackrealign .endif -CXXFLAGS+= -D__HAVE_INLINE___ISINF - CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh CHECK_PORTABILITY_SKIP+= ${MOZILLA_DIR}js/src/tests/update-test262.sh diff --git a/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h b/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h new file mode 100644 index 00000000000..038d9601faa --- /dev/null +++ b/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h @@ -0,0 +1,29 @@ +$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:03 joerg Exp $ + +--- config/gcc-stl-wrapper.template.h.orig 2020-03-05 20:56:39.000000000 +0000 ++++ config/gcc-stl-wrapper.template.h +@@ -28,14 +28,14 @@ + #endif + + // Don't include mozalloc for cstdlib. See bug 1245076. +-#ifndef moz_dont_include_mozalloc_for_cstdlib +-# define moz_dont_include_mozalloc_for_cstdlib ++#ifndef moz_dont_include_mozalloc_for_${HEADER} ++# define moz_dont_include_mozalloc_for_${HEADER} + #endif + + // Include mozalloc after the STL header and all other headers it includes + // have been preprocessed. + #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ +- !defined(moz_dont_include_mozalloc_for_${HEADER}) ++ !defined(moz_dont_include_mozalloc_for_cstdlib) + # define MOZ_INCLUDE_MOZALLOC_H + # define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} + #endif +@@ -64,4 +64,6 @@ + # include "mozilla/throw_gcc.h" + #endif + ++#undef moz_dont_include_mzalloc_for_${HEADER} ++ + #endif // if mozilla_${HEADER}_h |