CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Joerg Sonnenberger" <joerg%netbsd.org@localhost>
Date: Mon, 30 Mar 2020 19:46:03 +0000

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Mar 30 19:46:03 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: Makefile distinfo
        pkgsrc/mail/thunderbird52: Makefile distinfo
        pkgsrc/mail/thunderbird60: Makefile distinfo
        pkgsrc/www/cliqz: mozilla-common.mk
        pkgsrc/www/firefox: mozilla-common.mk
        pkgsrc/www/firefox52: distinfo
        pkgsrc/www/firefox60: distinfo mozilla-common.mk
        pkgsrc/www/firefox68: distinfo mozilla-common.mk
Added Files:
        pkgsrc/mail/thunderbird/patches:
            patch-config_gcc-stl-wrapper.template.h
        pkgsrc/mail/thunderbird52/patches:
            patch-mozilla_config_gcc-stl-wrapper.template.h
            patch-mozilla_xpcom_typelib_xpt_xpt__arena.h
        pkgsrc/mail/thunderbird60/patches:
            patch-config_gcc-stl-wrapper.template.h
        pkgsrc/www/firefox/patches: patch-config_gcc-stl-wrapper.template.h
        pkgsrc/www/firefox52/patches: patch-config_gcc-stl-wrapper.template.h
            patch-xpcom_typelib_xpt_xpt__arena.h
        pkgsrc/www/firefox60/patches: patch-config_gcc-stl-wrapper.template.h
        pkgsrc/www/firefox68/patches: patch-config_gcc-stl-wrapper.template.h

Log Message:
Fix build with libc++ by making the template wrapper do what it is
supposed to do. Don't mess with math.h internals. Honor ressource limit
changes during build.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.223 -r1.224 pkgsrc/mail/thunderbird/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird/patches/patch-config_gcc-stl-wrapper.template.h
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/thunderbird52/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/thunderbird52/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h \
    pkgsrc/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/thunderbird60/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/thunderbird60/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/thunderbird60/patches/patch-config_gcc-stl-wrapper.template.h
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/cliqz/mozilla-common.mk
cvs rdiff -u -r1.157 -r1.158 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h \
    pkgsrc/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/firefox60/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox60/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/firefox68/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox68/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.242 pkgsrc/mail/thunderbird/Makefile:1.243
--- pkgsrc/mail/thunderbird/Makefile:1.242      Sun Mar 15 13:28:51 2020
+++ pkgsrc/mail/thunderbird/Makefile    Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.242 2020/03/15 13:28:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.243 2020/03/30 19:46:01 joerg Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
@@ -63,7 +63,7 @@ pre-configure:
 
 do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
-       cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+       ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_NAME=  ${PKGBASE}

Index: pkgsrc/mail/thunderbird/distinfo
diff -u pkgsrc/mail/thunderbird/distinfo:1.223 pkgsrc/mail/thunderbird/distinfo:1.224
--- pkgsrc/mail/thunderbird/distinfo:1.223      Sun Mar 15 13:28:51 2020
+++ pkgsrc/mail/thunderbird/distinfo    Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.223 2020/03/15 13:28:51 ryoon Exp $
+$NetBSD: distinfo,v 1.224 2020/03/30 19:46:01 joerg Exp $
 
 SHA1 (thunderbird-68.6.0.source.tar.xz) = a84c078e4f100fe7d8bd6703e4db6654d6dcd896
 RMD160 (thunderbird-68.6.0.source.tar.xz) = 5d1176f0068c8ade239e3043f505dabc7354661b
@@ -8,6 +8,7 @@ SHA1 (patch-browser_app_profile_firefox.
 SHA1 (patch-build_moz.configure_old.configure) = edd810f8d607697898ae315453719fe6c8c09bcc
 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803
 SHA1 (patch-comm_mail_installer_removed-files.in) = f360ccac70a7afaee65e4617c015535084eee035
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = aa9664c1ba850e7c45b654dcf5d7d591d4994a86
 SHA1 (patch-dom_base_nsAttrName.h) = 57a1a15cde53a1c8e22b1b38efdd40b9c0f1f91b
 SHA1 (patch-dom_media_CubebUtils.cpp) = 2b6e750a2336434edd9642e1a78f4b6b7df1354a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 795b510b525019f49169d1a594cd3e455e706500

Index: pkgsrc/mail/thunderbird52/Makefile
diff -u pkgsrc/mail/thunderbird52/Makefile:1.10 pkgsrc/mail/thunderbird52/Makefile:1.11
--- pkgsrc/mail/thunderbird52/Makefile:1.10     Tue Mar 10 22:10:28 2020
+++ pkgsrc/mail/thunderbird52/Makefile  Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/03/10 22:10:28 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/30 19:46:01 joerg Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird${TB_VER:C/\..*$//}-${TB_VER}
@@ -63,7 +63,7 @@ pre-configure:
 
 do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
-       cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+       ${RUN} ${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_NAME=  ${PKGBASE}

Index: pkgsrc/mail/thunderbird52/distinfo
diff -u pkgsrc/mail/thunderbird52/distinfo:1.2 pkgsrc/mail/thunderbird52/distinfo:1.3
--- pkgsrc/mail/thunderbird52/distinfo:1.2      Sat Feb  8 22:20:26 2020
+++ pkgsrc/mail/thunderbird52/distinfo  Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2020/02/08 22:20:26 kamil Exp $
+$NetBSD: distinfo,v 1.3 2020/03/30 19:46:01 joerg Exp $
 
 SHA1 (thunderbird-52.9.1.source.tar.xz) = 9970d78084fe979f568ea00bf06b8e81a738e630
 RMD160 (thunderbird-52.9.1.source.tar.xz) = b3169a0154fa85648a98ba0d74f264abd224b323
@@ -24,6 +24,7 @@ SHA1 (patch-mozilla_build_pgo_profileser
 SHA1 (patch-mozilla_config_Makefile.in) = ef7b31712e3be7620dfaf548d4138c6b425eb2ca
 SHA1 (patch-mozilla_config_baseconfig.mk) = 92891a656cb83de0f5ff7f88d10579cdde0e1359
 SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24
+SHA1 (patch-mozilla_config_gcc-stl-wrapper.template.h) = be32e0e51992278915ffd7c205f9846ca353c89a
 SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50
 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4
 SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f
@@ -120,3 +121,4 @@ SHA1 (patch-mozilla_xpcom_reflect_xptcal
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = edbf6721ac8d74dc314f4c70fc5c74ebb6f44076
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = a04a46c13752d4c92bbba8b96d85cb430f3a4ac6
 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = bb0d322a00c42e6ce1a5a931fecdcaf1b58109bc
+SHA1 (patch-mozilla_xpcom_typelib_xpt_xpt__arena.h) = 186cc580476fa80836d8ebd1e27de6c30377e89f

Index: pkgsrc/mail/thunderbird60/Makefile
diff -u pkgsrc/mail/thunderbird60/Makefile:1.6 pkgsrc/mail/thunderbird60/Makefile:1.7
--- pkgsrc/mail/thunderbird60/Makefile:1.6      Sun Mar  8 16:50:25 2020
+++ pkgsrc/mail/thunderbird60/Makefile  Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/03/08 16:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/30 19:46:01 joerg Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird60-${TB_VER}
@@ -76,7 +76,7 @@ post-configure:
 
 do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
-       cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+       ${RUN}${_ULIMIT_CMD} cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
 MOZILLA=       ${PKGBASE}
 MOZILLA_NAME=  ${PKGBASE}

Index: pkgsrc/mail/thunderbird60/distinfo
diff -u pkgsrc/mail/thunderbird60/distinfo:1.4 pkgsrc/mail/thunderbird60/distinfo:1.5
--- pkgsrc/mail/thunderbird60/distinfo:1.4      Sat Feb  8 22:30:17 2020
+++ pkgsrc/mail/thunderbird60/distinfo  Mon Mar 30 19:46:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2020/02/08 22:30:17 kamil Exp $
+$NetBSD: distinfo,v 1.5 2020/03/30 19:46:01 joerg Exp $
 
 SHA1 (thunderbird-60.9.1.source.tar.xz) = ce6b4e411e8f5da3e217122e9bf61553ce76b1a7
 RMD160 (thunderbird-60.9.1.source.tar.xz) = 9e771f2540e34d222cfb85f3ae9e108364881209
@@ -14,6 +14,7 @@ SHA1 (patch-comm_mail_app_nsMailApp.cpp)
 SHA1 (patch-comm_mail_components_shell_nsMailGNOMEIntegration.cpp) = e0ed20894e1343fc06816e78193a0cee39aeb4b7
 SHA1 (patch-comm_mail_installer_package-manifest.in) = 14e8977f690e579a8caf73326248323615e04803
 SHA1 (patch-comm_mail_installer_removed-files.in) = bda8a8d12075fa5bf87d552035812f5cf485a393
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 78ad8c2fcf16d834d071554eb6682591902a96a6
 SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = 23c0f9d4677c1a87ebeb12a9a822fd7a15f51215
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 4b85e9bf5a199b450c56790d5f14e6bdc7867c33

Index: pkgsrc/www/cliqz/mozilla-common.mk
diff -u pkgsrc/www/cliqz/mozilla-common.mk:1.7 pkgsrc/www/cliqz/mozilla-common.mk:1.8
--- pkgsrc/www/cliqz/mozilla-common.mk:1.7      Sun Feb 23 00:10:40 2020
+++ pkgsrc/www/cliqz/mozilla-common.mk  Mon Mar 30 19:46:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2020/02/23 00:10:40 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2020/03/30 19:46:02 joerg Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -23,8 +23,6 @@ CXXFLAGS+=    -march=i586
 CXXFLAGS+=     -mstackrealign
 .endif
 
-CXXFLAGS+=     -D__HAVE_INLINE___ISINF
-
 CHECK_PORTABILITY_SKIP+=       build-tools/scripts/l10n/release_repacks.sh
 CHECK_PORTABILITY_SKIP+=       mozilla-release/intl/icu/source/configure
 CHECK_PORTABILITY_SKIP+=       mozilla-release/modules/pdfium/update.sh

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.157 pkgsrc/www/firefox/mozilla-common.mk:1.158
--- pkgsrc/www/firefox/mozilla-common.mk:1.157  Wed Mar 18 01:27:14 2020
+++ pkgsrc/www/firefox/mozilla-common.mk        Mon Mar 30 19:46:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.157 2020/03/18 01:27:14 gutteridge Exp $
+# $NetBSD: mozilla-common.mk,v 1.158 2020/03/30 19:46:02 joerg Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -21,7 +21,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.13.0:../../devel/cbindgen
 .if ${MACHINE_ARCH} == "sparc64"
@@ -58,8 +58,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

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.22 pkgsrc/www/firefox52/distinfo:1.23
--- pkgsrc/www/firefox52/distinfo:1.22  Sat Feb  8 21:44:59 2020
+++ pkgsrc/www/firefox52/distinfo       Mon Mar 30 19:46:02 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/02/08 21:44:59 kamil Exp $
+$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -16,6 +16,7 @@ SHA1 (patch-build_pgo_profileserver.py) 
 SHA1 (patch-config_Makefile.in) = fc6d4de55f4d9ab8598d5b89e6630e4685af1795
 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
 SHA1 (patch-config_external_moz.build) = 68708dc0fb94119b9f140d05dd737e69bb6bba81
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 4440748c79c0da76cb06bd5b9f36dac6f3dc8b0b
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
 SHA1 (patch-config_system-headers) = fd0cb4d2061af1eaa34313370a57720ed693607f
@@ -118,3 +119,4 @@ SHA1 (patch-xpcom_reflect_xptcall_md_uni
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
+SHA1 (patch-xpcom_typelib_xpt_xpt__arena.h) = a9cee44921eae1ad6a3ddc14054b1c03dc6f5e84

Index: pkgsrc/www/firefox60/distinfo
diff -u pkgsrc/www/firefox60/distinfo:1.22 pkgsrc/www/firefox60/distinfo:1.23
--- pkgsrc/www/firefox60/distinfo:1.22  Sat Feb  8 22:01:36 2020
+++ pkgsrc/www/firefox60/distinfo       Mon Mar 30 19:46:02 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/02/08 22:01:36 kamil Exp $
+$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $
 
 SHA1 (firefox-60.9.0esr.source.tar.xz) = 616f8afdee741f0bea607a671b8515ef13c68b4a
 RMD160 (firefox-60.9.0esr.source.tar.xz) = f3ef7629ab28960fb383d3fb12dab69feb0f45ee
@@ -8,6 +8,7 @@ SHA1 (patch-aa) = 5e07d1a01762b7face950c
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 07b7cea056a2db080e87c04393261a9a0f514f32
 SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 28c033037ac30636acdc7dd8f6637d5446ff25f7

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.8 pkgsrc/www/firefox60/mozilla-common.mk:1.9
--- pkgsrc/www/firefox60/mozilla-common.mk:1.8  Sat Dec 28 05:48:06 2019
+++ pkgsrc/www/firefox60/mozilla-common.mk      Mon Mar 30 19:46:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2019/12/28 05:48:06 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2020/03/30 19:46:02 joerg Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -8,7 +8,7 @@ HAS_CONFIGURE=          yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 USE_TOOLS+=            pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=                c99 c++
-UNLIMIT_RESOURCES+=    datasize
+UNLIMIT_RESOURCES+=    datasize virtualsize
 
 GCC_REQD+=             4.9
 

Index: pkgsrc/www/firefox68/distinfo
diff -u pkgsrc/www/firefox68/distinfo:1.11 pkgsrc/www/firefox68/distinfo:1.12
--- pkgsrc/www/firefox68/distinfo:1.11  Thu Mar 12 19:39:35 2020
+++ pkgsrc/www/firefox68/distinfo       Mon Mar 30 19:46:03 2020
@@ -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)
 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

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.8 pkgsrc/www/firefox68/mozilla-common.mk:1.9
--- pkgsrc/www/firefox68/mozilla-common.mk:1.8  Wed Mar 18 01:33:58 2020
+++ pkgsrc/www/firefox68/mozilla-common.mk      Mon Mar 30 19:46:03 2020
@@ -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

Added files:

Index: pkgsrc/mail/thunderbird/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/mail/thunderbird/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/mail/thunderbird/patches/patch-config_gcc-stl-wrapper.template.h     Mon Mar 30 19:46:01 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig     2020-03-10 21:02:17.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

Index: pkgsrc/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/mail/thunderbird52/patches/patch-mozilla_config_gcc-stl-wrapper.template.h   Mon Mar 30 19:46:01 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-mozilla_config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- mozilla/config/gcc-stl-wrapper.template.h.orig     2018-07-09 19:54:33.000000000 +0000
++++ mozilla/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
+@@ -66,4 +66,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
Index: pkgsrc/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h
diff -u /dev/null pkgsrc/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/mail/thunderbird52/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h      Mon Mar 30 19:46:01 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_xpcom_typelib_xpt_xpt__arena.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- mozilla/xpcom/typelib/xpt/xpt_arena.h.orig 2018-07-09 19:54:58.000000000 +0000
++++ mozilla/xpcom/typelib/xpt/xpt_arena.h
+@@ -10,7 +10,7 @@
+ #ifndef __xpt_arena_h__
+ #define __xpt_arena_h__
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include "mozilla/Attributes.h"
+ #include "mozilla/MemoryReporting.h"
+ #include <stdint.h>

Index: pkgsrc/mail/thunderbird60/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/mail/thunderbird60/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/mail/thunderbird60/patches/patch-config_gcc-stl-wrapper.template.h   Mon Mar 30 19:46:01 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:01 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig     2019-10-31 12:34:19.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

Index: pkgsrc/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox/patches/patch-config_gcc-stl-wrapper.template.h  Mon Mar 30 19:46:02 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig     2020-03-09 13:09:13.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

Index: pkgsrc/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox52/patches/patch-config_gcc-stl-wrapper.template.h        Mon Mar 30 19:46:02 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig     2017-04-11 02:13:09.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
+@@ -66,4 +66,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
Index: pkgsrc/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox52/patches/patch-xpcom_typelib_xpt_xpt__arena.h   Mon Mar 30 19:46:02 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-xpcom_typelib_xpt_xpt__arena.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- xpcom/typelib/xpt/xpt_arena.h.orig 2020-03-29 17:32:32.848757813 +0000
++++ xpcom/typelib/xpt/xpt_arena.h
+@@ -10,7 +10,7 @@
+ #ifndef __xpt_arena_h__
+ #define __xpt_arena_h__
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include "mozilla/Attributes.h"
+ #include "mozilla/MemoryReporting.h"
+ #include <stdint.h>

Index: pkgsrc/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox60/patches/patch-config_gcc-stl-wrapper.template.h        Mon Mar 30 19:46:02 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1 2020/03/30 19:46:02 joerg Exp $
+
+--- config/gcc-stl-wrapper.template.h.orig     2019-09-01 13:09:05.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

Index: pkgsrc/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Mon Mar 30 19:46:03 2020
+++ pkgsrc/www/firefox68/patches/patch-config_gcc-stl-wrapper.template.h        Mon Mar 30 19:46:03 2020
@@ -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

Prev by Date: CVS commit: pkgsrc/net/p5-Net-Pcap
Next by Date: CVS commit: pkgsrc/converters/bdf2sfd
Previous by Thread: CVS commit: pkgsrc/net/p5-Net-Pcap
Next by Thread: CVS commit: pkgsrc/converters/bdf2sfd
Indexes:

Home | Main Index | Thread Index | Old Index