From 901fe14d546bb460dfdf86cb5c90bdf6020b988f Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 24 Feb 2025 02:36:00 +0000 Subject: [PATCH] app-office/libreoffice: restore rhino configure arg I *think* dropping that src_configure line was a mistake (in fa7c7501a6f296ca91716e29c06db818ee926e77). We would either want to download a copy, or we'd use the system one and pass the configure arg. We dropped downloading a copy, therefore we surely want the configure arg. And the dep wasn't dropped anyway. Bug: https://bugs.gentoo.org/929974 Closes: https://bugs.gentoo.org/950212 Signed-off-by: Sam James --- app-office/libreoffice/libreoffice-25.2.1.1.ebuild | 3 +++ app-office/libreoffice/libreoffice-9999.ebuild | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild index 40944770c7f7b..53bd4a8178d44 100644 --- a/app-office/libreoffice/libreoffice-25.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-25.2.1.1.ebuild @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi tc-is-lto && myeconfargs+=( --enable-lto ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 40944770c7f7b..bde82a65e1312 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -227,7 +227,7 @@ DEPEND="${COMMON_DEPEND} dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 + dev-util/mdds:1/3.0 media-libs/glm x11-base/xorg-proto x11-libs/libXt @@ -626,6 +626,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi tc-is-lto && myeconfargs+=( --enable-lto )