Received: by mail.netbsd.org (Postfix, from userid 605) id 53ABD84DFC; Fri, 17 Apr 2020 00:18:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D095284D37 for ; Fri, 17 Apr 2020 00:18:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HDxyJups3M6n for ; Fri, 17 Apr 2020 00:18:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1FF3084D2C for ; Fri, 17 Apr 2020 00:18:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D125FB27; Fri, 17 Apr 2020 00:18:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587082705271540" MIME-Version: 1.0 Date: Fri, 17 Apr 2020 00:18:25 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/www/seamonkey To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200417001825.1D125FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587082705271540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Fri Apr 17 00:18:25 UTC 2020 Modified Files: pkgsrc/www/seamonkey: distinfo Added Files: pkgsrc/www/seamonkey/patches: patch-mozilla_config_gcc-stl-wrapper.template.h patch-mozilla_xpcom_typelib_xpt_xpt__arena.h Log Message: Merge fixes from firefox for libc++ build. To generate a diff of this commit: cvs rdiff -u -r1.160 -r1.161 pkgsrc/www/seamonkey/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/seamonkey/patches/patch-mozilla_config_gcc-stl-wrapper.template.h \ pkgsrc/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587082705271540 Content-Disposition: inline Content-Length: 4209 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/seamonkey/distinfo diff -u pkgsrc/www/seamonkey/distinfo:1.160 pkgsrc/www/seamonkey/distinfo:1.161 --- pkgsrc/www/seamonkey/distinfo:1.160 Sat Feb 8 22:59:55 2020 +++ pkgsrc/www/seamonkey/distinfo Fri Apr 17 00:18:24 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.160 2020/02/08 22:59:55 kamil Exp $ +$NetBSD: distinfo,v 1.161 2020/04/17 00:18:24 joerg Exp $ SHA1 (seamonkey-2.49.5.source.tar.xz) = 366953dee336185102d9a17028d49834cdb897d2 RMD160 (seamonkey-2.49.5.source.tar.xz) = 6423a548286a166e88695060713afefd7365f389 @@ -16,6 +16,7 @@ SHA1 (patch-mozilla_build_pgo_profileser SHA1 (patch-mozilla_config_Makefile.in) = 307d1013be22bc97cd5eb340ba6a3835998319d3 SHA1 (patch-mozilla_config_baseconfig.mk) = 49914353e167442440e04afd8e64b57ddf9399df SHA1 (patch-mozilla_config_external_moz.build) = a6f9bfad761428f0690a96d9953cd9fd3879f4ba +SHA1 (patch-mozilla_config_gcc-stl-wrapper.template.h) = 6870fee7feabed3794334278ee6f49e0b2857743 SHA1 (patch-mozilla_config_stl__wrappers_ios) = 9200935d025d899a5810dc615345b9a7005369b2 SHA1 (patch-mozilla_config_stl__wrappers_ostream) = 232e253bca5d8f7f0de1b880dc34b613f8852ee7 SHA1 (patch-mozilla_config_system-headers) = 6d205afa00cabef39ab626320d423392d64e0165 @@ -114,6 +115,7 @@ SHA1 (patch-mozilla_xpcom_reflect_xptcal SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 40231c0cbd4694f375211c21fe0473fd5fb9f483 SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 219bdb7ef05d156642dd4124e444696c744badfd SHA1 (patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 09b4833061face404731f2ec99a7fd2b3f313f70 +SHA1 (patch-mozilla_xpcom_typelib_xpt_xpt__arena.h) = 2a48f7dcbcf09e4020b846c1677ee346881a4235 SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = f1c41712212182af22403f32a4153b6542aa14b1 SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = 439709724e30ef5b4e671fb4b525dca804f9597c SHA1 (patch-rc) = bf98fe87c83c322dcdfe3d7aff3ca8e6f273a567 Added files: Index: pkgsrc/www/seamonkey/patches/patch-mozilla_config_gcc-stl-wrapper.template.h diff -u /dev/null pkgsrc/www/seamonkey/patches/patch-mozilla_config_gcc-stl-wrapper.template.h:1.1 --- /dev/null Fri Apr 17 00:18:25 2020 +++ pkgsrc/www/seamonkey/patches/patch-mozilla_config_gcc-stl-wrapper.template.h Fri Apr 17 00:18:24 2020 @@ -0,0 +1,29 @@ +$NetBSD: patch-mozilla_config_gcc-stl-wrapper.template.h,v 1.1 2020/04/17 00:18:24 joerg Exp $ + +--- mozilla/config/gcc-stl-wrapper.template.h.orig 2019-05-06 17:30:42.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/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h diff -u /dev/null pkgsrc/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h:1.1 --- /dev/null Fri Apr 17 00:18:25 2020 +++ pkgsrc/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpt_xpt__arena.h Fri Apr 17 00:18:24 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_xpcom_typelib_xpt_xpt__arena.h,v 1.1 2020/04/17 00:18:24 joerg Exp $ + +--- mozilla/xpcom/typelib/xpt/xpt_arena.h.orig 2019-05-06 17:31:09.000000000 +0000 ++++ mozilla/xpcom/typelib/xpt/xpt_arena.h +@@ -10,7 +10,7 @@ + #ifndef __xpt_arena_h__ + #define __xpt_arena_h__ + +-#include ++#include + #include "mozilla/Attributes.h" + #include "mozilla/MemoryReporting.h" + #include --_----------=_1587082705271540--