head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.46 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.44 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.42 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.40 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.38 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.36 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.34 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.32 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.30 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.28 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.26 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.24 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.22 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.20 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.18 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.16 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.14 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.12 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.10 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.8 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.6 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.4 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.2; locks; strict; comment @// @; 1.1 date 2020.09.30.07.26.49; author martin; state Exp; branches 1.1.2.1; next ; commitid OJAAZeeoA2mGG2qC; 1.1.2.1 date 2020.09.30.07.26.49; author bsiegert; state dead; branches; next 1.1.2.2; commitid jB2Rzhryp1qYeCqC; 1.1.2.2 date 2020.10.04.18.31.37; author bsiegert; state Exp; branches; next ; commitid jB2Rzhryp1qYeCqC; desc @@ 1.1 log @Make it buildable on sparc64/current (with gcc 9) @ text @$NetBSD$ 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); } } } @ 1.1.2.1 log @file patch-js_xpconnect_src_XPCWrappedNative.cpp was added on branch pkgsrc-2020Q3 on 2020-10-04 18:31:37 +0000 @ text @d1 25 @ 1.1.2.2 log @Pullup ticket #6330 - requested by martin www/firefox52: sparc64 build fix Revisions pulled up: - www/firefox52/distinfo 1.24 - www/firefox52/patches/patch-ipc_chromium_src_base_process__util.h 1.2 - www/firefox52/patches/patch-js_xpconnect_src_XPCWrappedNative.cpp 1.1 --- 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) @ text @a0 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); } } } @