commit: edbddd3dd4c8694292676e64334a8a4debf197f2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 13 14:41:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 13 14:41:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbddd3d
app-office/libreoffice: unbundle dev-libs/zxcvbn-c ~loong is gone for now because of this. This also fixes the build w/ GCC 16. Bug: https://bugs.gentoo.org/916961 Bug: https://bugs.gentoo.org/957541 Closes: https://bugs.gentoo.org/957161 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ffice-25.2.9999.ebuild => libreoffice-25.2.4.3-r1.ebuild} | 12 +++++++----- app-office/libreoffice/libreoffice-25.2.9999.ebuild | 3 ++- app-office/libreoffice/libreoffice-9999.ebuild | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild similarity index 99% copy from app-office/libreoffice/libreoffice-25.2.9999.ebuild copy to app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild index 44c9dc50b74f..9bfd86db0472 100644 --- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.4.3-r1.ebuild @@ -87,7 +87,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux" # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" @@ -147,6 +147,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 + dev-libs/zxcvbn-c >=dev-libs/xmlsec-1.2.35:=[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge @@ -293,12 +294,13 @@ PATCHES=( "${FILESDIR}/${PN}-24.2-qtdetect.patch" "${FILESDIR}/${PN}-25.2-cflags.patch" - # git master - "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" - # add qt6 backend as possible fallback for gtk-based desktop environments: # https://bugs.gentoo.org/950170 "${FILESDIR}/${PN}-25.2-vcl-backend-fallback.patch" + + # git master: + "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" + "${FILESDIR}/${PN}-25.2.3.2-poppler-25.05.patch" ) _check_reqs() { @@ -545,13 +547,13 @@ src_configure() { --with-help="html" --without-helppack-integration --with-system-gpgmepp + --with-system-zxcvbn --without-system-abseil --without-system-dragonbox --without-system-frozen --without-system-jfreereport --without-system-libfixmath --without-system-sane - --without-system-zxcvbn --without-system-java-websocket $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) diff --git a/app-office/libreoffice/libreoffice-25.2.9999.ebuild b/app-office/libreoffice/libreoffice-25.2.9999.ebuild index 44c9dc50b74f..e147e4b172b4 100644 --- a/app-office/libreoffice/libreoffice-25.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.9999.ebuild @@ -147,6 +147,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 + dev-libs/zxcvbn-c >=dev-libs/xmlsec-1.2.35:=[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge @@ -545,13 +546,13 @@ src_configure() { --with-help="html" --without-helppack-integration --with-system-gpgmepp + --with-system-zxcvbn --without-system-abseil --without-system-dragonbox --without-system-frozen --without-system-jfreereport --without-system-libfixmath --without-system-sane - --without-system-zxcvbn --without-system-java-websocket $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 0e1ac0f460dc..6b96c509753b 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -147,6 +147,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 + dev-libs/zxcvbn-c >=dev-libs/xmlsec-1.2.35:=[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge @@ -531,13 +532,13 @@ src_configure() { --with-help="html" --without-helppack-integration --with-system-gpgmepp + --with-system-zxcvbn --without-system-abseil --without-system-dragonbox --without-system-frozen --without-system-jfreereport --without-system-libfixmath --without-system-sane - --without-system-zxcvbn --without-system-java-websocket $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth)
