diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-08 21:31:46 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-09 10:51:42 +0100 |
| commit | c852d4be4693df8f538b4e15eaebae4053f1c25c (patch) | |
| tree | 6f61762b18df891668e2eaec734e4611a376ec1c | |
| parent | app-text/libodfgen: Drop 0.1.6 (diff) | |
| download | gentoo-c852d4be4693df8f538b4e15eaebae4053f1c25c.tar.gz gentoo-c852d4be4693df8f538b4e15eaebae4053f1c25c.tar.bz2 gentoo-c852d4be4693df8f538b4e15eaebae4053f1c25c.zip | |
app-office/libreoffice: Patch was accepted upstream
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch | 25 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 |
2 files changed, 23 insertions, 9 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch index 07e7a17d2f2d..7f0b1f71a1ee 100644 --- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch +++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch @@ -1,6 +1,21 @@ ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-01-07 23:10:04.301278414 +0100 -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-01-07 23:29:11.653479068 +0100 -@@ -555,7 +555,11 @@ +From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 8 Jan 2019 11:24:40 +0100 +Subject: Fix build with poppler-0.72 + +Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134 +Reviewed-on: https://gerrit.libreoffice.org/65960 +Tested-by: Jenkins +Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 101e3be..dab405b 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*) LinkAction* pAction = link->getAction(); if (pAction && pAction->getKind() == actionURI) { @@ -12,7 +27,7 @@ std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); -@@ -757,7 +761,11 @@ +@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state) aFont = it->second; @@ -24,3 +39,5 @@ printf( " %d %d %d %d %f %d %s", aFont.isEmbedded, aFont.isBold, +-- +cgit v1.1 diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index f50c9dc30712..d1351356c1eb 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -253,11 +253,8 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" # master branch - "${FILESDIR}/${PN}-6.2.0.1-poppler-0.71-1.patch" - "${FILESDIR}/${PN}-6.2.0.1-poppler-0.71-2.patch" - - # pending upstream - "${FILESDIR}/${PN}-6.2.0.1-poppler-0.72.patch" + "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch + "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch ) S="${WORKDIR}/${PN}-${MY_PV}" |