thunderbird52: Various fixes for gcc>7 from firefox52

3 files changed, 54 insertions, 2 deletions

diff --git a/mail/thunderbird52/distinfo b/mail/thunderbird52/distinfo
index 3c5c529ed64..f9a80cf7f48 100644
--- a/mail/thunderbird52/distinfo
+++ b/mail/thunderbird52/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:54:32 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/11/18 15:33:16 nia Exp $
 
 BLAKE2s (thunderbird-52.9.1.source.tar.xz) = bfd83c193ff48ad9f1e54125d19b7bab4060a898836645ac871159450ec153b9
 SHA512 (thunderbird-52.9.1.source.tar.xz) = 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
@@ -51,6 +51,7 @@ SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = 423009ff077aa4c0862fd5b8ec9066
 SHA1 (patch-mozilla_gfx_moz.build) = ced2bc2e349cb4d58137ae64f4ec75b04239e854
 SHA1 (patch-mozilla_gfx_skia_generate__mozbuild.py) = c85162fd7517a4e006512fef42a3c5124d2704aa
 SHA1 (patch-mozilla_gfx_skia_moz.build) = 359b4f6fc45ec4fcc6376cc67ec3c2485cb15877
+SHA1 (patch-mozilla_gfx_thebes_gfxFont.cpp) = 2b360f66702411050741934d80b7bde554f69ce1
 SHA1 (patch-mozilla_gfx_thebes_moz.build) = ba8f4af4ec885bee26949470682d2e48e240c7de
 SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 84eab4220cbce9ad44a62b7ba64e838927382b13
 SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = b0a01fed529bbbea8e1ca06d8154f9cf331f844d
@@ -74,7 +75,7 @@ SHA1 (patch-mozilla_js_src_jit_none_AtomicOperations-sparc.h) = e85996849acce279
 SHA1 (patch-mozilla_js_src_moz.build) = 9220c6c618b1db6f88fd58b27b9ae9f742d2602a
 SHA1 (patch-mozilla_js_src_old-configure.in) = 8349fe3c700404c2c2d9512068edab9b097508c9
 SHA1 (patch-mozilla_js_xpconnect_src_XPCConvert.cpp) = fb20844c866045677ce7b14099cf7a748d430f64
-SHA1 (patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp) = c188ceff949cfc83a1da047f3cdbc6fac506d57f
+SHA1 (patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp) = 9d9c20021e051183f28059f2f572ab375e96abde
 SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 4dc5838b1fe482aca023ce992ebf414ee39d0aef
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = 993d921016d126a3fbd139b212c35a09606d184c
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 8139652f4d101135efe6ec379cbf89e83061c488
diff --git a/mail/thunderbird52/patches/patch-mozilla_gfx_thebes_gfxFont.cpp b/mail/thunderbird52/patches/patch-mozilla_gfx_thebes_gfxFont.cpp
new file mode 100644
index 00000000000..929b371a20a
--- /dev/null
+++ b/mail/thunderbird52/patches/patch-mozilla_gfx_thebes_gfxFont.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-mozilla_gfx_thebes_gfxFont.cpp,v 1.1 2021/11/18 15:33:16 nia Exp $
+
+Add an explicit template instantiation to make it work
+with newer gcc (older gcc did not create specialized inline
+clones).
+
+--- mozilla/gfx/thebes/gfxFont.cpp.orig	2018-07-09 19:54:37.000000000 +0000
++++ mozilla/gfx/thebes/gfxFont.cpp
+@@ -2614,6 +2614,18 @@ gfxFont::GetShapedWord(DrawTarget *aDraw
+     return sw;
+ }
+ 
++template
++gfxShapedWord*
++gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
++                       const uint8_t *aText,
++                       uint32_t    aLength,
++                       uint32_t    aHash,
++                       Script      aRunScript,
++                       bool        aVertical,
++                       int32_t     aAppUnitsPerDevUnit,
++                       uint32_t    aFlags,
++                       gfxTextPerfMetrics *aTextPerf GFX_MAYBE_UNUSED);
++
+ bool
+ gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
+ {
diff --git a/mail/thunderbird52/patches/patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp b/mail/thunderbird52/patches/patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp
new file mode 100644
index 00000000000..4a70dacca6f
--- /dev/null
+++ b/mail/thunderbird52/patches/patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-mozilla_js_xpconnect_src_XPCWrappedNative.cpp,v 1.1 2021/11/18 15:33:16 nia 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());
+      |                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- mozilla/js/xpconnect/src/XPCWrappedNative.cpp.orig	2018-07-09 19:54:43.000000000 +0000
++++ mozilla/js/xpconnect/src/XPCWrappedNative.cpp
+@@ -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);
+             }
+         }
+     }