Wed Sep 30 07:26:49 2020 UTC ()
Make it buildable on sparc64/current (with gcc 9)


(martin)
diff -r1.23 -r1.24 pkgsrc/www/firefox52/distinfo
diff -r1.1 -r1.2 pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h
diff -r0 -r1.1 pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp
cvs diff -r1.23 -r1.24 pkgsrc/www/firefox52/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox52/distinfo 2020/03/30 19:46:02 1.23
+++ pkgsrc/www/firefox52/distinfo 2020/09/30 07:26:49 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.23 2020/03/30 19:46:02 joerg Exp $ 1$NetBSD: distinfo,v 1.24 2020/09/30 07:26:49 martin Exp $
2 2
3SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7 3SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
4RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b 4RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
5SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9 5SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
6Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes 6Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes
7SHA1 (patch-aa) = 0ca132012a7005a506cdecc0167d4c7782aee244 7SHA1 (patch-aa) = 0ca132012a7005a506cdecc0167d4c7782aee244
8SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5 8SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
9SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428 9SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428
10SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86 10SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86
11SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e 11SHA1 (patch-build_moz.configure_init.configure) = f2df0c6b92aa825a61f6a4ee1f70f5443c61858e
12SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261 12SHA1 (patch-build_moz.configure_keyfiles.configure) = dd46c7c29464f374eed3f0762f4653d42032c261
13SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6 13SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
14SHA1 (patch-build_moz.configure_old.configure) = d57f718ff0c1d2901ec9f4c958f5a7323ee7c700 14SHA1 (patch-build_moz.configure_old.configure) = d57f718ff0c1d2901ec9f4c958f5a7323ee7c700
@@ -40,38 +40,39 @@ SHA1 (patch-gfx_skia_generate__mozbuild. @@ -40,38 +40,39 @@ SHA1 (patch-gfx_skia_generate__mozbuild.
40SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871 40SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871
41SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456 41SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456
42SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf 42SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
43SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb 43SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb
44SHA1 (patch-image_Downscaler.h) = c92aa17c22310d0b16cdc4bb778d3029c4b154e3 44SHA1 (patch-image_Downscaler.h) = c92aa17c22310d0b16cdc4bb778d3029c4b154e3
45SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f 45SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
46SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655 46SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655
47SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c 47SHA1 (patch-intl_unicharutil_util_moz.build) = 2e604c8695b490657ee14cae01ca84d7bd51236c
48SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a 48SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
49SHA1 (patch-ipc_chromium_src_base_atomicops__internals__arm__gcc.h) = cceefce420cfcfc67f74375e3fe5d17a75a562e4 49SHA1 (patch-ipc_chromium_src_base_atomicops__internals__arm__gcc.h) = cceefce420cfcfc67f74375e3fe5d17a75a562e4
50SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf 50SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf
51SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee 51SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee
52SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce 52SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce
53SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d 53SHA1 (patch-ipc_chromium_src_base_process__util.h) = 65b97deadb6c7b83472d6b3892600befe8433c74
54SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b 54SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b
55SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8 55SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8
56SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500 56SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500
57SHA1 (patch-ipc_chromium_src_build_build__config.h) = 9e4f15226c494f5015dbea3a0df6af851449ae15 57SHA1 (patch-ipc_chromium_src_build_build__config.h) = 9e4f15226c494f5015dbea3a0df6af851449ae15
58SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 33ea11a8c23f2fefcb318342ac9e94d3885cb3b1 58SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 33ea11a8c23f2fefcb318342ac9e94d3885cb3b1
59SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = b9c202645a4b6f691a6eb81ef0daf4278d10dcc4 59SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = b9c202645a4b6f691a6eb81ef0daf4278d10dcc4
60SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782 60SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
61SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392 61SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392
62SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f 62SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f
63SHA1 (patch-js_src_vm_StructuredClone.cpp) = 7e992825e996c43419318893b704a2aa380b0d2a 63SHA1 (patch-js_src_vm_StructuredClone.cpp) = 7e992825e996c43419318893b704a2aa380b0d2a
64SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde 64SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 65SHA1 (patch-js_xpconnect_src_XPCWrappedNative.cpp) = 6630b8cb20a2a2b8337e8c1250e741fd65be1e54
65SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e 66SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
66SHA1 (patch-media_libcubeb_src_cubeb.c) = 24075714155e5c95fddf95ae8865a71db6006c15 67SHA1 (patch-media_libcubeb_src_cubeb.c) = 24075714155e5c95fddf95ae8865a71db6006c15
67SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce 68SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce
68SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536 69SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536
69SHA1 (patch-media_libcubeb_src_moz.build) = b81696b0160e151b7f52621eb7ec69c704d93507 70SHA1 (patch-media_libcubeb_src_moz.build) = b81696b0160e151b7f52621eb7ec69c704d93507
70SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb0b807d 71SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb0b807d
71SHA1 (patch-media_libcubeb_update.sh) = d8f35f994f48119e20a79484e10a15ba13989936 72SHA1 (patch-media_libcubeb_update.sh) = d8f35f994f48119e20a79484e10a15ba13989936
72SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696 73SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
73SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2 74SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2
74SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718 75SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 4b215277f9c81154377d401166023c1bf78a3718
75SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81 76SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
76SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf 77SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf
77SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0 78SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h (expand / switch to unified diff)

--- pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h 2017/04/27 01:55:57 1.1
+++ pkgsrc/www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h 2020/09/30 07:26:49 1.2
@@ -1,14 +1,33 @@ @@ -1,14 +1,33 @@
1$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2017/04/27 01:55:57 ryoon Exp $ 1$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2020/09/30 07:26:49 martin Exp $
2 2
3--- ipc/chromium/src/base/process_util.h.orig 2015-01-09 04:38:16.000000000 +0000 3--- ipc/chromium/src/base/process_util.h.orig 2017-04-11 04:13:12.000000000 +0200
4+++ ipc/chromium/src/base/process_util.h 4+++ ipc/chromium/src/base/process_util.h 2020-09-29 15:22:02.249538989 +0200
5@@ -41,6 +41,9 @@ 5@@ -43,6 +43,9 @@
6 typedef PROCESSENTRY32 ProcessEntry; 6 typedef PROCESSENTRY32 ProcessEntry;
7 typedef IO_COUNTERS IoCounters; 7 typedef IO_COUNTERS IoCounters;
8 #elif defined(OS_POSIX) 8 #elif defined(OS_POSIX)
9+#ifndef NAME_MAX 9+#ifndef NAME_MAX
10+#define NAME_MAX _POSIX_NAME_MAX 10+#define NAME_MAX _POSIX_NAME_MAX
11+#endif 11+#endif
12 // TODO(port): we should not rely on a Win32 structure. 12 // TODO(port): we should not rely on a Win32 structure.
13 struct ProcessEntry { 13 struct ProcessEntry {
14 int pid; 14 int pid;
 15@@ -75,7 +78,8 @@ enum ProcessArchitecture {
 16 PROCESS_ARCH_PPC = 0x4,
 17 PROCESS_ARCH_ARM = 0x8,
 18 PROCESS_ARCH_MIPS = 0x10,
 19- PROCESS_ARCH_ARM64 = 0x20
 20+ PROCESS_ARCH_ARM64 = 0x20,
 21+ PROCESS_ARCH_SPARC = 0x40
 22 };
 23
 24 inline ProcessArchitecture GetCurrentProcessArchitecture()
 25@@ -93,6 +97,8 @@ inline ProcessArchitecture GetCurrentPro
 26 currentArchitecture = base::PROCESS_ARCH_MIPS;
 27 #elif defined(ARCH_CPU_ARM64)
 28 currentArchitecture = base::PROCESS_ARCH_ARM64;
 29+#elif defined(ARCH_CPU_SPARC)
 30+ currentArchitecture = base::PROCESS_ARCH_SPARC;
 31 #endif
 32 return currentArchitecture;
 33 }
File Added: pkgsrc/www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp
$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);
             }
         }
     }