From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 7 Jul 2020 08:55:35 +0000 (+0200)
Subject: - fix building with gcc 10
X-Git-Tag: auto/th/seamonkey-2.49.5-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fseamonkey.git;a=commitdiff_plain;h=9979841

- fix building with gcc 10
- rel 5
---

diff --git a/mozilla-1389436.patch b/mozilla-1389436.patch
new file mode 100644
index 0000000..af4f7cf
--- /dev/null
+++ b/mozilla-1389436.patch
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1502455819 -32400
+# Node ID 97dae871389b7f22a7096a020781b07a5a61de58
+# Parent  c73f64ef71d2d87f36008f5ff661f4050692bd06
+Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame
+
+diff --git a/mozilla/gfx/thebes/gfxFont.cpp b/mozilla/gfx/thebes/gfxFont.cpp
+index d0b747f..8d3dd8b 100644
+--- a/mozilla/gfx/thebes/gfxFont.cpp
++++ b/mozilla/gfx/thebes/gfxFont.cpp
+@@ -2614,6 +2614,18 @@ gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
+     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);
++
++
+ bool
+ gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
+ {
diff --git a/seamonkey.spec b/seamonkey.spec
index bae0cfd..d3893f3 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -31,7 +31,7 @@ Summary(pl.UTF-8):	SeaMonkey Community Edition - przeglądarka WWW
 Summary(pt_BR.UTF-8):	Navegador SeaMonkey Community Edition
 Name:		seamonkey
 Version:	2.49.5
-Release:	4
+Release:	5
 License:	MPL v2.0
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.xz
@@ -88,6 +88,7 @@ Patch4:		%{name}-system-virtualenv.patch
 Patch5:		%{name}-icu-detect.patch
 Patch6:		%{name}-glibc2.30.patch
 Patch7:		%{name}-crmf.patch
+Patch8:		mozilla-1389436.patch
 URL:		https://www.seamonkey-project.org/
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -584,6 +585,7 @@ unpack() {
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 cat << EOF > .mozconfig