| 1 |
commit: b4c74c43f12595719f80069f30131e8007fe43fa |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 18:24:50 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 18:25:57 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c74c43 |
| 7 |
|
| 8 |
app-office/libreoffice: Foward-port missing ~loong changes to live |
| 9 |
|
| 10 |
- Add poppler-22.09.0.patch to 7.3 stable branch ebuild too |
| 11 |
- Also return to our usual notation of patch origin (branch, status). |
| 12 |
|
| 13 |
See also: https://github.com/gentoo/gentoo/pull/26832 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 +++- |
| 17 |
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 11 +++++++---- |
| 18 |
app-office/libreoffice/libreoffice-9999.ebuild | 2 +- |
| 19 |
3 files changed, 11 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 22 |
index 92051c1009c6..83d67af61341 100644 |
| 23 |
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 24 |
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild |
| 25 |
@@ -294,8 +294,10 @@ PATCHES=( |
| 26 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 27 |
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" |
| 28 |
|
| 29 |
- # Upstream |
| 30 |
+ # 7.4 branch |
| 31 |
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" |
| 32 |
+ |
| 33 |
+ # pending upstream |
| 34 |
"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch" |
| 35 |
) |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 39 |
index 69651435d7d7..a6c93546a6ed 100644 |
| 40 |
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 41 |
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild |
| 42 |
@@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult |
| 43 |
DESCRIPTION="A full office productivity suite" |
| 44 |
HOMEPAGE="https://www.libreoffice.org" |
| 45 |
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" |
| 46 |
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" |
| 47 |
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}" |
| 48 |
|
| 49 |
# Split modules following git/tarballs; Core MUST be first! |
| 50 |
# Help is used for the image generator |
| 51 |
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 52 |
SLOT="0" |
| 53 |
|
| 54 |
[[ ${MY_PV} == *9999* ]] || \ |
| 55 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" |
| 56 |
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux" |
| 57 |
|
| 58 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 59 |
app-arch/unzip |
| 60 |
@@ -287,15 +287,18 @@ else |
| 61 |
fi |
| 62 |
|
| 63 |
PATCHES=( |
| 64 |
- # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 65 |
+ "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 66 |
|
| 67 |
# not upstreamable stuff |
| 68 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 69 |
"${FILESDIR}/${PN}-6.1-nomancompress.patch" |
| 70 |
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" |
| 71 |
|
| 72 |
- # Upstream |
| 73 |
+ # 7.4 branch |
| 74 |
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" |
| 75 |
+ |
| 76 |
+ # pending upstream |
| 77 |
+ "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch" |
| 78 |
) |
| 79 |
|
| 80 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 81 |
|
| 82 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 83 |
index f7ff3494a447..decb622507ab 100644 |
| 84 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 85 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 86 |
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 87 |
SLOT="0" |
| 88 |
|
| 89 |
#[[ ${MY_PV} == *9999* ]] || \ |
| 90 |
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" |
| 91 |
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux" |
| 92 |
|
| 93 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 94 |
app-arch/unzip |
Archives