Bug 929974 – app-office/libreoffice - Update to Rhino 1.7.15 , remove bundled

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description jospezial 2024-04-14 02:24:39 UTC]

https://github.com/LibreOffice/core/commit/58c4457a902c846229dc3383cc31bbc8f4b3aed9
"Update to latest Rhino 1.7.14"

https://github.com/LibreOffice/core/commit/479a39cbf0f4564abe93066d7a3f6b2e82de0e76
"clean up after removal of patched rhino"

In the ebuild we have
	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
	# requirement of rhino
	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"

but also
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )

I think we can now switch to use system rhino only.
For now only libreoffice-9999.ebuild to change.

[Comment 1 jospezial 2024-07-16 09:31:40 UTC]

https://github.com/LibreOffice/core/commit/450739e92e6f90060e5fdfa42ae291b1abaebd7a
" Rhino: upgrade to 1.7.15 "

[Comment 2 jospezial 2024-09-11 08:10:08 UTC]

-       # Does not build with 1.6 rhino at all
-       "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-       # requirement of rhino
-       "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"

-       libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+       libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.15:1.6 )

[Comment 3 jospezial 2024-09-11 08:37:16 UTC]

I think the dependency change to >=dev-java/rhino-1.7.15 is not really needed yet.
But remove the other obsolete lines from libreoffice-24.8 and higher.

[Comment 4 Larry the Git Cow 2024-10-05 13:54:12 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7c7501a6f296ca91716e29c06db818ee926e77

commit fa7c7501a6f296ca91716e29c06db818ee926e77
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2024-10-05 13:47:14 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2024-10-05 13:53:51 +0000

    app-office/libreoffice: update tarballs
    
    Thanks-to: jospezial <[e-mail]>
    Closes: https://bugs.gentoo.org/929974
    Closes: https://bugs.gentoo.org/936148
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 app-office/libreoffice/Manifest                | 1 +
 app-office/libreoffice/libreoffice-9999.ebuild | 9 +--------
 2 files changed, 2 insertions(+), 8 deletions(-)

[Comment 5 Larry the Git Cow 2025-02-24 02:37:46 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901fe14d546bb460dfdf86cb5c90bdf6020b988f

commit 901fe14d546bb460dfdf86cb5c90bdf6020b988f
Author:     Sam James <[e-mail]>
AuthorDate: 2025-02-24 02:36:00 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2025-02-24 02:37:23 +0000

    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 <[e-mail]>

 app-office/libreoffice/libreoffice-25.2.1.1.ebuild | 3 +++
 app-office/libreoffice/libreoffice-9999.ebuild     | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)