From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1066921-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 E9F38138334
for <garchives@archives.gentoo.org>; Mon, 14 Jan 2019 23:34:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C920DE0A01;
Mon, 14 Jan 2019 23:34:46 +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 91EA0E0A01
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jan 2019 23:34:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 9AF70335D1D
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jan 2019 23:34:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADF044ED
for <gentoo-commits@lists.gentoo.org>; Mon, 14 Jan 2019 23:34:42 +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: <1547508865.635e0dd7cf4a58a29f6fb44b1e0e39371e3e60bb.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/Manifest app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch app-office/scribus/scribus-1.5.5_pre20181227.ebuild app-office/scribus/scribus-1.5.5_pre20190113.ebuild
X-VCS-Directories: app-office/scribus/files/ app-office/scribus/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 635e0dd7cf4a58a29f6fb44b1e0e39371e3e60bb
X-VCS-Branch: master
Date: Mon, 14 Jan 2019 23:34:42 +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: 470d5881-cde7-415e-ac09-fa756c69968d
X-Archives-Hash: 64513f6ca57dc0aa509fca254cf79320
commit: 635e0dd7cf4a58a29f6fb44b1e0e39371e3e60bb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 22:26:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 23:34:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635e0dd7
app-office/scribus: 1.5.5_pre20190113 snapshot, build w/ poppler-0.73
Bug: https://bugs.gentoo.org/674804
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/scribus/Manifest | 2 +-
.../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 ++++++++++++++++++++++
...227.ebuild => scribus-1.5.5_pre20190113.ebuild} | 3 ++-
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index ee5658be540..4e57dbe3b39 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,3 @@
DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
-DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797
+DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
new file mode 100644
index 00000000000..af98da7050c
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
@@ -0,0 +1,24 @@
+From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 14 Jan 2019 23:58:59 +0100
+Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73
+
+---
+ scribus/plugins/import/pdf/slaoutput.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
+index c46448b..83e010c 100644
+--- a/scribus/plugins/import/pdf/slaoutput.h
++++ b/scribus/plugins/import/pdf/slaoutput.h
+@@ -28,7 +28,6 @@ for which a new license (GPL+exception) is in place.
+ #include "selection.h"
+ #include "vgradient.h"
+
+-#include <poppler/goo/gtypes.h>
+ #include <poppler/Object.h>
+ #include <poppler/OutputDev.h>
+ #include <poppler/Gfx.h>
+--
+2.20.1
+
diff --git a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
similarity index 98%
rename from app-office/scribus/scribus-1.5.5_pre20181227.ebuild
rename to app-office/scribus/scribus-1.5.5_pre20190113.ebuild
index b92edd436ae..77540ffb19b 100644
--- a/app-office/scribus/scribus-1.5.5_pre20181227.ebuild
+++ b/app-office/scribus/scribus-1.5.5_pre20190113.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=d857c1a3430acf207cdde2512db6822c45e98732
+COMMIT=6326f2af85935842fa7a93eb8f86bd2ae698245e
inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils
DESCRIPTION="Desktop publishing (DTP) and layout program"
@@ -94,6 +94,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+ "${FILESDIR}"/${P}-poppler-0.73.patch
)
S="${WORKDIR}"/${PN}-${COMMIT}