From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1135578-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C6375138334
for <garchives@archives.gentoo.org>; Thu, 2 Jan 2020 20:27:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E35C3E08DB;
Thu, 2 Jan 2020 20:27:01 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 91641E08DB
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jan 2020 20:27:01 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 135DA34DE6B
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jan 2020 20:27:00 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AC32E74
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Jan 2020 20:26:57 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1577996802.4ffdbba60050b08a2f1546481e699b65c69e1529.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch app-office/scribus/scribus-1.5.5.ebuild
X-VCS-Directories: app-office/scribus/files/ app-office/scribus/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 4ffdbba60050b08a2f1546481e699b65c69e1529
X-VCS-Branch: master
Date: Thu, 2 Jan 2020 20:26:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 22342940-807b-4a8f-a4d2-4413dbc0a672
X-Archives-Hash: 520d86ad7298e7787cdc30dc1f7fddc7
commit: 4ffdbba60050b08a2f1546481e699b65c69e1529
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 2 20:00:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 2 20:26:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffdbba6
app-office/scribus: Fix build with app-text/poppler-0.84.0
Reported-by: Erik Zeek <zeekec <AT> gmail.com>
Thanks-to: Julien Papasian <julien.papasian <AT> gmail.com>
Closes: https://bugs.gentoo.org/704482
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 ++++++++++++++++++++++
app-office/scribus/scribus-1.5.5.ebuild | 3 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
new file mode 100644
index 00000000000..de1f39411e8
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
@@ -0,0 +1,34 @@
+From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Sat, 28 Dec 2019 21:32:29 +0000
+Subject: [PATCH] Fix failure to build with poppler 0.84.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23429 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index ffcfa8450b..d788f9f06c 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
+ catalog = catA;
+ pdfDoc = doc;
+ updateGUICounter = 0;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
++ m_fontEngine = new SplashFontEngine(true, true, true, true);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true);
++#else
+ m_fontEngine = new SplashFontEngine(
+ #if HAVE_T1LIB_H
+ globalParams->getEnableT1lib(),
+@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA)
+ true,
+ #endif
+ true);
++#endif
+ }
+
+ void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index cd725acf6b8..88bcd5cc441 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
# upstream svn trunk
"${FILESDIR}"/${P}-poppler-0.82.patch
"${FILESDIR}"/${P}-poppler-0.83.patch
+ "${FILESDIR}"/${P}-poppler-0.84.patch
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch