From ce7471cce94841a4e1ee35d359b9ce5e16fc3243 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 7 Dec 2023 23:11:42 +0000 Subject: gentoo auto-resync : 07:12:2023 - 23:11:42 --- app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'app-office/libreoffice/libreoffice-7.5.9.2.ebuild') diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild index b0ffc896108d..64d3859995c9 100644 --- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild @@ -101,8 +101,8 @@ RESTRICT="!test? ( test )" LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -# [[ ${MY_PV} == *9999* ]] || \ -# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -298,9 +298,12 @@ PATCHES=( # maybe upstreamable "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch" + # 7.6 branch + "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" # bug 881389 + # git master - "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" - "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" + "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" # bug 916621 + "${FILESDIR}/${P}-libxml2-2.12.patch" # bug 917691 ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -411,6 +414,9 @@ src_configure() { RANLIB=llvm-ranlib LDFLAGS+=" -fuse-ld=lld" + # Workaround for bug #907905 + filter-lto + # Workaround for bug #915067 append-ldflags -Wl,--undefined-version @@ -437,9 +443,6 @@ src_configure() { strip-flags fi - # Workaround for bug #907905 - filter-lto - export LO_CLANG_CC=${CC} export LO_CLANG_CXX=${CXX} -- cgit v1.2.3