| 1 |
commit: 104b4024f0ab61ac89430a63eff0b33c32dd1643 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 16 09:26:23 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 16 09:29:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104b4024 |
| 7 |
|
| 8 |
app-office/libreoffice: poppler patches upstreamed to 6.1/6.2 branch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.55, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 2 +- |
| 14 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ---- |
| 15 |
2 files changed, 1 insertion(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
| 18 |
index 9dc3659a431..e2865fbd55d 100644 |
| 19 |
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
| 20 |
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild |
| 21 |
@@ -253,7 +253,7 @@ PATCHES=( |
| 22 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 23 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 24 |
|
| 25 |
- # master branch |
| 26 |
+ # 6.2 branch |
| 27 |
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch |
| 28 |
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch |
| 29 |
"${FILESDIR}"/${P}-poppler-0.73.patch |
| 30 |
|
| 31 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 32 |
index d1351356c1e..dbeed62a746 100644 |
| 33 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 34 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 35 |
@@ -251,10 +251,6 @@ PATCHES=( |
| 36 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 37 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 38 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 39 |
- |
| 40 |
- # master branch |
| 41 |
- "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch |
| 42 |
- "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch |
| 43 |
) |
| 44 |
|
| 45 |
S="${WORKDIR}/${PN}-${MY_PV}" |
Archives