summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-01-16 10:26:23 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-01-16 10:29:28 +0100
commit104b4024f0ab61ac89430a63eff0b33c32dd1643 (patch)
tree7ae744d7059512df733334aac07dd8efbb980fd0 /app-office/libreoffice
parentdev-util/shellcheck-bin: add ~arm, amd64 stable (diff)
downloadgentoo-104b4024f0ab61ac89430a63eff0b33c32dd1643.tar.gz
gentoo-104b4024f0ab61ac89430a63eff0b33c32dd1643.tar.bz2
gentoo-104b4024f0ab61ac89430a63eff0b33c32dd1643.zip
app-office/libreoffice: poppler patches upstreamed to 6.1/6.2 branch
Package-Manager: Portage-2.3.55, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/libreoffice-6.2.0.2.ebuild2
-rw-r--r--app-office/libreoffice/libreoffice-6.2.9999.ebuild4
2 files changed, 1 insertions, 5 deletions
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
index 9dc3659a431e..e2865fbd55d9 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -253,7 +253,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
- # master branch
+ # 6.2 branch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
"${FILESDIR}"/${P}-poppler-0.73.patch
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index d1351356c1eb..dbeed62a746f 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -251,10 +251,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${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}"