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>

diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
index 9dc3659a431ece812001ffdee605164dccaa697d..e2865fbd55d97bcccff5df6c45e3a0ee9eac08b8 100644 (file)
--- 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 d1351356c1eb7d6a5ae3c0f9e9a1d9a71dc09946..dbeed62a746f0abeb19e333c3b645ca1cbc84208 100644 (file)
--- 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}"