commit: fdd726d74596fbbb199336e4c0c81b769b0b5e99 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 26 20:49:38 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 26 20:49:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd726d7
app-office/libreoffice: drop 24.2.7.2 Closes: https://bugs.gentoo.org/948833 Bug: https://bugs.gentoo.org/948825 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/Manifest | 2 - ...reoffice-24.2.7.2-no-std-basic_string-int.patch | 119 ---- .../files/libreoffice-24.2.7.2-poppler-24.12.patch | 38 -- app-office/libreoffice/libreoffice-24.2.7.2.ebuild | 706 --------------------- 4 files changed, 865 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d78f793511b6..5e53caa64e34 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,5 +1,4 @@ DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a -DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 BLAKE2B e02fced286aab6f6597b04bba37186e6f7d0793ef807c4530e15da5464e9302880278472fdc79dc27a9be15600127bebe30651a6027ef1b0a7cfc40ce56a395a SHA512 a7c3044a0a7c67881f78eddc4b3faf05e29b20755a59cdbb9a0a49bd21be5aaa95d4ea5eaabdd6f005a421981fb7c55fee590d4c9592fe363ba27ae590652bd4 @@ -21,7 +20,6 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3 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-25.2.1.1.tar.xz 281724020 BLAKE2B a9c297309329d639ff05cd7cd8b7af8349a0fe562ceccd8ae99758535f55a27464d073fc6a8595078c5bd3d012c4b0d45af590efdd8c4b663bcb165c5d01fe06 SHA512 705600229d7aaf2f681a6a6ee71bbc9920251747781770eb5fef0ed79342b031ec10630fd0ae7f5613cca238ac512639739fc31134424b04f6ab52bf389f902b diff --git a/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch b/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch deleted file mode 100644 index d95adb050df2..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch +++ /dev/null @@ -1,119 +0,0 @@ -https://git.libreoffice.org/core/commit/d91ab7de467abea6c01c9dd8473f81ac1f29513c -From d91ab7de467abea6c01c9dd8473f81ac1f29513c Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <[email protected]> -Date: Tue, 6 Feb 2024 13:27:59 +0100 -Subject: [PATCH] external/zxcvbn-c: There is no std::basic_string<int> - -...and at least LLVM 19 trunk libc++ complains about it now since -<c3668779c13596e223c26fbd49670d18cd638c40> "[libc++] Remove deprecated -char_traits base template (#72694)" with - -> In file included from dict-generate.cpp:25: -> In file included from ~/llvm/inst/bin/../include/c++/v1/iostream:43: -> In file included from ~/llvm/inst/bin/../include/c++/v1/ios:223: -> In file included from ~/llvm/inst/bin/../include/c++/v1/__locale:24: -> ~/llvm/inst/bin/../include/c++/v1/string:746:43: error: implicit instantiation of undefined template 'std::char_traits<int>' -> 746 | static_assert((is_same<_CharT, typename traits_type::char_type>::value), -> | ^ -> dict-generate.cpp:861:18: note: in instantiation of template class 'std::basic_string<int>' requested here -> 861 | StringOfInts Chld; -> | ^ -> ~/llvm/inst/bin/../include/c++/v1/__fwd/string.h:23:29: note: template is declared here -> 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; -> | ^ - -etc., so use a std::vector<int> instead - -Change-Id: I51e8296edf7b16925ff01679e671525256055552 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163048 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann <[email protected]> ---- /dev/null -+++ b/external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 -@@ -0,0 +1,72 @@ -+From 92c6ea875231876ca264187326ce2d615d5ad543 Mon Sep 17 00:00:00 2001 -+From: Stephan Bergmann <[email protected]> -+Date: Tue, 6 Feb 2024 13:14:08 +0100 -+Subject: There is no std::basic_string<int> -+ -+...and at least LLVM 19 trunk libc++ complains about it now since -+<c3668779c13596e223c26fbd49670d18cd638c40> "[libc++] Remove deprecated -+char_traits base template (#72694)" with -+ -+> In file included from dict-generate.cpp:25: -+> In file included from ~/llvm/inst/bin/../include/c++/v1/iostream:43: -+> In file included from ~/llvm/inst/bin/../include/c++/v1/ios:223: -+> In file included from ~/llvm/inst/bin/../include/c++/v1/__locale:24: -+> ~/llvm/inst/bin/../include/c++/v1/string:746:43: error: implicit instantiation of undefined template 'std::char_traits<int>' -+> 746 | static_assert((is_same<_CharT, typename traits_type::char_type>::value), -+> | ^ -+> dict-generate.cpp:861:18: note: in instantiation of template class 'std::basic_string<int>' requested here -+> 861 | StringOfInts Chld; -+> | ^ -+> ~/llvm/inst/bin/../include/c++/v1/__fwd/string.h:23:29: note: template is declared here -+> 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; -+> | ^ -+ -+etc., so use a std::vector<int> instead -+--- -+ dict-generate.cpp | 12 ++++++------ -+ 1 file changed, 6 insertions(+), 6 deletions(-) -+ -+diff --git a/dict-generate.cpp b/dict-generate.cpp -+index eebcca9..fcfaaea 100644 -+--- a/dict-generate.cpp -++++ b/dict-generate.cpp -+@@ -22,6 +22,7 @@ -+ * -+ **********************************************************************************/ -+ -++#include <algorithm> -+ #include <iostream> -+ #include <string> -+ #include <fstream> -+@@ -387,7 +388,7 @@ typedef map<string, Entry> EntryMap_t; -+ typedef list<string> StringList_t; -+ typedef list<NodeSPtr> NodeList_t; -+ typedef set<StringInt> StringIntSet_t; -+-typedef basic_string<int> StringOfInts; -++typedef vector<int> StringOfInts; -+ typedef vector<unsigned int> UintVect; -+ typedef vector<uint64_t> Uint64Vect; -+ typedef vector<StringInt *> StrIntPtrVect_t; -+@@ -864,15 +865,14 @@ void CreateArrays(NodeSPtr Root, StringIntSet_t & StrSet, StringOfInts & ChildAd -+ for(Itc = Root->ChildBegin(); Itc != Root->ChildEnd(); ++Itc) -+ { -+ int i = Itc->second->GetAddr(); -+- Chld += i; -++ Chld.push_back(i); -+ } -+ // Find where in pointer array the child pointer string is -+- StringOfInts::size_type x = ChildAddrs.find(Chld); -+- if (x == StringOfInts::npos) -++ StringOfInts::size_type x = search(ChildAddrs.begin(), ChildAddrs.end(), Chld.begin(), Chld.end()) - ChildAddrs.begin(); -++ if (x == ChildAddrs.size()) -+ { -+ // Not found, add it -+- x = ChildAddrs.length(); -+- ChildAddrs += Chld; -++ ChildAddrs.insert(ChildAddrs.end(), Chld.begin(), Chld.end()); -+ } -+ // Val will contain the final node data -+ uint64_t Val = Its->i; -+-- -+2.43.0 -+ ---- a/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk -+++ b/external/zxcvbn-c/UnpackedTarball_zxcvbn-c.mk -@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,zxcvbn-c)) - - $(eval $(call gb_UnpackedTarball_set_tarball,zxcvbn-c,$(ZXCVBN_C_TARBALL))) - -+# * external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 sent upstream as -+# <https://github.com/tsyrogit/zxcvbn-c/pull/31> "There is no std::basic_string<int>": - $(eval $(call gb_UnpackedTarball_add_patches,zxcvbn-c,\ - external/zxcvbn-c/zxcvbn-c-2.5-do-not-use-stdafx.patch \ -+ external/zxcvbn-c/0001-There-is-no-std-basic_string-int.patch.1 \ - )) - - # vim: set noet sw=4 ts=4: diff --git a/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch b/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch deleted file mode 100644 index d829ad76d0f7..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.2.7.2-poppler-24.12.patch +++ /dev/null @@ -1,38 +0,0 @@ -From db12ee77c17ea9ed477c310bd1e58f00d519f653 Mon Sep 17 00:00:00 2001 -From: Michael Stahl <[email protected]> -Date: Tue, 7 Jan 2025 18:42:29 +0100 -Subject: sdext: adapt xpdfwrapper to poppler 24.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: Ia47edf2ac821e3ef5c40f7582253f894eac74060 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179902 -Tested-by: Jenkins -Reviewed-by: Michael Stahl <[email protected]> -(cherry picked from commit aa94faf493945e854a888e809a9c5cc8d6d0b978) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179945 -Reviewed-by: Caolán McNamara <[email protected]> ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 57164f27cb42..6748431e53d2 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -1090,7 +1090,12 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - - int bitsPerComponent = 1; - StreamColorSpaceMode csMode = streamCSNone; -+#if POPPLER_CHECK_VERSION(24, 12, 0) -+ bool hasAlpha; -+ str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha ); -+#else - str->getImageParams( &bitsPerComponent, &csMode ); -+#endif - if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) ) - { - GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) }; --- -cgit v1.2.3 diff --git a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild deleted file mode 100644 index 55225b6e3690..000000000000 --- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild +++ /dev/null @@ -1,706 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="threads(+),xml(+)" - -MY_PV="${PV/_alpha/.alpha}" -MY_PV="${MY_PV/_beta/.beta}" -# experimental ; release ; old -# Usually the tarballs are moved a lot so this should make everyone happy. -DEV_URI=" - https://dev-builds.libreoffice.org/pre-releases/src - https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ - https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src -" -ADDONS_URI="https://dev-www.libreoffice.org/src/"; - -BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${MY_PV} == *9999* ]] && inherit git-r3 -inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils - -DESCRIPTION="A full office productivity suite" -HOMEPAGE="https://www.libreoffice.org"; -SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"; -[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"; - -# Split modules following git/tarballs; Core MUST be first! -# Help is used for the image generator -# Only release has the tarballs -if [[ ${MY_PV} != *9999* ]]; then - for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" - done - unset i -fi -unset DEV_URI - -# Really required addons -# These are bundles that can't be removed for now due to huge patchsets. -# If you want them gone, patches are welcome. -ADDONS_SRC=( - # not packaged in Gentoo - "${ADDONS_URI}/dragonbox-1.1.3.tar.gz" - # 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" - # not packaged in Gentoo, https://skia.org/ - "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.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 - ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - )" - # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket - "java? ( - ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz - ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - )" - # no release for 8 years, should we package it? - "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" - # 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 )" - # not packageable - "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" -) -SRC_URI+=" ${ADDONS_SRC[*]}" - -unset ADDONS_URI -unset ADDONS_SRC - -# Extensions that need extra work: -LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" - -IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan -$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - base? ( java ) - bluetooth? ( dbus ) - kde? ( || ( qt5 qt6 ) ) - libreoffice_extensions_nlpsolver? ( java ) - libreoffice_extensions_scripting-beanshell? ( java ) - libreoffice_extensions_scripting-javascript? ( java ) - libreoffice_extensions_wiki-publisher? ( java ) -" - -RESTRICT="!test? ( test )" - -LICENSE="|| ( LGPL-3 MPL-1.1 )" -SLOT="0" - -[[ ${MY_PV} == *9999* ]] || \ -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/unzip - app-arch/zip - app-crypt/argon2:= - app-crypt/gpgme:=[cxx] - app-text/hunspell:= - >=app-text/libabw-0.1.0 - >=app-text/libebook-0.1 - app-text/libepubgen - >=app-text/libetonyek-0.1 - app-text/libexttextcat - app-text/liblangtag - >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.21 - >=app-text/libnumbertext-1.0.6 - >=app-text/libodfgen-0.1.0 - app-text/libqxp - app-text/libstaroffice - app-text/libwpd:0.10[tools] - app-text/libwpg:0.3 - >=app-text/libwps-0.4 - app-text/mythes - >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.6.2:0= - dev-db/unixODBC - dev-lang/perl - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/hyphen - dev-libs/icu:= - dev-libs/libassuan:= - dev-libs/libgpg-error - >=dev-libs/liborcus-0.18.0:0/0.18 - dev-libs/librevenge - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - >=dev-libs/redland-1.0.16 - >=dev-libs/xmlsec-1.2.35:=[nss] - >=games-engines/box2d-2.4.1:0 - media-gfx/fontforge - media-gfx/graphite2 - media-libs/fontconfig - >=media-libs/freetype-2.11.0-r1:2 - >=media-libs/harfbuzz-5.1.0:=[graphite,icu] - media-libs/lcms:2 - >=media-libs/libcdr-0.1.0 - >=media-libs/libepoxy-1.3.1[X] - >=media-libs/libfreehand-0.1.0 - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - >=media-libs/libpng-1.4:0= - >=media-libs/libvisio-0.1.0 - media-libs/libwebp:= - media-libs/libzmf - media-libs/openjpeg:= - media-libs/tiff:= - media-libs/zxing-cpp:= - net-misc/curl - sci-mathematics/lpsolve:= - sys-libs/zlib - virtual/opengl - x11-libs/cairo[X] - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - accessibility? ( - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]') - ) - bluetooth? ( - dev-libs/glib:2 - net-wireless/bluez - ) - coinmp? ( sci-libs/coinor-mp ) - cups? ( net-print/cups ) - dbus? ( sys-apps/dbus ) - eds? ( - dev-libs/glib:2 - >=gnome-base/dconf-0.40.0 - gnome-extra/evolution-data-server - ) - firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( - app-accessibility/at-spi2-core:2 - dev-libs/glib:2 - dev-libs/gobject-introspection - gnome-base/dconf - media-libs/mesa[egl(+)] - x11-libs/gtk+:3[X] - x11-libs/pango - ) - kde? ( - qt5? ( - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - qt6? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kio:6 - kde-frameworks/kwindowsystem:6 - ) - ) - ldap? ( net-nds/openldap:= ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) - mariadb? ( dev-db/mariadb-connector-c:= ) - !mariadb? ( dev-db/mysql-connector-c:= ) - pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) -" -# FIXME: cppunit should be moved to test conditional -# after everything upstream is under gbuild -# as dmake execute tests right away -# tests apparently also need google-carlito-fonts (not packaged) -DEPEND="${COMMON_DEPEND} - >=dev-libs/libatomic_ops-7.2d - dev-perl/Archive-Zip - >=dev-util/cppunit-1.14.0 - >=dev-util/gperf-3.1 - dev-util/mdds:1/2.1 - media-libs/glm - x11-base/xorg-proto - x11-libs/libXt - x11-libs/libXtst - java? ( - dev-java/ant:0 - >=virtual/jdk-17 - ) - test? ( - app-crypt/gnupg - dev-util/cppunit - media-fonts/dejavu - media-fonts/liberation-fonts - ) - valgrind? ( dev-debug/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - acct-group/libreoffice - acct-user/libreoffice - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - media-fonts/liberation-fonts - || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* ) - java? ( >=virtual/jre-11 ) - kde? ( kde-frameworks/breeze-icons:* ) -" -BDEPEND=" - dev-util/intltool - sys-apps/which - app-alternatives/yacc - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - clang? ( - || ( - ( llvm-core/clang:18 - llvm-core/llvm:18 - =llvm-core/lld-18* ) - ( llvm-core/clang:17 - llvm-core/llvm:17 - =llvm-core/lld-17* ) - ( llvm-core/clang:16 - llvm-core/llvm:16 - =llvm-core/lld-16* ) - ( llvm-core/clang:15 - llvm-core/llvm:15 - =llvm-core/lld-15* ) - ) - ) - odk? ( >=app-text/doxygen-1.8.4 ) -" -if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" -else - # Translations are not reliable on live ebuilds - # rather force people to use english only. - RDEPEND+=" !app-office/libreoffice-l10n" -fi - -PATCHES=( - # "${WORKDIR}"/${PATCHSET/.tar.xz/} - - # not upstreamable stuff - "${FILESDIR}/${PN}-6.1-nomancompress.patch" - "${FILESDIR}/${PN}-24.2-qtdetect.patch" - - # TODO: upstream - "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" - "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" - - # 24.8 branch - "${FILESDIR}/${P}-no-std-basic_string-int.patch" # bug #923950 - "${FILESDIR}/${P}-poppler-24.12.patch" # bug #943695 - - # git master - # bug #917618, thx to Debian: - "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch" - "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch" - "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch" -) - -S="${WORKDIR}/${PN}-${MY_PV}" - -_check_reqs() { - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi - check-reqs_$1 -} - -pkg_pretend() { - use base || - ewarn "If you plan to use Base application you must enable USE base." - use java || - ewarn "Without USE java, several wizards are not going to be available." - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - xdg_environment_reset - - [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup -} - -src_unpack() { - default - - if [[ ${MY_PV} = *9999* ]]; then - local base_uri branch mypv - base_uri="https://anongit.freedesktop.org/git"; - branch="master" - mypv=${MY_PV/.9999} - [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" - git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" - git-r3_checkout "${base_uri}/${PN}/core" - LOCOREGIT_VERSION=${EGIT_VERSION} - - git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" - git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help - fi -} - -src_prepare() { - default - - # sandbox violations on many systems, we don't need it. Bug #646406 - sed -i \ - -e "/KF5_CONFIG/s/kf5-config/no/" \ - configure.ac || die "Failed to disable kf5-config" - - AT_M4DIR="m4" eautoreconf - # hack in the autogen.sh - touch autogen.lastrun - - # sed in the tests - sed -i \ - -e "s#all : build unitcheck#all : build#g" \ - solenv/gbuild/Module.mk || die - sed -i \ - -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \ - -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \ - Makefile.in || die - - sed -i \ - -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \ - -e "s,\$INSTALLDIRNAME.sh,${PN}," \ - bin/distro-install-desktop-integration || die - - if use branding; then - # hack... - mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die - fi - - # Don't list pdfimport support in desktop when built with none, bug # 605464 - if ! use pdfimport; then - sed -i \ - -e ":MimeType: s:application/pdf;::" \ - -e ":Keywords: s:pdf;::" \ - sysui/desktop/menus/draw.desktop || die - fi -} - -src_configure() { - # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys - # Note: these are for Gentoo use ONLY. For your own distribution, please get - # your own set of keys. Feel free to contact [email protected] for more info. - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - - # Show flags set at the beginning - einfo "Preset CFLAGS: ${CFLAGS}" - einfo "Preset LDFLAGS: ${LDFLAGS}" - - # Workaround for bug #915067 - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - if use clang ; then - # Force clang - einfo "Enforcing the use of clang due to USE=clang ..." - AR=llvm-ar - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - NM=llvm-nm - RANLIB=llvm-ranlib - LDFLAGS+=" -fuse-ld=lld" - - # Not implemented by Clang, bug #903889 - filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch - else - # Force gcc - einfo "Enforcing the use of gcc due to USE=-clang ..." - AR=gcc-ar - CC=${CHOST}-gcc - CXX=${CHOST}-g++ - NM=gcc-nm - RANLIB=gcc-ranlib - - # Apparently the Clang flags get used even for GCC builds sometimes. - # bug #838115 - sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die - fi - - # ODR violations (not just in skia/vulkan): bug #916435 - # Runtime crashes with Clang: bug #907905 - filter-lto - - 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!" - else - strip-flags - fi - - export LO_CLANG_CC=${CC} - export LO_CLANG_CXX=${CXX} - - # Show flags set at the end - einfo " Used CFLAGS: ${CFLAGS}" - einfo " Used LDFLAGS: ${LDFLAGS}" - - # Ensure we use correct toolchain - tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG - - # optimization flags - export GMAKE_OPTIONS="${MAKEOPTS}" - # System python enablement: - export PYTHON_CFLAGS=$(python_get_CFLAGS) - export PYTHON_LIBS=$(python_get_LIBS) - - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/.." - fi - if use qt6; then - export QT6DIR="$(qt6_get_bindir)/.." - fi - - local gentoo_buildid="Gentoo official package" - if [[ -n ${LOCOREGIT_VERSION} ]]; then - gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" - fi - - # system headers/libs/...: enforce using system packages - # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad - # --enable-cairo: ensure that cairo is always required - # --enable-*-link: link to the library rather than just dlopen on runtime - # --enable-release-build: build the libreoffice as release - # --disable-fetch-external: prevent dowloading during compile phase - # --enable-extension-integration: enable any extension integration support - # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs - # --disable-report-builder: too much java packages pulled in without pkgs - # --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 - local myeconfargs=( - --with-system-dicts - --with-system-epoxy - --with-system-headers - --with-system-jars - --with-system-libs - --enable-build-opensymbol - --enable-cairo-canvas - --enable-largefile - --enable-mergelibs=more - --enable-python=system - --enable-randr - --enable-release-build - --disable-atspi-tests # bug 933257 - --disable-breakpad - --disable-bundle-mariadb - --disable-ccache - --disable-epm - --disable-fetch-external - --disable-gtk3-kde5 - --disable-online-update - --disable-openssl - --disable-pdfium - --with-extra-buildid="${gentoo_buildid}" - --enable-extension-integration - --with-external-dict-dir="${EPREFIX}/usr/share/myspell" - --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" - --with-external-thes-dir="${EPREFIX}/usr/share/myspell" - --with-external-tar="${DISTDIR}" - --with-lang="" - --with-parallelism=$(makeopts_jobs) - --with-system-openjpeg - --with-tls=nss - --with-vendor="Gentoo Foundation" - --with-x - --without-fonts - --without-myspell-dicts - --with-help="html" - --without-helppack-integration - --with-system-gpgmepp - --without-system-abseil - --without-system-dragonbox - --without-system-frozen - --without-system-jfreereport - --without-system-libfixmath - --without-system-sane - --without-system-zxcvbn - $(use_enable base report-builder) - $(use_enable bluetooth sdremote-bluetooth) - $(use_enable coinmp) - $(use_enable cups) - $(use_enable dbus) - $(use_enable debug) - $(use_enable eds evolution2) - $(use_enable firebird firebird-sdbc) - $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk gtk3) - $(use_enable ldap) - $(use_enable odk) - $(use_enable pdfimport) - $(use_enable postgres postgresql-sdbc) - $(use_enable qt5) - $(use_enable qt6) - $(use_enable vulkan skia) - $(use_with accessibility lxml) - $(use_with coinmp system-coinmp) - $(use_with googledrive gdrive-client-id ${google_default_client_id}) - $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) - $(use_with java) - $(use_with odk doxygen) - $(use_with valgrind) - ) - - use qt5 && myeconfargs+=( $(use_enable kde kf5) ) - use qt6 && myeconfargs+=( $(use_enable kde kf6) ) - - if use eds || use gtk; then - myeconfargs+=( --enable-dconf --enable-gio ) - else - myeconfargs+=( --disable-dconf --disable-gio ) - fi - - # libreoffice extensions handling - for lo_xt in ${LO_EXTS}; do - if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) ) - else - myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) ) - fi - done - - if use java; then - # hsqldb: system one is too new - myeconfargs+=( - --without-junit - --without-system-hsqldb - --with-ant-home="${ANT_HOME}" - --with-jdk-home="${JAVA_HOME}" - ) - - 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 ) - - MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ - econf "${myeconfargs[@]}" -} - -src_compile() { - # more and more LO stuff tries to use OpenGL, including tests during build - # bug 501508, bug 540624, bug 545974 and probably more - addpredict /dev/dri - addpredict /dev/ati - addpredict /dev/nvidiactl - - default -} - -src_test() { - emake unitcheck - emake slowcheck -} - -src_install() { - emake DESTDIR="${D}" distro-pack-install -o build -o check - - # bug 593514 - if use gtk; then - dosym libreoffice/program/liblibreofficekitgtk.so \ - /usr/$(get_libdir)/liblibreofficekitgtk.so - fi - - # bash completion aliases - bashcomp_alias \ - libreoffice \ - unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - - if use branding; then - insinto /usr/$(get_libdir)/${PN}/program - newins "${WORKDIR}/branding-sofficerc" sofficerc - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die - fi - - # bug 703474 - insinto /usr/include - doins -r include/LibreOfficeKit - - local lodir=/usr/$(get_libdir)/libreoffice - # patching this would break tests - cat <<-EOF > "${T}"/uno.py -import sys, os -sys.path.append('${EPREFIX}${lodir}/program') -os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc') -EOF - sed -e "/^import sys/d" -e "/^import os/d" \ - -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed" - cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die - cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die - - # more system pyuno mess - sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \ - -i "${D}"${lodir}/program/officehelper.py || die - - python_optimize "${D}"${lodir}/program - # link python bridge in site-packages, bug 667802 - local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program - for py in uno.py unohelper.py officehelper.py; do - dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py} - while IFS="" read -d $'\0' -r pyc; do - pyc=${pyc//*\/} - dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc} - done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0) - done - - newinitd "${FILESDIR}/libreoffice.initd" libreoffice - newconfd "${FILESDIR}/libreoffice.confd" libreoffice -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -}
