commit: 398d7c9a0098183c0ee5656417f93d8aaace8219 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 22 20:50:15 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 22 22:22:16 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=398d7c9a
app-office/libreoffice: update 9999 * As for bug #916435, accept defeat (not ideal) and filter -Werror=odr given it's "only" in the Vulkan bits (as in FF). * With regard to bug #902031, go with the suggested USE="gtk3 gtk4" for now but I rather suspect we'll change this in short-order to USE=gtk => gtk4. Thanks to jospezial for rebasing the build system patch and providing the starting diff for 9999. Bug: https://bugs.gentoo.org/902031 Bug: https://bugs.gentoo.org/946921 Closes: https://bugs.gentoo.org/916435 Closes: https://bugs.gentoo.org/942831 Signed-off-by: Sam James <sam <AT> gentoo.org> app-office/libreoffice/Manifest | 4 +- .../files/libreoffice-25.2-unused-qt6network.patch | 45 +++++++++++++++++++++ app-office/libreoffice/libreoffice-9999.ebuild | 46 ++++++++++++++++------ 3 files changed, 81 insertions(+), 14 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 0156cd6b98c6..6e9edfcbade5 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -8,7 +8,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6 DIST Java-WebSocket-1.5.4.tar.gz 189725 BLAKE2B f90700d58d7230e1a3ab32d07bdfc11a1ec6ceffbc094b4b0dc8bfd83cf1d060400c758de8bf47fb593dd07927f95a9e7ab70617b4a1afb64b09e225771b2c5e SHA512 e195ccaa97a7f167a7b27a28226a0bccde7a5cc3cde9b3e718860bd7ceb86da2c272ec2512cb1d0d893dbd6ac47633978a44a8620a2ffbb0652aaeeb2c4ecb08 -DIST Java-WebSocket-1.5.6.tar.gz 190604 BLAKE2B bdaa36313872d0489125d1fcd487a978cc7b82e8ad8084e447d92d052fcfa67f1a9042e45bdbee486b19ea2d18b622572246bb4ce4564618c7c7ab21aa073b9c SHA512 452c28af503ec184ece224fadcab0fed718fb6d71856c552160075a287c1473d31aae0ac0094de31619b195d7a5aa0015d03f2f448c8c5af0f21c67b1d9c3ca1 +DIST Java-WebSocket-1.6.0.tar.gz 190202 BLAKE2B 52580e9a0150b01224953c83a3c72029bff2342b057487d4724b8b75cb9a8703a8858a09a36f95ccb82a071e7953a82699b03cfcd7916dab509bc2d3c6a056b1 SHA512 50b5cfccd9be0b23c97258fab752fb4a482f6496c80e7a25640c7cea35dca195240b6f260e4a435fe7f1cfdfc5b207b879a3b2bea10f7bb29425b2cc49653cc9 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec @@ -20,10 +20,12 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e +DIST frozen-1.2.0.tar.gz 187169 BLAKE2B 24844542dda345faad45ee9dd35a6fe165998f6aa2c4e16021567982fcaff7b7b5d25b53ff1f7207c67c3cd47b321233dab56c4bbe53738fbaaa3c2334771cf4 SHA512 644b29f60458fc5193a3fb16a347c190f9694d1bdbc75202aafe8d43eb72ce0433bbeaeb692f8ca485000d68b451ddc0236a1880ebbd64477f73198043d046b3 DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114 DIST libreoffice-24.2.7.2-patchset.tar.xz 37528 BLAKE2B 5b486fdd47cf46a01a2dd0b404ffb6eba2428c5365b4a7097d7058bb655999039f411a095e3d756a3aa6c63f6746375b06ca9fb45dc6335684094fab9bb86ee0 SHA512 71f5b0bcbfefdbfceb776b8237304ad24b15d5ed0ccad614ea7e2d58d0cbddecc896d329563631e73ca846fdbfa864417bb2dfce348ea516f7ed2f62c24abcda DIST libreoffice-24.2.7.2.tar.xz 279885536 BLAKE2B 850afbe1ca6bfec23e9fec6d323980e4a66e7789aaa388fb56f2195d9d498e696ef209675ab3adb56336db357835e48f9c1e3b6d5713b8e79bab85f1cfb02563 SHA512 f5e9cfc9d37d4890f691fbdf424e68623bbb37d8a9910aad1dc1e26cb4d38f6e5ca15f5bceb08d1cac6cbc37a3ddb0e50b873405e9f277e199bf08d0838346da DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-24.2.7.2.tar.xz 167015000 BLAKE2B 4db61acc5dff6e86d3b94081b210c95cff2bc12c5e6a22623fe765a635d52c26f19c23f36041079c61707839fd0378f62402d1ebcfb7ea43436d303c2ce75e63 SHA512 cda8912ed46515fad0044ba8e6339cacfcee259f3ef0f84d3cc7a8fbd416754ee97eecbe7791ed0eaf6ae33cc4ade88122e0968fc4e68417dad4b2da02c25b32 DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 +DIST skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz 14368844 BLAKE2B 2ed86c0e418474e496e340007f827c14f4340c08fcf4ae6bed299e0550489ada1c1b644a18163fe08b9ddc5d9eaa9e042db20ae7898fb036609df693c8bdebac SHA512 8739b2e8b578accae14928473fb479d7014e9181dc7f363230282d4282f950f1006b2bcd746c12028fb86aeffdfd7d837435d09480cfe94714e81f8365dcf954 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 diff --git a/app-office/libreoffice/files/libreoffice-25.2-unused-qt6network.patch b/app-office/libreoffice/files/libreoffice-25.2-unused-qt6network.patch new file mode 100644 index 000000000000..6bb3a1f0b1bc --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-25.2-unused-qt6network.patch @@ -0,0 +1,45 @@ +From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Tue, 12 Mar 2024 21:40:25 +0100 +Subject: [PATCH] Drop unused QtNetwork dependency, fix KDE terminology + +'KDE version' -> 'KDE Frameworks version' + +Change-Id: I2e6a912be93d79b251dcf32c20796374c9ca9cf2 +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01cb56658cff..5c94e843175a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13756,7 +13756,7 @@ then + + QT6_CFLAGS="-I$qt6_incdir -DQT_NO_VERSION_TAGGING" + QT6_CFLAGS=$(printf '%s' "$QT6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") +- QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" ++ QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets" + if test "$_os" = "Emscripten"; then + QT6_LIBS="$QT6_LIBS -lQt6BundledPcre2 -lQt6BundledZLIB -L${qt6_platformsdir} -lqwasm -sGL_ENABLE_GET_PROC_ADDRESS" + else +@@ -13947,7 +13947,7 @@ then + fi + + KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_NO_VERSION_TAGGING" +- KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" ++ KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets" + KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + + AC_LANG_PUSH([C++]) +@@ -13962,7 +13962,7 @@ int main(int argc, char **argv) { + static_assert(KCOREADDONS_VERSION_MAJOR == 6); + return 0; + } +- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[]) ++ ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi + diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 72dd4f135404..7ebc8b86b5ef 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -49,13 +49,13 @@ ADDONS_SRC=( # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c "${ADDONS_URI}/dtoa-20180411.tgz" # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen - "${ADDONS_URI}/frozen-1.1.1.tar.gz" + "${ADDONS_URI}/frozen-1.2.0.tar.gz" # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz" + "${ADDONS_URI}/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz" # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz" + "base? ( - ${ADDONS_URI}/commons-logging-1.2-src.tar.gz ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip @@ -70,7 +70,7 @@ ADDONS_SRC=( )" # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket "java? ( - ${ADDONS_URI}/Java-WebSocket-1.5.6.tar.gz + ${ADDONS_URI}/Java-WebSocket-1.6.0.tar.gz ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? @@ -93,7 +93,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan +googledrive gstreamer gtk3 gtk4 kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -166,7 +166,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libzmf media-libs/openjpeg:= media-libs/tiff:= - media-libs/zxing-cpp:= + >=media-libs/zxing-cpp-2.3.0:= net-misc/curl sci-mathematics/lpsolve:= sys-libs/zlib @@ -194,7 +194,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) - gtk? ( + gtk3? ( app-accessibility/at-spi2-core:2 dev-libs/glib:2 dev-libs/gobject-introspection @@ -203,6 +203,14 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gtk+:3[X] x11-libs/pango ) + gtk4? ( + app-accessibility/at-spi2-core:2 + dev-libs/glib:2 + gnome-base/dconf + media-libs/mesa[egl(+)] + gui-libs/gtk[X] + x11-libs/pango + ) kde? ( kde-frameworks/kconfig:6 kde-frameworks/kcoreaddons:6 @@ -228,7 +236,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 @@ -297,8 +305,7 @@ PATCHES=( "${FILESDIR}/${PN}-24.2-qtdetect.patch" # TODO: upstream - "${FILESDIR}/${PN}-24.8-unused-qt5network.patch" - "${FILESDIR}/${PN}-24.8-unused-qt6network.patch" + "${FILESDIR}/${PN}-25.2-unused-qt6network.patch" ) _check_reqs() { @@ -429,6 +436,10 @@ src_configure() { sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die fi + # Workaround for bug #916435. Not ideal but www-client/firefox has + # the same issue. + filter-flags '-Werror=odr' + if use custom-cflags ; then elog "USE=custom-cflags has been selected. You are on your own to make sure that" elog "the build succeeds. Good luck!" @@ -473,6 +484,8 @@ src_configure() { # --without-system-sane: just sane.h header that is used for scan in writer, # not linked or anything else, worthless to depend on # --disable-pdfium: not yet packaged + # --disable-qt6-multimedia: TODO + # --disable-cpdb: not yet packaged local myeconfargs=( --with-system-dicts --with-system-epoxy @@ -490,14 +503,19 @@ src_configure() { --disable-breakpad --disable-bundle-mariadb --disable-ccache + --disable-cpdb --disable-epm --disable-fetch-external --disable-firebird-sdbc --disable-gtk3-kde5 + # Coveered by our own toolchain defaults + --disable-hardening-flags --disable-online-update --disable-openssl --disable-pdfium --disable-qt5 + --disable-qt6-multimedia + --without-dotnet --with-extra-buildid="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -522,6 +540,7 @@ src_configure() { --without-system-libfixmath --without-system-sane --without-system-zxcvbn + --without-system-java-websocket $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) @@ -530,7 +549,8 @@ src_configure() { $(use_enable debug) $(use_enable eds evolution2) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk gtk3) + $(use_enable gtk3 gtk3) + $(use_enable gtk4 gtk4) $(use_enable kde kf6) $(use_enable ldap) $(use_enable odk) @@ -547,7 +567,7 @@ src_configure() { $(use_with valgrind) ) - if use eds || use gtk; then + if use eds || use gtk3 || use gtk4; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -600,7 +620,7 @@ src_install() { emake DESTDIR="${D}" distro-pack-install -o build -o check # bug 593514 - if use gtk; then + if use gtk3; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi
