commit: 5c6ce0db9735094b458da8efd6237c73e52e99c2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 26 13:16:16 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Dec 26 23:19:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6ce0db
app-office/libreoffice: update dependencies (more bundled SRC_URIs) Fix libreoffice-l10n blocker Thanks-to: jospezial <jospezial <AT> gmx.de> Closes: https://bugs.gentoo.org/833594 Closes: https://bugs.gentoo.org/835704 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/Manifest | 1 + app-office/libreoffice/libreoffice-9999.ebuild | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 8ad5063506b0..2a619f248696 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -13,6 +13,7 @@ DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6 +DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d803111321c17abdb338bcd7b5bb42a691ec3809f9df9b0c0a773828750679c4c00037e45d62ff494ae0056080ef9 SHA512 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index ad176ec03f49..567aaa08c52d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -44,9 +44,8 @@ unset DEV_URI # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. ADDONS_SRC=( - # broken against latest upstream release, too many patches on top: - # https://github.com/tdf/libcmis/pull/43 - "${ADDONS_URI}/libcmis-0.5.2.tar.xz" + # 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://skia.org/ @@ -103,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" #[[ ${MY_PV} == *9999* ]] || \ -#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux" +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -117,7 +116,7 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 - >=app-text/libmwaw-0.3.1 + >=app-text/libmwaw-0.3.21 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp @@ -128,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS} app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 - >=dev-cpp/libcmis-0.5.2 + >=dev-cpp/libcmis-0.5.2-r2 dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] @@ -159,8 +158,10 @@ COMMON_DEPEND="${PYTHON_DEPS} 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-libs/neon-0.31.1:= net-misc/curl @@ -192,6 +193,7 @@ COMMON_DEPEND="${PYTHON_DEPS} 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 @@ -281,7 +283,7 @@ if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then else # Translations are not reliable on live ebuilds # rather force people to use english only. - PDEPEND="!app-office/libreoffice-l10n" + RDEPEND+=" !app-office/libreoffice-l10n" fi PATCHES=( @@ -503,8 +505,9 @@ src_configure() { --with-help="html" --without-helppack-integration --with-system-gpgmepp + --without-system-dragonbox --without-system-jfreereport - --without-system-libcmis + --without-system-libfixmath --without-system-sane $(use_enable base report-builder) $(use_enable bluetooth sdremote-bluetooth)
