From f75c1613db67f4067643d0218a2db3235e42ec9f Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Thu, 3 Feb 2022 19:46:13 +0000
Subject: [PATCH] Small update vs latest code in poppler

git-svn-id: svn://scribus.net/trunk/Scribus@24885 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/plugins/import/pdf/slaoutput.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 3650c96f52..a6f4e00fa9 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3072,10 +3072,10 @@ void SlaOutputDev::updateFont(GfxState *state)
 		delete id;
 	else
 	{
-		if (!(fontLoc = gfxFont->locateFont(xref, nullptr)))
+		fontLoc = gfxFont->locateFont((xref) ? xref : pdfDoc->getXRef(), nullptr);
+		if (!fontLoc)
 		{
-			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
-			gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
 			goto err2;
 		}
 
/a><a href='/guix/tree/gnu/build/svg.scm?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>tree</a><a href='/guix/commit/gnu/build/svg.scm?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>commit</a><a href='/guix/diff/gnu/build/svg.scm?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/svg.scm'>
<input type='hidden' name='id' value='92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>root</a>/<a href='/guix/log/gnu?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>gnu</a>/<a href='/guix/log/gnu/build?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>build</a>/<a href='/guix/log/gnu/build/svg.scm?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f'>svg.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/svg.scm?id=92c4b7c0fd74b4e71ad70bd94211e4dba35a012f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-06-01 15:21:28 +0200'>2018-06-01</span></td><td><a href='/guix/commit/gnu/build/svg.scm?id=33d8a871042e73d6b236793d02e5a8287a47ebe4'>bootloader: grub: Use 'with-extensions'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/grub.scm (svg-&gt;png): Use 'with-extensions'.  Remove
'add-to-load-path' calls.
* gnu/build/svg.scm: Use (rsvg) and (cairo) the normal way.  Remove
'module-autoload!' calls.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-02 22:52:30 +0200'>2017-07-02</span></td><td><a href='/guix/commit/gnu/build/svg.scm?id=1b0f266e40aead09be95a984bd9c6cec3dff397e'>gnu: Switch guile-cairo and dependents to Guile 2.2 again.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/27551&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

This reinstates the following commits:

  e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2.
  ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5.
  0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd.
  66b9183c4 * gnu: guile-lib: Switch to Guile 2.2.

and adds the following changes:

* gnu/bootloader/grub.scm (svg-&gt;png): Add 'package-&gt;derivation' call for
GUILE-2.2.  Pass #:guile-for-build to 'gexp-&gt;derivation'.
* gnu/build/svg.scm (svg-&gt;png): Add 'em' and 'ex' to the 'let-values'
form to account for all the values returned by
'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate.
</span></span></td><td>Ludovic Courtès</td></tr>