CVS commit: pkgsrc/www/firefox52

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Mon Jun 21 14:21:28 UTC 2021

Modified Files:
        pkgsrc/www/firefox52: distinfo
Added Files:
        pkgsrc/www/firefox52/patches: patch-gfx_thebes_gfxFont.cpp

Log Message:
PR 56265: add an explicit template instantiation for the "external" variant
used in a different compilation unit, so this builds with newer gcc
versions.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.27 pkgsrc/www/firefox52/distinfo:1.28
--- pkgsrc/www/firefox52/distinfo:1.27  Wed Jun 16 22:21:12 2021
+++ pkgsrc/www/firefox52/distinfo       Mon Jun 21 14:21:28 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/06/16 22:21:12 nia Exp $
+$NetBSD: distinfo,v 1.28 2021/06/21 14:21:28 martin Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -45,6 +45,7 @@ SHA1 (patch-gfx_graphite2_src_Bidi.cpp) 
 SHA1 (patch-gfx_moz.build) = 0d669ac6dc1af17ea8ed7e84e4915947c2a6b1ca
 SHA1 (patch-gfx_skia_generate__mozbuild.py) = fba2f212f84e6cc20a4269e21ed654c348ae8fee
 SHA1 (patch-gfx_skia_moz.build) = 7363e76ac75e27cffe5ee1194741d444a625b871
+SHA1 (patch-gfx_thebes_gfxFont.cpp) = 5e244e242d169203b806244a382840ca72780f27
 SHA1 (patch-gfx_thebes_moz.build) = 0435f36d573fee1bb300612e4b7dc6fcda2d5456
 SHA1 (patch-gfx_ycbcr_moz.build) = 705c36b972ef1533330e4a180002cef1c22755bf
 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 79587891c2a1716a27d4dca0e5b5880069a430eb

Added files:

Index: pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp
diff -u /dev/null pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp:1.1
--- /dev/null   Mon Jun 21 14:21:28 2021
+++ pkgsrc/www/firefox52/patches/patch-gfx_thebes_gfxFont.cpp   Mon Jun 21 14:21:28 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-gfx_thebes_gfxFont.cpp,v 1.1 2021/06/21 14:21:28 martin Exp $
+
+Add an explicit template instantiation to make it work
+with newer gcc (older gcc did not create specialized inline
+clones).
+
+--- gfx/thebes/gfxFont.cpp.orig        2017-04-11 04:13:08.000000000 +0200
++++ gfx/thebes/gfxFont.cpp     2021-06-21 15:18:43.789260654 +0200
+@@ -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
+ {
+