commit: b4c74c43f12595719f80069f30131e8007fe43fa Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Sep 2 18:24:50 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 2 18:25:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c74c43
app-office/libreoffice: Foward-port missing ~loong changes to live - Add poppler-22.09.0.patch to 7.3 stable branch ebuild too - Also return to our usual notation of patch origin (branch, status). See also: https://github.com/gentoo/gentoo/pull/26832 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 +++- app-office/libreoffice/libreoffice-7.3.9999.ebuild | 11 +++++++---- app-office/libreoffice/libreoffice-9999.ebuild | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild index 92051c1009c6..83d67af61341 100644 --- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild @@ -294,8 +294,10 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" - # Upstream + # 7.4 branch "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" + + # pending upstream "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch" ) diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild index 69651435d7d7..a6c93546a6ed 100644 --- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild @@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org"; SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"; +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"; # Split modules following git/tarballs; Core MUST be first! # Help is used for the image generator @@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -287,15 +287,18 @@ else fi PATCHES=( - # "${WORKDIR}"/${PATCHSET/.tar.xz/} + "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" - # Upstream + # 7.4 branch "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch" + + # pending upstream + "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index f7ff3494a447..decb622507ab 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" #[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" +#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip
