summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-01-08 21:31:46 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-01-09 10:51:42 +0100
commitc852d4be4693df8f538b4e15eaebae4053f1c25c (patch)
tree6f61762b18df891668e2eaec734e4611a376ec1c /app-office/libreoffice/libreoffice-6.2.9999.ebuild
parentapp-text/libodfgen: Drop 0.1.6 (diff)
downloadgentoo-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>
Diffstat (limited to 'app-office/libreoffice/libreoffice-6.2.9999.ebuild')
-rw-r--r--app-office/libreoffice/libreoffice-6.2.9999.ebuild7
1 files changed, 2 insertions, 5 deletions
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}"