commit: 104b4024f0ab61ac89430a63eff0b33c32dd1643
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 09:26:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 09:29:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104b4024
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 <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ----
2 files changed, 1 insertion(+), 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 9dc3659a431..e2865fbd55d 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 d1351356c1e..dbeed62a746 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}"
