Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 79DC41A9217 for ; Wed, 30 Sep 2020 07:26:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DE5EA84DF4; Wed, 30 Sep 2020 07:26:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 66DBB84D56 for ; Wed, 30 Sep 2020 07:26:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Hre0swPh2J4t for ; Wed, 30 Sep 2020 07:26:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B7CF384CED for ; Wed, 30 Sep 2020 07:26:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4EB9AFB28; Wed, 30 Sep 2020 07:26:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_160145080923200" MIME-Version: 1.0 Date: Wed, 30 Sep 2020 07:26:49 +0000 From: "Martin Husemann" Subject: CVS commit: pkgsrc/www/firefox52 To: pkgsrc-changes@NetBSD.org Reply-To: martin@netbsd.org X-Mailer: log_accum Message-Id: <20200930072649.4EB9AFB28@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. --_----------=_160145080923200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: martin Date: Wed Sep 30 07:26:49 UTC 2020 Modified Files: pkgsrc/www/firefox52: distinfo pkgsrc/www/firefox52/patches: patch-ipc_chromium_src_base_process__util.h Added Files: pkgsrc/www/firefox52/patches: patch-js_xpconnect_src_XPCWrappedNative.cpp Log Message: Make it buildable on sparc64/current (with gcc 9) To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/firefox52/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_160145080923200 Content-Disposition: inline Content-Length: 5485 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox52/distinfo diff -u pkgsrc/www/firefox52/distinfo:1.23 pkgsrc/www/firefox52/distinfo:1.24 --- pkgsrc/www/firefox52/distinfo:1.23 Mon Mar 30 19:46:02 2020 +++ pkgsrc/www/firefox52/distinfo Wed Sep 30 07:26:49 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $ +$NetBSD: distinfo,v 1.24 2020/09/30 07:26:49 martin Exp $ SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b @@ -50,7 +50,7 @@ SHA1 (patch-ipc_chromium_src_base_atomic SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce -SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d +SHA1 (patch-ipc_chromium_src_base_process__util.h) = 65b97deadb6c7b83472d6b3892600befe8433c74 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8 SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500 @@ -62,6 +62,7 @@ SHA1 (patch-js_src_jit_none_AtomicOperat SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f SHA1 (patch-js_src_vm_StructuredClone.cpp) = 7e992825e996c43419318893b704a2aa380b0d2a SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde +SHA1 (patch-js_xpconnect_src_XPCWrappedNative.cpp) = 6630b8cb20a2a2b8337e8c1250e741fd65be1e54 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e SHA1 (patch-media_libcubeb_src_cubeb.c) = 24075714155e5c95fddf95ae8865a71db6006c15 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce Index: pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h diff -u pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h:1.1 pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h:1.2 --- pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h:1.1 Thu Apr 27 01:55:57 2017 +++ pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h Wed Sep 30 07:26:49 2020 @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2017/04/27 01:55:57 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2020/09/30 07:26:49 martin Exp $ ---- ipc/chromium/src/base/process_util.h.orig 2015-01-09 04:38:16.000000000 +0000 -+++ ipc/chromium/src/base/process_util.h -@@ -41,6 +41,9 @@ +--- ipc/chromium/src/base/process_util.h.orig 2017-04-11 04:13:12.000000000 +0200 ++++ ipc/chromium/src/base/process_util.h 2020-09-29 15:22:02.249538989 +0200 +@@ -43,6 +43,9 @@ typedef PROCESSENTRY32 ProcessEntry; typedef IO_COUNTERS IoCounters; #elif defined(OS_POSIX) @@ -12,3 +12,22 @@ $NetBSD: patch-ipc_chromium_src_base_pro // TODO(port): we should not rely on a Win32 structure. struct ProcessEntry { int pid; +@@ -75,7 +78,8 @@ enum ProcessArchitecture { + PROCESS_ARCH_PPC = 0x4, + PROCESS_ARCH_ARM = 0x8, + PROCESS_ARCH_MIPS = 0x10, +- PROCESS_ARCH_ARM64 = 0x20 ++ PROCESS_ARCH_ARM64 = 0x20, ++ PROCESS_ARCH_SPARC = 0x40 + }; + + inline ProcessArchitecture GetCurrentProcessArchitecture() +@@ -93,6 +97,8 @@ inline ProcessArchitecture GetCurrentPro + currentArchitecture = base::PROCESS_ARCH_MIPS; + #elif defined(ARCH_CPU_ARM64) + currentArchitecture = base::PROCESS_ARCH_ARM64; ++#elif defined(ARCH_CPU_SPARC) ++ currentArchitecture = base::PROCESS_ARCH_SPARC; + #endif + return currentArchitecture; + } Added files: Index: pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp diff -u /dev/null pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp:1.1 --- /dev/null Wed Sep 30 07:26:49 2020 +++ pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp Wed Sep 30 07:26:49 2020 @@ -0,0 +1,25 @@ +$NetBSD: patch-js_xpconnect_src_XPCWrappedNative.cpp,v 1.1 2020/09/30 07:26:49 martin Exp $ + +Avoid error when compiling with gcc 9: +XPCWrappedNative.cpp:2221:41: error: '%s' directive argument is null [-Werror=format-overflow=] + 2221 | name = JS_sprintf_append(name, fmt, + | ~~~~~~~~~~~~~~~~~^~~~~~~~~~~ + 2222 | array[i]->GetNameString()); + | ~~~~~~~~~~~~~~~~~~~~~~~~~~ + + +--- js/xpconnect/src/XPCWrappedNative.cpp.orig 2018-06-21 20:53:54.000000000 +0200 ++++ js/xpconnect/src/XPCWrappedNative.cpp 2020-09-30 06:58:32.859731786 +0200 +@@ -2218,8 +2218,10 @@ XPCWrappedNative::ToString(XPCWrappedNat + const char* fmt = (i == 0) ? + "(%s" : (i == count-1) ? + ", %s)" : ", %s"; +- name = JS_sprintf_append(name, fmt, +- array[i]->GetNameString()); ++ const char *s = array[i]->GetNameString(); ++ if (s == NULL) ++ s = "-"; ++ name = JS_sprintf_append(name, fmt, s); + } + } + } --_----------=_160145080923200--