commit: 9d9bf65384f04e9f25d598c65428784a9bbeed2e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 16 18:25:26 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 16 18:39:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9bf653
app-office/scribus: Improve poppler-0.73 patch Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../scribus-1.5.5_pre20190113-poppler-0.73.patch | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 index af98da7050c..f63f4c6d1ee 100644 --- 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 @@ -1,24 +1,24 @@ -From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <ast...@gentoo.org> -Date: Mon, 14 Jan 2019 23:58:59 +0100 -Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73 +From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <jgh...@libertysurf.fr> +Date: Wed, 16 Jan 2019 00:30:35 +0000 +Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure +git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870 --- - scribus/plugins/import/pdf/slaoutput.h | 1 - - 1 file changed, 1 deletion(-) + scribus/plugins/import/pdf/slaoutput.h | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index c46448b..83e010c 100644 +index c46448b80a..4dac7c3983 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. +@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place. #include "selection.h" #include "vgradient.h" --#include <poppler/goo/gtypes.h> ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) + #include <poppler/goo/gtypes.h> ++#endif #include <poppler/Object.h> #include <poppler/OutputDev.h> #include <poppler/Gfx.h> --- -2.20.1 -
