From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/
Date: Wed, 1 Feb 2023 18:22:25 +0000 (UTC) [thread overview]
Message-ID: <1675275734.ef15cec2485f36b19bc3f71602fb2bcfb3ff8360.asturm@gentoo> (raw)
commit: ef15cec2485f36b19bc3f71602fb2bcfb3ff8360
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 23:07:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 18:22:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef15cec2
app-office/libreoffice: add 7.4.5.1
Bug: https://bugs.gentoo.org/891903
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
.../libreoffice-7.4.5.1-fix-webdav-upload.patch | 107 ++++
app-office/libreoffice/libreoffice-7.4.5.1.ebuild | 663 +++++++++++++++++++++
3 files changed, 772 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 31c4bb7f5a67..0215a413a5db 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,8 +21,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
+DIST libreoffice-7.4.5.1.tar.xz 264347796 BLAKE2B 89403e25137e74f1c50b720c140a799284bd2277d132b24bfd5bac5e3eb1d8d2adfc7a3417886c4c4d0777c563bbd43346de58bc6a9f2162f5b5a5f57b22dff7 SHA512 1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
+DIST libreoffice-help-7.4.5.1.tar.xz 112594972 BLAKE2B c38b1f36a764c775f7a6b5f357ef94d925e1d9d0c6c5dbddcd08688b9bbd6c9bb296e96366f4e14c73003e0434a6632dbdc8abd6580f410701e2bd0627226a2a SHA512 a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
new file mode 100644
index 000000000000..9b70f62c7d19
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
@@ -0,0 +1,107 @@
+From 30ca48f4dc0e65a3798e6b21574bc80f6d4953fa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= <nemeth@numbertext.org>
+Date: Wed, 25 Jan 2023 12:08:14 +0100
+Subject: tdf#152493 ucb WebDAV: fix upload using HTTP 1.0 fallback
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix broken libcurl upload to Vibe 4.0.6 WebDAV server
+using HTTP 1.0 fallback.
+
+Regression from commit 023ebf17898db4bca63129f079fd90b5cf76c1a9
+"ucb: remove --with-webdav=neon" (Neon had no such upload
+problem).
+
+HTTP 1.0 fallback found by Pál Zoltán Kochis.
+Fallback for CURLE_UNSUPPORTED_PROTOCOL
+suggested by Michael Stahl. Thanks for their and
+Attila Bakos' help.
+
+Michael Stahl's comment: "'HTTP/0.9' in the [curl] error
+message is very misleading: it simply means that a header
+was expected but there was no header, so what is received
+is interpreted as body.
+
+Note: the HTTP/1.0 works because it does not use the
+'Expect: 100-continue' so there should be no intermediate
+100 Continue response from the server at all - instead
+libcurl directly sends the XML document for the PROPFIND
+and the server sends the response, and the problem does
+not occur."
+
+Co-authored-by: Michael Stahl <michael.stahl@allotropia.de>
+
+Change-Id: I8bd79154de14b6425e0324f4d8f6e64512c08264
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146067
+Tested-by: László Németh <nemeth@numbertext.org>
+Reviewed-by: László Németh <nemeth@numbertext.org>
+---
+ ucb/source/ucp/webdav-curl/CurlSession.cxx | 24 ++++++++++++++++++++++++
+ ucb/source/ucp/webdav-curl/DAVException.hxx | 1 +
+ 2 files changed, 25 insertions(+)
+
+diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
+index 0f06363ce68f..bb1d4689a53c 100644
+--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
++++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
+@@ -964,6 +964,8 @@ auto CurlProcessor::ProcessRequestImpl(
+ "curl_easy_perform failed: " << GetErrorString(rc, rSession.m_ErrorBuffer));
+ switch (rc)
+ {
++ case CURLE_UNSUPPORTED_PROTOCOL:
++ throw DAVException(DAVException::DAV_UNSUPPORTED);
+ case CURLE_COULDNT_RESOLVE_PROXY:
+ throw DAVException(
+ DAVException::DAV_HTTP_LOOKUP,
+@@ -1250,6 +1252,7 @@ auto CurlProcessor::ProcessRequest(
+ }
+ }
+ bool isRetry(false);
++ bool isFallbackHTTP10(false);
+ int nAuthRequests(0);
+ int nAuthRequestsProxy(0);
+
+@@ -1473,6 +1476,27 @@ auto CurlProcessor::ProcessRequest(
+ }
+ }
+ }
++ else if (rException.getError() == DAVException::DAV_UNSUPPORTED)
++ {
++ // tdf#152493 libcurl can't handle "Transfer-Encoding: chunked"
++ // in HTTP/1.1 100 Continue response.
++ // workaround: if HTTP/1.1 didn't work, try HTTP/1.0
++ // (but fallback only once - to prevent infinite loop)
++ if (isFallbackHTTP10)
++ {
++ throw DAVException(DAVException::DAV_HTTP_ERROR);
++ }
++ isFallbackHTTP10 = true;
++ // note: this is not reset - future requests to this URI use it!
++ auto rc = curl_easy_setopt(rSession.m_pCurl.get(), CURLOPT_HTTP_VERSION,
++ CURL_HTTP_VERSION_1_0);
++ if (rc != CURLE_OK)
++ {
++ throw DAVException(DAVException::DAV_HTTP_ERROR);
++ }
++ SAL_INFO("ucb.ucp.webdav.curl", "attempting fallback to HTTP/1.0");
++ isRetry = true;
++ }
+ if (!isRetry)
+ {
+ throw; // everything else: re-throw
+diff --git a/ucb/source/ucp/webdav-curl/DAVException.hxx b/ucb/source/ucp/webdav-curl/DAVException.hxx
+index 84dba895485c..759e43f25f8e 100644
+--- a/ucb/source/ucp/webdav-curl/DAVException.hxx
++++ b/ucb/source/ucp/webdav-curl/DAVException.hxx
+@@ -130,6 +130,7 @@ class DAVException : public std::exception
+ DAV_SESSION_CREATE, // session creation error,
+ // mData = server[:port]
+ DAV_INVALID_ARG, // invalid argument
++ DAV_UNSUPPORTED, // internal to CurlSession
+
+ DAV_LOCK_EXPIRED, // DAV lock expired
+
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.4.5.1.ebuild b/app-office/libreoffice/libreoffice-7.4.5.1.ebuild
new file mode 100644
index 000000000000..bb49b1aebb23
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.4.5.1.ebuild
@@ -0,0 +1,663 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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} )"
+[[ -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://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "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? ( ${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
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+# 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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ 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/abseil-cpp:=
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2-r2
+ 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.17.2:0/0.17
+ 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.28[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-0.9.42:=[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-libs/neon-0.31.1:=
+ 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[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ 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? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ 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] )
+"
+# 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.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+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
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/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}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.5 branch
+ "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
+ "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
+ "${FILESDIR}/${PN}-7.4.5.1-fix-webdav-upload.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 chromium@gentoo.org 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}"
+
+ 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"
+ 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
+
+ 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
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ 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
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt6
+ --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-abseil
+ --with-system-openjpeg
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(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 kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(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)
+ )
+
+ 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
+
+ is-flagq "-flto*" && 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
+}
next reply other threads:[~2023-02-01 18:22 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 18:22 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-02 20:19 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ Andreas Sturmlechner
2025-07-05 17:53 Andreas Sturmlechner
2025-06-13 16:28 Sam James
2025-06-02 16:47 Andreas Sturmlechner
2025-05-06 18:17 Andreas Sturmlechner
2025-03-04 22:04 Sam James
2025-02-22 23:24 Sam James
2024-12-17 21:44 Andreas Sturmlechner
2024-10-05 13:54 Andreas Sturmlechner
2024-09-21 8:29 Andreas Sturmlechner
2024-05-21 15:14 Andreas Sturmlechner
2024-03-28 18:48 Andreas Sturmlechner
2024-03-12 11:50 Andreas Sturmlechner
2024-03-10 16:30 Andreas Sturmlechner
2024-03-04 4:22 Sam James
2024-01-28 16:28 Andreas Sturmlechner
2023-11-21 22:36 Andreas Sturmlechner
2023-11-20 13:35 Sam James
2023-11-03 23:58 Sam James
2023-01-30 4:01 Sam James
2023-01-13 19:08 Sam James
2023-01-10 0:04 Andreas Sturmlechner
2022-12-17 19:53 David Seifert
2022-11-03 8:40 Andreas Sturmlechner
2022-08-31 21:47 Sam James
2022-06-14 15:20 Andreas Sturmlechner
2022-05-09 19:12 Sam James
2022-05-08 13:35 Andreas Sturmlechner
2022-03-12 15:53 Andreas Sturmlechner
2022-02-05 20:46 Andreas Sturmlechner
2021-12-03 11:11 Andreas Sturmlechner
2021-11-05 5:39 Sam James
2021-09-07 18:28 Andreas Sturmlechner
2021-06-10 15:34 Andreas Sturmlechner
2021-01-24 13:02 Andreas Sturmlechner
2020-12-12 21:59 Andreas Sturmlechner
2020-11-21 22:18 Andreas Sturmlechner
2020-11-21 21:00 Andreas K. Hüttel
2020-11-06 2:22 Andreas Sturmlechner
2020-11-05 22:51 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-22 22:04 Andreas Sturmlechner
2020-09-08 18:08 Andreas Sturmlechner
2020-05-31 21:09 Andreas Sturmlechner
2020-04-05 17:05 Andreas Sturmlechner
2020-01-17 2:50 Andreas Sturmlechner
2019-11-01 18:39 Andreas Sturmlechner
2019-10-18 23:59 Andreas Sturmlechner
2019-08-13 15:56 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-21 11:31 Andreas Sturmlechner
2019-04-11 9:03 Andreas Sturmlechner
2019-03-30 9:59 Andreas Sturmlechner
2019-02-01 20:14 Andreas Sturmlechner
2019-01-30 22:31 Andreas Sturmlechner
2019-01-23 22:53 Andreas Sturmlechner
2019-01-08 0:17 Andreas Sturmlechner
2018-12-13 11:01 Andreas Sturmlechner
2018-12-13 9:57 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-08-13 21:48 Andreas Sturmlechner
2018-06-10 14:43 Andreas Sturmlechner
2018-05-27 22:59 Andreas Sturmlechner
2018-05-27 19:54 Andreas Sturmlechner
2018-05-27 6:29 Andreas Sturmlechner
2018-04-25 16:15 Andreas Sturmlechner
2017-12-21 13:27 Andreas Sturmlechner
2017-10-08 11:22 Andreas Sturmlechner
2017-02-26 18:37 Andreas Sturmlechner
2016-11-06 18:42 Andreas Hüttel
2016-07-03 20:10 Andreas Hüttel
2016-02-25 16:50 Andreas Hüttel
2016-02-22 17:07 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1675275734.ef15cec2485f36b19bc3f71602fb2bcfb3ff8360.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox