https://github.com/LibreOffice/core/releases/tag/libreoffice-7.1.0.3
Created attachment 685722 [details] libreoffice-7.1.9999.ebuild --- /usr/local/portage/app-office/libreoffice/libreoffice-7.0.9999.ebuild 2021-01-20 14:27:21.069111762 +0100 +++ /usr/local/portage/app-office/libreoffice/libreoffice-7.1.9999.ebuild 2021-01-26 07:56:12.827159141 +0100 @@ -47,7 +47,7 @@ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz" + "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz" # QR code generating library for >=libreoffice-6.4, bug #691740 "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz" "base? ( @@ -143,7 +143,7 @@ dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error - dev-libs/liborcus:0/0.15 + dev-libs/liborcus:0/0.16 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt @@ -175,6 +175,7 @@ x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender + >=games-engines/box2d-2.4.1 accessibility? ( $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]') ) @@ -641,10 +642,6 @@ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) done - # bug 709450 - mkdir -p "${ED}"/usr/share/metainfo || die - mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die - rmdir "${ED}"/usr/share/appdata || die } pkg_postinst() {
Ping?
https://github.com/LibreOffice/core/releases/tag/libreoffice-7.1.1.1
(In reply to jospezial from comment #3) > https://github.com/LibreOffice/core/releases/tag/libreoffice-7.1.1.1 OK, yet another release it seems
(In reply to jospezial from comment #3) > https://github.com/LibreOffice/core/releases/tag/libreoffice-7.1.1.1 Do you know about https://bugs.gentoo.org/745813 ? Is the patches in there still needed for 7.1.1.1 ?
After changing all jdk and jre lines in the ebuild I could compile it against version 15. Why is a specific version set in the ebuild? Is it normal that with USE="-base" base executable is there and does run?
(In reply to jospezial from comment #6) > After changing all jdk and jre lines in the ebuild I could compile it > against version 15. What version are you talking about? (In reply to jospezial from comment #6) > Is it normal that with USE="-base" base executable is there and does run? Yes. It only manages expectations one would have as a user of base application. From description: > base: Enable full support for LibreOffice Base databases (involves additional bundled libs) Nowhere can you actually disable any of the main applications of LO, it is one binary.
(In reply to Andreas Sturmlechner from comment #7) > (In reply to jospezial from comment #6) > > After changing all jdk and jre lines in the ebuild I could compile it > > against version 15. > What version are you talking about? @@ -254,8 +254,8 @@ java? ( dev-java/ant-core || ( - dev-java/openjdk:11 - dev-java/openjdk-bin:11 + dev-java/openjdk:15 + dev-java/openjdk-bin:15 ) ) test? ( @@ -272,8 +272,8 @@ media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( - dev-java/openjdk:11 - dev-java/openjdk-jre-bin:11 + dev-java/openjdk:15 + dev-java/openjdk-jre-bin:15 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) @@ -551,10 +551,10 @@ --without-system-hsqldb --with-ant-home="${ANT_HOME}" ) - if has_version "dev-java/openjdk:11"; then - myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" ) - elif has_version "dev-java/openjdk-bin:11"; then - myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" ) + if has_version "dev-java/openjdk:15"; then + myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-15" ) + elif has_version "dev-java/openjdk-bin:15"; then + myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-15" ) fi ================================================================= Package Settings ================================================================= virtual/jre-15::pg_overlay was built with the following: USE="" ABI_X86="(64)" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" virtual/jdk-15::pg_overlay was built with the following: USE="" ABI_X86="(64)" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" dev-java/openjdk-bin-15.0.1_p9::pg_overlay was built with the following: USE="alsa cups gentoo-vm -headless-awt (-selinux) -source" ABI_X86="(64)" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" app-office/libreoffice-7.1.9999::overlay_jl was built with the following: USE="bluetooth branding clang cups dbus gstreamer gtk java kde mariadb pdfimport vulkan -accessibility -base -coinmp -custom-cflags -debug -eds -firebird -googledrive -ldap -odk -postgres -test" ABI_X86="(64)" LIBREOFFICE_EXTENSIONS="-nlpsolver -scripting-beanshell -scripting-javascript -wiki-publisher" PYTHON_SINGLE_TARGET="python3_8 -python3_7 -python3_9" FEATURES="multilib-strict merge-sync assume-digests network-sandbox unmerge-orphans userpriv usersandbox ebuild-locks ipc-sandbox preserve-libs news xattr binpkg-logs fixlafiles binpkg-docompress ccache strict usersync qa-unresolved-soname-deps distlocks parallel-fetch unmerge-logs sfperms protect-owned sandbox binpkg-multi-instance unknown-features-warn config-protect-if-modified userfetch binpkg-dostrip pid-sandbox" LDFLAGS="-Wl,-O1 -Wl,--as-needed -fuse-ld=lld" The ebuild does depend on specific version 11 of jre and jdk. Why not use what is chosen with eselect java-vm? eselect java-vm show Current system-vm openjdk-bin-15 Current user-vm (unset)
Keywords for dev-java/openjdk: | | u | | a a p s a r | n | | m r h p p s l i i m m | e u s | r | d a m p p c a x 3 p a s 6 i | a s l | e | 6 r 6 p p 6 r 8 9 h 6 c 8 p | p e o | p | 4 m 4 a c 4 c 6 0 a 4 v k s | i d t | o -----------+-----------------------------+--------+------- 8.272_p10 | + o + o o + o + o o o o o o | 6 o 8 | gentoo 8.282_p08 | ~ o ~ o o ~ o ~ o o o o o o | 6 o | gentoo -----------+-----------------------------+--------+------- 11.0.9_p11 | ~ ~ ~ o o ~ o o o o o o o o | 6 # 11 | gentoo 11.0.10_p9 | ~ ~ ~ o o ~ o o o o o o o o | 6 o | gentoo # emerge -vp openjdk-bin These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild R ] dev-java/openjdk-bin-11.0.10_p9:11::gentoo USE="alsa cups (-gentoo-vm) -headless-awt (-selinux) -source" 0 KiB We can't make users switch to openjdk as system vm as it is going to break their systems. As you can see, the IUSE is masked; the respective virtuals are masked. If you think this is not the case anymore, work with java proj to change that.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92487ce0347faa3a5a6c3a5728e6ce4e7c114e7d commit 92487ce0347faa3a5a6c3a5728e6ce4e7c114e7d Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-03-12 22:49:20 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-03-13 15:50:50 +0000 app-office/libreoffice: Update dependencies New dependency: games-engines/box2d-2.4.1 Raise dev-libs/liborcus slot dep to 0/0.16 Raise net-libs/neon minimum dep to 0.31.1 and add slot op Drop nonexistent blocker against app-office/openoffice Drop appdata downstream fix: Upstream commit e98c4be2c87ba5b3f4aedc31388014b320588d4b Update skia bundled tarball Thanks-to: jospezial <jospezial@gmx.de> Bug: https://bugs.gentoo.org/768570 Closes: https://bugs.gentoo.org/737720 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> app-office/libreoffice/Manifest | 1 + app-office/libreoffice/libreoffice-9999.ebuild | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8f0905caa89acd897e0c66cd9cdada49886bc8 commit 7f8f0905caa89acd897e0c66cd9cdada49886bc8 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-03-12 22:50:57 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-03-13 19:19:20 +0000 app-office/libreoffice: Add 7.1 stable branch Bug: https://bugs.gentoo.org/768570 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> app-office/libreoffice/libreoffice-7.1.9999.ebuild | 655 +++++++++++++++++++++ 1 file changed, 655 insertions(+)
Thank you for merging. But what about -with-jdk-home and --with-jdk-home ? This inconsistency looks wrong.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30400361cacfd0ede7d256fe75c8ab0ba0098584 commit 30400361cacfd0ede7d256fe75c8ab0ba0098584 Author: Andreas Sturmlechner <asturm@gentoo.org> AuthorDate: 2021-03-12 23:08:09 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2021-04-01 21:53:51 +0000 app-office/libreoffice: 7.1.2.2 version bump Bug: https://bugs.gentoo.org/768570 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> app-office/libreoffice/Manifest | 2 + app-office/libreoffice/libreoffice-7.1.2.2.ebuild | 655 ++++++++++++++++++++++ 2 files changed, 657 insertions(+)
arm64 done all arches done
