* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2023-05-13 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2023-05-13 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 902e5cc78ca9c75f3996273487023512714fccc6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 21:21:29 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 13 21:24:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902e5cc7
app-office/libreoffice: drop 7.3.7.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 5 -
.../files/libreoffice-7.3.5.2-gpgme-1.18.0.patch | 48 --
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 663 ---------------------
3 files changed, 716 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc0a09e2dd73..abad1c805b39 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,15 +17,10 @@ DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d
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
-DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
-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.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
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.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
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.3.5.2-gpgme-1.18.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
deleted file mode 100644
index d8dae52d9b09..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.3.5.2-gpgme-1.18.0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/865321
-https://lists.freedesktop.org/archives/libreoffice/2022-August/089261.html
-https://github.com/LibreOffice/core/commit/aa0b2b756c17d43d2e8c828a909ee2815e332377
-
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 24 Aug 2022 09:55:33 +0200
-Subject: [PATCH] Make configure work with gpgme >= 1.18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sam James wrote:
-> gpgme-1.18.0 dropped a bunch of internal symbols,
-> including progress_callback (see e.g. callbacks.h
-> which has a comment at the top saying it's internal).
-
-Plausibly the workaround to not link against older KDE-specific distro
-packages is not needed anymore.
-
-Check for main as a workaround as we do for other C++ libraries, too.
-
-Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667
-Tested-by: Jenkins
-Reviewed-by: Sam James <sam@gentoo.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-(cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553
-Tested-by: René Engelhard <rene@debian.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE
- # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
- AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
- [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
-- # progress_callback is the only func with plain C linkage
-- # checking for it also filters out older, KDE-dependent libgpgmepp versions
-- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
-- [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
- AC_CHECK_HEADER(gpgme.h, [],
- [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
-+ AC_CHECK_LIB(gpgmepp, main, [],
-+ [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
-+ GPGMEPP_LIBS=-lgpgmepp
- else
- AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
-
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
deleted file mode 100644
index 8ca5f59348da..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ /dev/null
@@ -1,663 +0,0 @@
-# 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="${PN}-7.3.5.2-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/~xen0n/distfiles/app-office/libreoffice/${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=(
- # 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, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.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
-
-# 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 )
- 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 x86 ~amd64-linux"
-
-# xmlsec version cap for bug #904387
-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.1
- >=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
- 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]
- <dev-libs/xmlsec-1.3.0
- >=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/libzmf
- media-libs/openjpeg:=
- 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? (
- 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.
- PDEPEND="!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.4 branch
- "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-
- # 7.5 branch
- "${FILESDIR}/${P}-boost-1.81-locale.patch"
- "${FILESDIR}/${P}-zxing-cpp-1.4.0.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"
-
- # 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
-
- 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-jfreereport
- --without-system-libcmis
- --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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-11-14 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-11-14 21:29 UTC (permalink / raw
To: gentoo-commits
commit: ceca90a5c957a4ad070f881ba2b6ff2404a091e1
Author: LinuxUserGD <hugegameartgd <AT> gmail <DOT> com>
AuthorDate: Mon Jun 17 18:34:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 21:28:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceca90a5
app-office/libreoffice: Fix build with Clang 19
Closes: https://bugs.gentoo.org/923950
Upstream-PR: https://gerrit.libreoffice.org/c/core/+/163048
Upstream-Commit: https://git.libreoffice.org/core/commit/d91ab7de467abea6c01c9dd8473f81ac1f29513c
Signed-off-by: LinuxUserGD <hugegameartgd <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37199
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...reoffice-24.2.7.2-no-std-basic_string-int.patch | 119 +++++++++++++++++++++
app-office/libreoffice/libreoffice-24.2.7.2.ebuild | 3 +
2 files changed, 122 insertions(+)
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
new file mode 100644
index 000000000000..d95adb050df2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2.7.2-no-std-basic_string-int.patch
@@ -0,0 +1,119 @@
+https://git.libreoffice.org/core/commit/d91ab7de467abea6c01c9dd8473f81ac1f29513c
+From d91ab7de467abea6c01c9dd8473f81ac1f29513c Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <stephan.bergmann@allotropia.de>
+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 <stephan.bergmann@allotropia.de>
+--- /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 <stephan.bergmann@allotropia.de>
++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/libreoffice-24.2.7.2.ebuild b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
index e0088e87838d..22d3a6835554 100644
--- a/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.7.2.ebuild
@@ -320,6 +320,9 @@ PATCHES=(
"${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
+
# 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"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-06-29 16:32 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-06-29 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 72f67e5114c0c47627c5abf4955a842f0efd9cd4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 16:04:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:32:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f67e51
app-office/libreoffice: drop 7.6.4.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../files/libreoffice-7.5.9.2-libxml2-2.12.patch | 303 ----------
app-office/libreoffice/libreoffice-7.6.4.1.ebuild | 668 ---------------------
3 files changed, 973 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a091f36e87d2..b5a7bb935041 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,11 +21,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
-DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
-DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
deleted file mode 100644
index bc7ae2a561ff..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.com>
-Date: Mon, 27 Nov 2023 08:02:59 +0100
-Subject: tdf#158302 fix build against system-libxml-2.12
-
-Seen in a fedora:40 container, using --with-system-libcmis,
---with-system-liblangtag and --with-system-xmlsec.
-
-Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
----
- drawinglayer/source/tools/primitive2dxmldump.cxx | 1 +
- filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +-
- helpcompiler/source/HelpLinker.cxx | 4 ++++
- include/xmloff/xmltoken.hxx | 2 +-
- sax/source/fastparser/fastparser.cxx | 2 +-
- sc/source/core/tool/interpr7.cxx | 1 +
- sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +-
- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +-
- sc/source/filter/xml/xmlfilti.cxx | 6 +++---
- unoxml/source/dom/attr.cxx | 1 +
- unoxml/source/dom/document.cxx | 1 +
- unoxml/source/dom/documentbuilder.cxx | 1 +
- unoxml/source/dom/entity.cxx | 1 +
- unoxml/source/xpath/xpathapi.cxx | 7 ++++++-
- xmloff/source/core/xmltoken.cxx | 2 +-
- xmloff/source/style/PageMasterStyleMap.cxx | 2 +-
- xmlsecurity/inc/xmlsec-wrapper.h | 1 +
- xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 +
- 18 files changed, 28 insertions(+), 11 deletions(-)
-
-diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
-index 76aefec902ea..f3b9ef1bc919 100644
---- a/drawinglayer/source/tools/primitive2dxmldump.cxx
-+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
-@@ -15,6 +15,7 @@
-
- #include <math.h>
- #include <memory>
-+#include <libxml/parser.h>
- #include <sal/log.hxx>
-
- #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-index 1a7c34805f1b..5e9a7c4bcd35 100644
---- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
-+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-@@ -333,7 +333,7 @@ namespace XSLT
- }
- else
- {
-- xmlErrorPtr lastErr = xmlGetLastError();
-+ const xmlError* lastErr = xmlGetLastError();
- OUString msg;
- if (lastErr)
- msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
-diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
-index 3d52834dbe6b..898a8b26392a 100644
---- a/helpcompiler/source/HelpLinker.cxx
-+++ b/helpcompiler/source/HelpLinker.cxx
-@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr;
-
- extern "C" {
-
-+#if LIBXML_VERSION >= 21200
-+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error)
-+#else
- static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
-+#endif
- {
- std::string aErrorMsg = error->message;
- std::string aXMLParsingFile;
-diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
-index 4e6441841774..ba42fae4d035 100644
---- a/include/xmloff/xmltoken.hxx
-+++ b/include/xmloff/xmltoken.hxx
-@@ -744,7 +744,7 @@ namespace xmloff::token {
- XML_EMBEDDED_VISIBLE_AREA,
- XML_EMBOSSED,
- XML_EMISSIVE_COLOR,
-- XML_EMPTY,
-+ XML_TOKEN_EMPTY,
- XML_EMPTY_LINE_REFRESH,
- XML_ENABLE_NUMBERING,
- XML_ENABLED,
-diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
-index ec8065016a12..e0338e053cf0 100644
---- a/sax/source/fastparser/fastparser.cxx
-+++ b/sax/source/fastparser/fastparser.cxx
-@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType )
- OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
- {
- const char* pMessage;
-- xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
-+ const xmlError* error = xmlCtxtGetLastError( ctxt );
- if( error && error->message )
- pMessage = error->message;
- else
-diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
-index 352c7cf70e45..ecb4ea346396 100644
---- a/sc/source/core/tool/interpr7.cxx
-+++ b/sc/source/core/tool/interpr7.cxx
-@@ -31,6 +31,7 @@
- #include <cstring>
- #include <memory>
- #include <string_view>
-+#include <libxml/parser.h>
-
- using namespace com::sun::star;
-
-diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
-index da65bec0dab7..bd5f16d828ff 100644
---- a/sc/source/filter/xml/XMLExportDataPilot.cxx
-+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
-@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo
-
- if (aQueryEntry.IsQueryByEmpty())
- {
-- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY));
-+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY));
- }
- else if (aQueryEntry.IsQueryByNonEmpty())
- {
-diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-index 6905e02d651b..e4307065bd92 100644
---- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-@@ -376,7 +376,7 @@ private:
- case SC_EQUAL:
- {
- if (rEntry.IsQueryByEmpty())
-- return GetXMLToken(XML_EMPTY);
-+ return GetXMLToken(XML_TOKEN_EMPTY);
- else if (rEntry.IsQueryByNonEmpty())
- return GetXMLToken(XML_NOEMPTY);
-
-diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
-index 7585ce0c50fa..61f7cfe4a349 100644
---- a/sc/source/filter/xml/xmlfilti.cxx
-+++ b/sc/source/filter/xml/xmlfilti.cxx
-@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator(
- rEntry.eOp = SC_BOTPERC;
- else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
- rEntry.eOp = SC_BOTVAL;
-- else if (IsXMLToken(aOpStr, XML_EMPTY))
-+ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY))
- rEntry.SetQueryByEmpty();
- else if (aOpStr == u">")
- rEntry.eOp = SC_GREATER;
-@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ )
- if (maQueryItems.empty())
- {
- ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
-- if (IsXMLToken(sOperator, XML_EMPTY))
-+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
- return;
- if (IsXMLToken(sDataType, XML_NUMBER))
- {
-@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ )
- else
- aFilterField.eConnect = SC_AND;
- pFilterContext->SetIsCaseSensitive(bIsCaseSensitive);
-- if (IsXMLToken(sOperator, XML_EMPTY))
-+ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
- aFilterField.SetQueryByEmpty();
- else if (IsXMLToken(sOperator, XML_NOEMPTY))
- aFilterField.SetQueryByNonEmpty();
-diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
-index dd974d910edb..d8d873cdf055 100644
---- a/unoxml/source/dom/attr.cxx
-+++ b/unoxml/source/dom/attr.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
-
- #include <memory>
-+#include <libxml/entities.h>
-
- #include <osl/diagnose.h>
- #include <sal/log.hxx>
-diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
-index cb48bd1635f8..0825fc2cd7ed 100644
---- a/unoxml/source/dom/document.cxx
-+++ b/unoxml/source/dom/document.cxx
-@@ -41,6 +41,7 @@
- #include <eventdispatcher.hxx>
-
- #include <string.h>
-+#include <libxml/xmlIO.h>
-
- #include <osl/diagnose.h>
-
-diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
-index c3cd7663d2fc..3898d58e4be4 100644
---- a/unoxml/source/dom/documentbuilder.cxx
-+++ b/unoxml/source/dom/documentbuilder.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
-
- #include <libxml/xmlerror.h>
-+#include <libxml/parser.h>
-
- #include <memory>
-
-diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
-index ccc8a0872499..98909dfe8f12 100644
---- a/unoxml/source/dom/entity.cxx
-+++ b/unoxml/source/dom/entity.cxx
-@@ -22,6 +22,7 @@
- #include <osl/diagnose.h>
-
- #include <string.h>
-+#include <libxml/entities.h>
-
- using namespace css::uno;
- using namespace css::xml::dom;
-diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
-index a60083983882..c2b753783176 100644
---- a/unoxml/source/xpath/xpathapi.cxx
-+++ b/unoxml/source/xpath/xpathapi.cxx
-@@ -26,6 +26,7 @@
- #include <libxml/xmlerror.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
-+#include <libxml/xmlIO.h>
-
- #include <com/sun/star/xml/xpath/XPathException.hpp>
-
-@@ -217,7 +218,7 @@ namespace XPath
- return selectSingleNode(contextNode, expr);
- }
-
-- static OUString make_error_message(xmlErrorPtr pError)
-+ static OUString make_error_message(const xmlError* pError)
- {
- OUStringBuffer buf;
- if (pError) {
-@@ -259,7 +260,11 @@ namespace XPath
- SAL_WARN("unoxml", "libxml2 error: " << str);
- }
-
-+#if LIBXML_VERSION >= 21200
-+ static void structured_error_func(void *, const xmlError* error)
-+#else
- static void structured_error_func(void *, xmlErrorPtr error)
-+#endif
- {
- SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
- }
-diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
-index 6879f37db295..e11dc0d16111 100644
---- a/xmloff/source/core/xmltoken.cxx
-+++ b/xmloff/source/core/xmltoken.cxx
-@@ -756,7 +756,7 @@ namespace xmloff::token {
- TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ),
- TOKEN( "embossed", XML_EMBOSSED ),
- TOKEN( "emissive-color", XML_EMISSIVE_COLOR ),
-- TOKEN( "empty", XML_EMPTY ),
-+ TOKEN( "empty", XML_TOKEN_EMPTY ),
- TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ),
- TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ),
- TOKEN( "enabled", XML_ENABLED ),
-diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
-index 7b2cab4751aa..6f631289672b 100644
---- a/xmloff/source/style/PageMasterStyleMap.cxx
-+++ b/xmloff/source/style/PageMasterStyleMap.cxx
-@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
- PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ),
- PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ),
- PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ),
-- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
-+ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
- PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER),
-
- //////////////////////////////////////////////////////////////////////////
-diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
-index 7c6d267e8b73..3ad705400c52 100644
---- a/xmlsecurity/inc/xmlsec-wrapper.h
-+++ b/xmlsecurity/inc/xmlsec-wrapper.h
-@@ -23,6 +23,7 @@
-
- #include <sal/types.h>
-
-+#include <libxml/parser.h>
- #include <xmlsec/base64.h>
- #include <xmlsec/bn.h>
- #include <xmlsec/errors.h>
-diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-index a49ccef1894c..a5863ffd0e2a 100644
---- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
-+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-@@ -23,6 +23,7 @@
-
- #include <string_view>
-
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
-
- #include <rtl/ustring.hxx>
---
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
deleted file mode 100644
index f670c0d85276..000000000000
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.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
-
-# 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 valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- 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/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? (
- 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.1
- media-libs/glm
- 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
- )
- 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? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/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}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # maybe upstreamable
- "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-
- # 24.2 branch
- "${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691
-)
-
-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}"
-
- # 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"
-
- # Workaround for bug #907905
- filter-lto
-
- # 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
-
- 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)
-
- 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-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
- $(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)
- $(use_with valgrind)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-03-25 12:05 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-03-25 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 4f83ff1b456d0223c130819f5737db555202b8e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 21:06:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 12:05:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f83ff1b
app-office/libreoffice: Patch out unused QtNetwork dependency
Closes: https://bugs.gentoo.org/925683
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-24.2-unused-qt6network.patch | 57 +++++++++++++++++++++
.../files/libreoffice-7.6-unused-qt5network.patch | 58 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-24.2.2.2.ebuild | 4 ++
.../libreoffice/libreoffice-24.2.9999.ebuild | 4 ++
app-office/libreoffice/libreoffice-7.6.6.3.ebuild | 3 ++
app-office/libreoffice/libreoffice-7.6.9999.ebuild | 3 ++
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++
7 files changed, 133 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-24.2-unused-qt6network.patch b/app-office/libreoffice/files/libreoffice-24.2-unused-qt6network.patch
new file mode 100644
index 000000000000..ccb69f22654e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-unused-qt6network.patch
@@ -0,0 +1,57 @@
+From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6d56df8625f1..9d6b35b747e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13341,7 +13341,7 @@ then
+
+ QT6_CFLAGS="-I$qt6_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -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"
+ fi
+@@ -13521,15 +13521,15 @@ then
+ AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".])
+ 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_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+- KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network"
++ 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 -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
++ 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++])
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
+ dnl KF6 development version as of 2023-06 uses version number 5.240
+- AC_MSG_CHECKING([whether KDE is >= 5.240])
++ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.240])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <kcoreaddons_version.h>
+
+@@ -13537,7 +13537,7 @@ int main(int argc, char **argv) {
+ if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0;
+ else return 1;
+ }
+- ]])],[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
+--
+2.44.0
+
diff --git a/app-office/libreoffice/files/libreoffice-7.6-unused-qt5network.patch b/app-office/libreoffice/files/libreoffice-7.6-unused-qt5network.patch
new file mode 100644
index 000000000000..edeb38854994
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.6-unused-qt5network.patch
@@ -0,0 +1,58 @@
+From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6d56df8625f1..9d6b35b747e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13213,7 +13213,7 @@ then
+
+ QT5_CFLAGS="-I$qt5_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+ QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+- QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
++ QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
+ if test "$_os" = "Emscripten"; then
+ QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm"
+ fi
+@@ -13442,8 +13442,8 @@ then
+ AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
+ fi
+
+- KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
+- KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network"
++ KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT -DQT_NO_VERSION_TAGGING"
++ KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets"
+ KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+
+ if test "$USING_X11" = TRUE; then
+@@ -13453,7 +13453,7 @@ then
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
+- AC_MSG_CHECKING([whether KDE is >= 5.0])
++ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.0])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <kcoreaddons_version.h>
+
+@@ -13461,7 +13461,7 @@ int main(int argc, char **argv) {
+ if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
+ else return 1;
+ }
+- ]])],[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
+--
+2.44.0
+
diff --git a/app-office/libreoffice/libreoffice-24.2.2.2.ebuild b/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
index db935414187a..b2b4c6c66ef4 100644
--- a/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
@@ -318,6 +318,10 @@ PATCHES=(
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+ "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 7e6c19c6cac2..1d2cd2085e48 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -315,6 +315,10 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${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"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
index d329808a9508..c46991a279eb 100644
--- a/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
)
diff --git a/app-office/libreoffice/libreoffice-7.6.9999.ebuild b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
index 37c26c171771..968f3b9be2f7 100644
--- a/app-office/libreoffice/libreoffice-7.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7e6c19c6cac2..1d2cd2085e48 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -315,6 +315,10 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${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"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-03-25 12:05 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-03-25 12:05 UTC (permalink / raw
To: gentoo-commits
commit: bf94390e3e97d5a8084ec5b7c4ab894adf1d2bad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 21:20:15 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 12:05:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf94390e
app-office/libreoffice: add 7.6.6.3, drop 7.6.6.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 +-
.../files/libreoffice-7.6.6.1-detect-plasma6.patch | 153 ---------------------
...e-7.6.6.1.ebuild => libreoffice-7.6.6.3.ebuild} | 3 -
3 files changed, 2 insertions(+), 158 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 20840c185dfb..6bb546e82c94 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,12 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08 SHA512 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
-DIST libreoffice-7.6.6.1.tar.xz 282150652 BLAKE2B 5327e945aeb05d793c647a21fe96cabdb5116617ba4c18423a57fe4ea8f62bab681b6da77f52e16493f6b4ab3e2555f5205f7bf2102320503c07821c9ac7c913 SHA512 26e51eb3d9124be4cf88eeb838f83d3341826b96382bc70b8e4737399410da5da770493f08c33ca3667b6bffb69097ceea79170e3785f9fdf0b27db21d134690
+DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446 SHA512 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
-DIST libreoffice-help-7.6.6.1.tar.xz 166956308 BLAKE2B 26ec36b28f7e6725817c88668d9156fa3acd7e247a6fe21affad6fc08c6b0e71c952d07576a37bfb548030d40bb45cb6079acf7f5da669c85e96f33564afc595 SHA512 aa427fc1e053138bd5a54da99846dee5b454bd328253226e2925b36f3869881e1e3ae8ca501157bb4d8c325071df1caa587654142f22c616f6939979347e3271
+DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
diff --git a/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch b/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch
deleted file mode 100644
index 9a4553db3447..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.6.6.1-detect-plasma6.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 4c836645eb0556a496c80e4604b63b47085020dd Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn@posteo.de>
-Date: Thu, 22 Jun 2023 08:40:56 +0200
-Subject: [PATCH] Detect Plasma 6 desktop
-
-Add detection for Plasma 6, which is currently in development stage.
-With the following plasma-workspace commit [1] in place,
-KDE_SESSION_VERSION is set to 6, so use that to detect it:
-
- commit 4c2242d7dfafac161baec3ec316af24d7b48ef8b
- Author: Michael Weghorn <m.weghorn@posteo.de>
- Date: Thu Jun 22 07:47:31 2023 +0200
-
- Set KDE_SESSION_VERSION to 6
-
- Since the master branch is based on Qt6/KF6 and will
- become Plasma 6, set KDE_SESSION_VERSION to "6".
-
- This will allow other applications to detect they're
- running in a (preview of a) Plasma 6 session and react
- accordingly.
- (E.g. LibreOffice can use this to choose to
- use its upcoming kf6 integration by default instead of the
- kf5 one.)
-
-[1] https://invent.kde.org/plasma/plasma-workspace/-/commit/4c2242d7dfafac161baec3ec316af24d7b48ef8b
-
-Change-Id: I5a15ad1fb177721fbfa016139c56a08b228f2e1f
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153437
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-(cherry picked from commit 8b0e1f2a914d672182d585d8cb2d4a815e88977e)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164700
-Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
----
- vcl/inc/unx/desktops.hxx | 1 +
- vcl/source/app/IconThemeSelector.cxx | 1 +
- vcl/source/app/salplug.cxx | 4 ++--
- vcl/unx/generic/desktopdetect/desktopdetector.cxx | 11 +++++++++++
- vcl/unx/kf5/KF5SalInstance.cxx | 8 +++++---
- 5 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
-index 0abb6aa71339..2056c2c37928 100644
---- a/vcl/inc/unx/desktops.hxx
-+++ b/vcl/inc/unx/desktops.hxx
-@@ -33,6 +33,7 @@ enum SAL_DLLPUBLIC_RTTI DesktopType
- DESKTOP_XFCE,
- DESKTOP_MATE,
- DESKTOP_PLASMA5,
-+ DESKTOP_PLASMA6,
- DESKTOP_LXQT
- }; // keep in sync with desktop_strings[] in salplug.cxx
-
-diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
-index 6b8dfc0f42c7..15eb4b7768fc 100644
---- a/vcl/source/app/IconThemeSelector.cxx
-+++ b/vcl/source/app/IconThemeSelector.cxx
-@@ -70,6 +70,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
- #else
- OUString r;
- if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
-+ desktopEnvironment.equalsIgnoreAsciiCase("plasma6") ||
- desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
- if (!bPreferDarkIconTheme)
- r = "breeze";
-diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
-index e51375b94ae5..fee5b7e33e6d 100644
---- a/vcl/source/app/salplug.cxx
-+++ b/vcl/source/app/salplug.cxx
-@@ -249,7 +249,7 @@ const char* const* autodetect_plugin_list()
- desktop == DESKTOP_XFCE ||
- desktop == DESKTOP_MATE )
- pList = pStandardFallbackList;
-- else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT)
-+ else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT)
- pList = pKDEFallbackList;
-
- return pList;
-@@ -426,7 +426,7 @@ const OUString& SalGetDesktopEnvironment()
- // Order to match desktops.hxx' DesktopType
- static const char * const desktop_strings[] = {
- "none", "unknown", "GNOME", "UNITY",
-- "XFCE", "MATE", "PLASMA5", "LXQT" };
-+ "XFCE", "MATE", "PLASMA5", "PLASMA6", "LXQT" };
- static OUString aDesktopEnvironment;
- if( aDesktopEnvironment.isEmpty())
- {
-diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-index bad134fbdafd..8baeb303feed 100644
---- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
-@@ -117,6 +117,13 @@ static bool is_plasma5_desktop()
- return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "5"));
- }
-
-+static bool is_plasma6_desktop()
-+{
-+ static const char* pFullVersion = getenv("KDE_FULL_SESSION");
-+ static const char* pSessionVersion = getenv("KDE_SESSION_VERSION");
-+ return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "6"));
-+}
-+
- extern "C"
- {
-
-@@ -132,6 +139,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
- return DESKTOP_LXQT;
- if (aOver.equalsIgnoreAsciiCase("plasma5") || aOver.equalsIgnoreAsciiCase("plasma"))
- return DESKTOP_PLASMA5;
-+ if (aOver.equalsIgnoreAsciiCase("plasma6"))
-+ return DESKTOP_PLASMA6;
- if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
- return DESKTOP_GNOME;
- if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) )
-@@ -190,6 +199,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
-
- if (is_plasma5_desktop())
- return DESKTOP_PLASMA5;
-+ if (is_plasma6_desktop())
-+ return DESKTOP_PLASMA6;
-
- // tdf#121275 if we still can't tell, and WAYLAND_DISPLAY
- // is set, default to gtk3
-diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
-index df5108e147a1..05f555f356f5 100644
---- a/vcl/unx/kf5/KF5SalInstance.cxx
-+++ b/vcl/unx/kf5/KF5SalInstance.cxx
-@@ -41,7 +41,8 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr<QApplication>& pQApp, bool bUseCa
-
- bool KF5SalInstance::hasNativeFileSelection() const
- {
-- if (Application::GetDesktopEnvironment() == "PLASMA5")
-+ const OUString sDesktop = Application::GetDesktopEnvironment();
-+ if (sDesktop == "PLASMA5" || sDesktop == "PLASMA6")
- return true;
- return QtInstance::hasNativeFileSelection();
- }
-@@ -61,8 +62,9 @@ KF5SalInstance::createPicker(css::uno::Reference<css::uno::XComponentContext> co
-
- // In order to insert custom controls, KF5FilePicker currently relies on KFileWidget
- // being used in the native file picker, which is only the case for KDE Plasma.
-- // Therefore, return the plain qt5 one in order to not lose custom controls.
-- if (Application::GetDesktopEnvironment() == "PLASMA5")
-+ // Therefore, return the plain qt5/qt6 one in order to not lose custom controls otherwise.
-+ const OUString sDesktop = Application::GetDesktopEnvironment();
-+ if (sDesktop == "PLASMA5" || sDesktop == "PLASMA6")
- return new KF5FilePicker(context, eMode);
- return QtInstance::createPicker(context, eMode);
- }
---
-2.44.0
-
diff --git a/app-office/libreoffice/libreoffice-7.6.6.1.ebuild b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.6.6.1.ebuild
rename to app-office/libreoffice/libreoffice-7.6.6.3.ebuild
index 0876e72c14a8..d329808a9508 100644
--- a/app-office/libreoffice/libreoffice-7.6.6.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.6.3.ebuild
@@ -296,9 +296,6 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
- # 7.6 branch:
- "${FILESDIR}/${PN}-7.6.6.1-detect-plasma6.patch" # bug 926227
-
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
)
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-02-20 20:49 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-02-20 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 4f051489edf62ab7a81996bced61927a492d5cab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 19:23:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 20:48:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f051489
app-office/libreoffice: drop 7.5.9.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 -
.../files/libreoffice-7.5.6.2-gcc-14.patch | 64 --
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 670 ---------------------
3 files changed, 738 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4225b9d9c9e1..5a20d6cc6b05 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,14 +20,10 @@ 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 libreoffice-24.2.1.1.tar.xz 280318924 BLAKE2B 62530c44ede834699054d07e9694264b7c2c74309e6aa4bd3b6e1c7b9d6ce8ecbd74c55e2748eaf38fe43740f4d3bcbfbbf0507752ce0c3b1269275f20eeb6a1 SHA512 33ff4852274bf6f6c37a2bfdddc925afdaf893352b830154e679b7ed919f697713a0beaf45315c61084b0f2b5c8e16635f9065de610d425581f640425de3fe67
-DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.9.2.tar.xz 270609308 BLAKE2B 8fbbe665b31aa6b85d17fa279da44da87817b8521abf40d80a40383b726e6cfb4026f9db50ac0a9bea92e88dc8be96a922a6937992d35b3766fda54f9fa7377a SHA512 36a012c044d755b2a9c1b0cea42290239647bdf81af198245075d89e19fb25b0e404a71db6beff743f738f059a85818bc89adb051c24b09234a763f42008b6e1
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.1.1.tar.xz 167069068 BLAKE2B de7795c3e57da85a4329562cdeed1017e34ef2743b2441392183a54557b40ba7f36b87ad534a61610e9bf37671f56e4d9fdffda794f0a61163bee3206f1515ea SHA512 e9f09a2d6adbdd01bae9bf05d9a0f573878cf37e10468eaf0c1cbcd05e109d6bec3c496bdcb58030bd5f8d1472342334f983c63ecc3756ff2c9a0e231b86fdb9
-DIST libreoffice-help-7.5.9.2.tar.xz 166236976 BLAKE2B c4c6c1e0ace4ebf43f1110edc21d9debb42b3a3756320ebec7d6e9f42b258c6d959a45778a4fc60aba85b4e7e852dbd9089a5694e32d37f5aa39f84ce826a18f SHA512 a3ad0005d0b09f0cc221a92f822c666a2d954cbf74d5f7c16e083cfaa4cfbc7a442d12dbcb51a3eaf3a7b3bd774f17614d79b6ec7553cec46edcb341c97ecf5b
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
-DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8
diff --git a/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch b/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
deleted file mode 100644
index 1d73ea97d807..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.6.2-gcc-14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From db98a3f1b1a703ea8e1284b8815eea2274abb2db Mon Sep 17 00:00:00 2001
-From: Martin Jambor <mjambor@suse.cz>
-Date: Wed, 7 Jun 2023 18:11:45 +0200
-Subject: [PATCH] Add cstdlib include necessary to build with gcc14 libstdc++
- (tdf#155715)
-
-Without explicitely including <cstdlib>, compiling some files
-including store/source/storbase.hxx (such as store/source/storpage.cxx
-which includes it through store/source/storpage.hxx) will result in
-errors:
-
- error: ‘malloc’ is not a member of ‘std’
-
-and
-
- error: ‘free’ is not a member of ‘std’
-
-This patch simply adds the necessary include.
-
-Change-Id: I3d1fa2a17c5ae9d512f1de9d434dac3d82fc353f
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152712
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- store/source/storbase.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
-index feac0db962272..207cbf40a8d3c 100644
---- a/store/source/storbase.hxx
-+++ b/store/source/storbase.hxx
-@@ -32,6 +32,7 @@
-
- #include <store/types.h>
-
-+#include <cstdlib>
- #include <memory>
- #include <utility>
-
-From 436c879b355f2cde763b0386df92e0d3708180a7 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Mon, 5 Jun 2023 13:52:01 +0200
-Subject: [PATCH] Missing include (for std::find_if)
-
-Change-Id: I91d70d72ea6cb18ed4fde2f3b3a3d037668767e5
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152615
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
----
- libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
-index a89b8fc7fc72e..7127581856fce 100644
---- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
-+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
-@@ -16,6 +16,7 @@
-
- #include <LibreOfficeKit/LibreOfficeKitGtk.h>
-
-+#include <algorithm>
- #include <fstream>
- #include <map>
- #include <memory>
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
deleted file mode 100644
index d6651b34391d..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ /dev/null
@@ -1,670 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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}-7.5.2.2-loong-buildsys-fix.patch.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://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
-
-# 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 valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- 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/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.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.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
- 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
- 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
- )
- 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? (
- || (
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- 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}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # maybe upstreamable
- "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
-
- # 7.6 branch
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" # bug 881389
-
- # git master
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" # bug 916621
- "${FILESDIR}/${P}-libxml2-2.12.patch" # bug 917691
-)
-
-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}"
-
- # 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"
-
- # Workaround for bug #907905
- filter-lto
-
- # 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
-
- 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)
-
- 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-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-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)
- $(use_with valgrind)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-02-14 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-02-14 19:55 UTC (permalink / raw
To: gentoo-commits
commit: d9d6ce294d0657b3393b30d85792a27c064ec6f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:42:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d6ce29
app-office/libreoffice: Fix install Qt6/KF6 vcl plugin w/o Qt5/KF5
See also: https://gerrit.libreoffice.org/c/core/+/163313
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-24.2-kf6-configure.patch | 61 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-24.2.1.1.ebuild | 7 +--
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
new file mode 100644
index 000000000000..2a4952d7e7cc
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
@@ -0,0 +1,61 @@
+From ec69b448f4b6296edb6b28ced5ecb710be82438b Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Tue, 13 Feb 2024 16:25:35 +0100
+Subject: [PATCH] scp2: Take ENABLE_{KF,QT}6 into account
+
+The qt6 and kf6 VCL plugins are also part
+of the kde install set, so take
+`ENABLE_QT6` and `ENABLE_KF6` into
+account when deciding whether to install
+it.
+
+This makes packaging these VCL plugins work
+when building with `--enable-qt6` and/or
+`--enable-kf6`, but without `--enable-qt5`
+and `--enable-kf5`.
+
+Command that can be used for testing:
+
+ make DESTDIR=/tmp/dummy distro-pack-install -o build -o check
+
+(Then, check whether the "installation" in /tmp/dummy
+contains the VCL plugins as expected.)
+
+Thanks to Andreas Sturmlechner for reporting
+the issue on IRC #libreoffice-dev on 2024-02-12.
+
+Change-Id: Ieea67468e3388f8b7b66f53221574c6225516b44
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163313
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ scp2/InstallScript_setup_osl.mk | 2 +-
+ scp2/Module_scp2.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
+index 6f7b58204225e..cf69165c1b60f 100644
+--- a/scp2/InstallScript_setup_osl.mk
++++ b/scp2/InstallScript_setup_osl.mk
+@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ scp2/gnome \
+ ) \
+- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ scp2/kde \
+ ) \
+ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
+index 25ae8167df561..651413fa2c17e 100644
+--- a/scp2/Module_scp2.mk
++++ b/scp2/Module_scp2.mk
+@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ InstallModule_gnome \
+ ) \
+- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ InstallModule_kde \
+ ) \
+ ))
diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
index 588451cdcb06..c9eed10d3c29 100644
--- a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
@@ -313,12 +313,13 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-24.2-qtdetect.patch"
- # not yet upstream, sourced from Mandriva
- "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
-
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+ # git master, pending 24.2
+ "${FILESDIR}/${PN}-24.2-kf6-configure.patch"
+ "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
+
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-01-27 0:48 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-01-27 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 57541f65fc3e535af7cc7335b020ab7337eebebd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 23:51:53 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 00:47:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57541f65
app-office/libreoffice: Add IUSE qt6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-24.2-qtdetect.patch | 20 ++++++++
.../libreoffice/libreoffice-24.2.9999.ebuild | 59 ++++++++++++++++------
app-office/libreoffice/libreoffice-9999.ebuild | 59 ++++++++++++++++------
3 files changed, 106 insertions(+), 32 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-24.2-qtdetect.patch b/app-office/libreoffice/files/libreoffice-24.2-qtdetect.patch
new file mode 100644
index 000000000000..aec8c6ea71fa
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-qtdetect.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -13027,7 +13027,7 @@
+
+ dnl Check for Meta Object Compiler
+
+- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+ if test "$MOC5" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
+ the root of your Qt installation by exporting QT5DIR before running "configure".])
+@@ -13163,7 +13163,7 @@
+ qt6_libexec_dirs="$qt6_libexec_dirs:$lib_dir/libexec"
+ fi
+ done
+- AC_PATH_PROGS( MOC6, [moc-qt6 moc], no, [`dirname $qt6_libdir`/libexec:$QT6DIR/libexec:$qt6_libexec_dirs:`echo $qt6_libdirs | $SED -e 's/ /:/g'`:$PATH])
++ AC_PATH_PROGS( MOC6, [moc-qt6 moc], no, [$QT6DIR/bin:$QT6DIR/libexec])
+ if test "$MOC6" = "no"; then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
+ the root of your Qt installation by exporting QT6DIR before running "configure".])
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 5e42fa31a46e..eb5c23c90864 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -87,7 +87,7 @@ unset ADDONS_SRC
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 valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -204,15 +204,24 @@ COMMON_DEPEND="${PYTHON_DEPS}
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
+ !qt6? (
+ 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
+ )
+ 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 )
@@ -221,6 +230,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
@@ -254,7 +264,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
@@ -297,7 +307,7 @@ PATCHES=(
# 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"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -453,7 +463,13 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
+ if use qt6; then
+ export QT6DIR="$(qt6_get_bindir)/.."
+ else
+ if use kde; then
+ export QT5DIR="$(qt5_get_bindir)/.."
+ fi
+ fi
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then
@@ -494,7 +510,6 @@ src_configure() {
--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"
@@ -529,8 +544,6 @@ src_configure() {
$(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)
@@ -545,6 +558,20 @@ src_configure() {
$(use_with valgrind)
)
+ if use qt6; then
+ myeconfargs+=(
+ --disable-qt5
+ $(use_enable qt6 qt6)
+ $(use_enable kde kf6)
+ )
+ else
+ myeconfargs+=(
+ --disable-qt6
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ )
+ fi
+
if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 5e42fa31a46e..eb5c23c90864 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -87,7 +87,7 @@ unset ADDONS_SRC
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 valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -204,15 +204,24 @@ COMMON_DEPEND="${PYTHON_DEPS}
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
+ !qt6? (
+ 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
+ )
+ 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 )
@@ -221,6 +230,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
"
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
@@ -254,7 +264,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
@@ -297,7 +307,7 @@ PATCHES=(
# 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"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -453,7 +463,13 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
+ if use qt6; then
+ export QT6DIR="$(qt6_get_bindir)/.."
+ else
+ if use kde; then
+ export QT5DIR="$(qt5_get_bindir)/.."
+ fi
+ fi
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then
@@ -494,7 +510,6 @@ src_configure() {
--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"
@@ -529,8 +544,6 @@ src_configure() {
$(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)
@@ -545,6 +558,20 @@ src_configure() {
$(use_with valgrind)
)
+ if use qt6; then
+ myeconfargs+=(
+ --disable-qt5
+ $(use_enable qt6 qt6)
+ $(use_enable kde kf6)
+ )
+ else
+ myeconfargs+=(
+ --disable-qt6
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ )
+ fi
+
if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2024-01-07 9:29 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 284558217afdaaa3cc08cd0bbe33c48e6dee7362
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 09:24:50 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 09:28:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28455821
app-office/libreoffice: drop vulnerable 7.5.6.2, 7.5.8.2, 7.5.8.2-r2
Bug: https://bugs.gentoo.org/919894
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 -
...libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch | 316 ----------
.../files/libreoffice-7.5.8.2-libcmis-0.6.patch | 39 --
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 661 --------------------
.../libreoffice/libreoffice-7.5.8.2-r2.ebuild | 671 ---------------------
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 664 --------------------
6 files changed, 2355 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 71aef1151dbe..f7ee42c9476b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,8 @@ 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 libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
-DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
DIST libreoffice-7.5.9.2.tar.xz 270609308 BLAKE2B 8fbbe665b31aa6b85d17fa279da44da87817b8521abf40d80a40383b726e6cfb4026f9db50ac0a9bea92e88dc8be96a922a6937992d35b3766fda54f9fa7377a SHA512 36a012c044d755b2a9c1b0cea42290239647bdf81af198245075d89e19fb25b0e404a71db6beff743f738f059a85818bc89adb051c24b09234a763f42008b6e1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
-DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
DIST libreoffice-help-7.5.9.2.tar.xz 166236976 BLAKE2B c4c6c1e0ace4ebf43f1110edc21d9debb42b3a3756320ebec7d6e9f42b258c6d959a45778a4fc60aba85b4e7e852dbd9089a5694e32d37f5aa39f84ce826a18f SHA512 a3ad0005d0b09f0cc221a92f822c666a2d954cbf74d5f7c16e083cfaa4cfbc7a442d12dbcb51a3eaf3a7b3bd774f17614d79b6ec7553cec46edcb341c97ecf5b
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
deleted file mode 100644
index 78afc0e88692..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 045bef390a025c3615d904524bf5ee21fa697ca4 Mon Sep 17 00:00:00 2001
-From: Michael Stahl <michael.stahl@allotropia.de>
-Date: Fri, 3 Nov 2023 20:16:09 +0100
-Subject: [PATCH] curl: mitigate migration to OpenSSL on Linux
-
-The problem is that curl 8.3.0 removed the NSS backend, so we now
-have no other choice than to use the bundled OpenSSL on Linux.
-
-Currently any curl https connection fails with:
-
- CurlSession.cxx:963: curl_easy_perform failed: (60) SSL certificate problem: unable to get local issuer certificate
-
-Apparently this requires manually telling curl which CA certificates to
-trust; there is a configure flag --with-ca-bundle but that is useless as
-it tries to load the file relative to whatever is the current working
-directory, and also did i mention that there are at least 3 different
-locations where a Linux system may store its system trusted CA
-certificates because ALL ABOUT CHOICE.
-
-So add a new header with an init function to try out various file
-locations listed in this nice blog article and call it from way too many
-places that independently use curl.
-
-https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-
-TODO: perhaps bundle a cacert.pem as a fallback in case the system chose
-to innovate by putting its certificates in yet another unexpected place
-
-(regression from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
-
-Change-Id: Ibf1cc0069bc2ae011ecead9a4c2b455e94b01241
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158915
-Tested-by: Jenkins
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-(cherry picked from commit 11f439b861922b9286b2e47ed326f3508a48d44e)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159125
-Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
----
- desktop/source/app/updater.cxx | 4 ++
- desktop/source/minidump/minidump.cxx | 4 ++
- extensions/source/update/check/download.cxx | 4 ++
- include/curlinit.hxx | 59 +++++++++++++++++++
- .../languagetool/languagetoolimp.cxx | 5 ++
- linguistic/source/translate.cxx | 4 ++
- svl/source/crypto/cryptosign.cxx | 6 ++
- ucb/source/ucp/cmis/cmis_content.cxx | 5 ++
- ucb/source/ucp/ftp/ftploaderthread.cxx | 4 ++
- ucb/source/ucp/webdav-curl/CurlSession.cxx | 2 +
- 10 files changed, 97 insertions(+)
- create mode 100644 include/curlinit.hxx
-
-diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
-index 5fb18dfad0bf8..4e4d2cda413ff 100644
---- a/desktop/source/app/updater.cxx
-+++ b/desktop/source/app/updater.cxx
-@@ -37,6 +37,8 @@
- #include <orcus/json_document_tree.hpp>
- #include <orcus/config.hpp>
- #include <orcus/pstring.hpp>
-+
-+#include <curlinit.hxx>
- #include <comphelper/hash.hxx>
-
- #include <com/sun/star/container/XNameAccess.hpp>
-@@ -546,6 +548,8 @@ std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
- if (!curl)
- return std::string();
-
-+ ::InitCurl_easy(curl.get());
-+
- curl_easy_setopt(curl.get(), CURLOPT_URL, rURL.getStr());
- curl_easy_setopt(curl.get(), CURLOPT_USERAGENT, kUserAgent);
- bool bUseProxy = false;
-diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx
-index 0bf20f2aa419e..7fbb0884987d8 100644
---- a/desktop/source/minidump/minidump.cxx
-+++ b/desktop/source/minidump/minidump.cxx
-@@ -17,6 +17,8 @@
-
- #include <curl/curl.h>
-
-+#include <curlinit.hxx>
-+
- #ifdef _WIN32
- #include <memory>
- #include <windows.h>
-@@ -95,6 +97,8 @@ static bool uploadContent(std::map<std::string, std::string>& parameters, std::s
- if (!curl)
- return false;
-
-+ ::InitCurl_easy(curl);
-+
- std::string proxy, proxy_user_pwd, ca_certificate_file, file, url, version;
-
- getProperty("Proxy", proxy, parameters);
-diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
-index ba371bdee570b..cdbbe2c327343 100644
---- a/extensions/source/update/check/download.cxx
-+++ b/extensions/source/update/check/download.cxx
-@@ -23,6 +23,8 @@
-
- #include <curl/curl.h>
-
-+#include <curlinit.hxx>
-+
- #include <o3tl/string_view.hxx>
- #include <osl/diagnose.h>
- #include <osl/file.h>
-@@ -222,6 +224,8 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
-
- if( nullptr != pCURL )
- {
-+ ::InitCurl_easy(pCURL);
-+
- out.curl = pCURL;
-
- OString aURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8));
-diff --git a/include/curlinit.hxx b/include/curlinit.hxx
-new file mode 100644
-index 0000000000000..8b3a9968419da
---- /dev/null
-+++ b/include/curlinit.hxx
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-+/*
-+ * This file is part of the LibreOffice project.
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ */
-+
-+#pragma once
-+
-+#include <curl/curl.h>
-+
-+#if defined(LINUX) && !defined(SYSTEM_CURL)
-+#include <com/sun/star/uno/RuntimeException.hpp>
-+
-+#include <unistd.h>
-+
-+static char const* GetCABundleFile()
-+{
-+ // try system ones first; inspired by:
-+ // https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-+ auto const candidates = {
-+ "/etc/pki/tls/certs/ca-bundle.crt",
-+ "/etc/pki/tls/certs/ca-bundle.trust.crt",
-+ "/etc/ssl/certs/ca-certificates.crt",
-+ "/var/lib/ca-certificates/ca-bundle.pem",
-+ };
-+ for (char const* const candidate : candidates)
-+ {
-+ if (access(candidate, R_OK) == 0)
-+ {
-+ return candidate;
-+ }
-+ }
-+
-+ throw css::uno::RuntimeException("no OpenSSL CA certificate bundle found");
-+}
-+
-+static void InitCurl_easy(CURL* const pCURL)
-+{
-+ char const* const path = GetCABundleFile();
-+ auto rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path);
-+ if (rc != CURLE_OK) // only if OOM?
-+ {
-+ throw css::uno::RuntimeException("CURLOPT_CAINFO failed");
-+ }
-+}
-+
-+#else
-+
-+static void InitCurl_easy(CURL* const)
-+{
-+ // these don't use OpenSSL so CAs work out of the box
-+}
-+
-+#endif
-+
-+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
-diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-index 4fa88ac0118f4..455fa12803d51 100644
---- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
-@@ -35,6 +35,9 @@
- #include <boost/property_tree/json_parser.hpp>
- #include <algorithm>
- #include <string_view>
-+
-+#include <curlinit.hxx>
-+
- #include <sal/log.hxx>
- #include <svtools/languagetoolcfg.hxx>
- #include <tools/color.hxx>
-@@ -336,6 +339,8 @@ std::string LanguageToolGrammarChecker::makeHttpRequest(std::string_view aURL, H
- if (!curl)
- return {}; // empty string
-
-+ ::InitCurl_easy(curl.get());
-+
- bool isPremium = false;
- SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
- OString apiKey = OUStringToOString(rLanguageOpts.getApiKey(), RTL_TEXTENCODING_UTF8);
-diff --git a/linguistic/source/translate.cxx b/linguistic/source/translate.cxx
-index 12f5491e21297..fdd95fca2988e 100644
---- a/linguistic/source/translate.cxx
-+++ b/linguistic/source/translate.cxx
-@@ -4,6 +4,7 @@
- #include <rtl/string.h>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#include <curlinit.hxx>
- #include <vcl/htmltransferable.hxx>
- #include <tools/long.hxx>
-
-@@ -16,6 +17,9 @@ OString Translate(const OString& rTargetLang, const OString& rAPIUrl, const OStr
-
- std::unique_ptr<CURL, std::function<void(CURL*)>> curl(curl_easy_init(),
- [](CURL* p) { curl_easy_cleanup(p); });
-+
-+ ::InitCurl_easy(curl.get());
-+
- (void)curl_easy_setopt(curl.get(), CURLOPT_URL, rAPIUrl.getStr());
- (void)curl_easy_setopt(curl.get(), CURLOPT_FAILONERROR, 1L);
- (void)curl_easy_setopt(curl.get(), CURLOPT_TIMEOUT, CURL_TIMEOUT);
-diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
-index 1d63378455690..b5e2eb0155e13 100644
---- a/svl/source/crypto/cryptosign.cxx
-+++ b/svl/source/crypto/cryptosign.cxx
-@@ -15,6 +15,10 @@
- #include <svl/sigstruct.hxx>
- #include <config_crypto.h>
-
-+#if USE_CRYPTO_NSS
-+#include <curlinit.hxx>
-+#endif
-+
- #include <rtl/character.hxx>
- #include <rtl/strbuf.hxx>
- #include <rtl/string.hxx>
-@@ -1081,6 +1085,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
- return false;
- }
-
-+ ::InitCurl_easy(curl);
-+
- SAL_INFO("svl.crypto", "Setting curl to verbose: " << (curl_easy_setopt(curl, CURLOPT_VERBOSE, 1) == CURLE_OK ? "OK" : "FAIL"));
-
- if ((rc = curl_easy_setopt(curl, CURLOPT_URL, OUStringToOString(m_aSignTSA, RTL_TEXTENCODING_UTF8).getStr())) != CURLE_OK)
-diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
-index 0bd38ea31f651..2ec1c336a706b 100644
---- a/ucb/source/ucp/cmis/cmis_content.cxx
-+++ b/ucb/source/ucp/cmis/cmis_content.cxx
-@@ -56,6 +56,8 @@
- #include <ucbhelper/proxydecider.hxx>
- #include <ucbhelper/macros.hxx>
- #include <sax/tools/converter.hxx>
-+#include <curlinit.hxx>
-+
- #include <utility>
-
- #include "auth_provider.hxx"
-@@ -335,6 +337,9 @@ namespace cmis
- new CertValidationHandler( xEnv, m_xContext, aBindingUrl.GetHost( ) ) );
- libcmis::SessionFactory::setCertificateValidationHandler( certHandler );
-
-+ // init libcurl callback
-+ libcmis::SessionFactory::setCurlInitProtocolsFunction(&::InitCurl_easy);
-+
- // Get the auth credentials
- AuthProvider aAuthProvider(xEnv, m_xIdentifier->getContentIdentifier(), m_aURL.getBindingUrl());
- AuthProvider::setXEnv( xEnv );
-diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
-index f5ebfe36cdda5..91130fc1bc9cf 100644
---- a/ucb/source/ucp/ftp/ftploaderthread.cxx
-+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
-@@ -25,6 +25,8 @@
- #include "ftploaderthread.hxx"
- #include "curl.hxx"
-
-+#include <curlinit.hxx>
-+
- using namespace ftp;
-
-
-@@ -75,6 +77,8 @@ CURL* FTPLoaderThread::handle() {
- if(!ret) {
- ret = curl_easy_init();
- if (ret != nullptr) {
-+ ::InitCurl_easy(ret);
-+
- // Make sure curl is not internally using environment variables like
- // "ftp_proxy":
- if (curl_easy_setopt(ret, CURLOPT_PROXY, "") != CURLE_OK) {
-diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-index 4839a1f85e03d..346d58b5969d5 100644
---- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
-+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-@@ -34,6 +34,7 @@
- #include <rtl/uri.hxx>
- #include <rtl/strbuf.hxx>
- #include <rtl/ustrbuf.hxx>
-+#include <curlinit.hxx>
- #include <config_version.h>
-
- #include <map>
-@@ -679,6 +680,7 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext,
- assert(rc == CURLE_OK);
- rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_HEADERFUNCTION, &header_callback);
- assert(rc == CURLE_OK);
-+ ::InitCurl_easy(m_pCurl.get());
- // tdf#149921 by default, with schannel (WNT) connection fails if revocation
- // lists cannot be checked; try to limit the checking to when revocation
- // lists can actually be retrieved (usually not the case for self-signed CA)
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
deleted file mode 100644
index ae029a3c9a2c..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.5.8.2-libcmis-0.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e9320e567d6bca32783d0f716f386761d03a875a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
-Date: Mon, 13 Nov 2023 10:13:50 +0000
-Subject: upgrade libcmis
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
-(cherry picked from commit 3368447e826d4204086e4d8bfe59af4412c16233)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159454
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-(cherry picked from commit 25b159729f1202ca2a42de5e76f22718d68400c8)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159589
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'configure.ac')
-
-diff --git a/configure.ac b/configure.ac
-index a88c81646c40..bdd08abeeeb5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7532,7 +7532,7 @@ AC_SUBST(GPERF)
- dnl ===================================================================
- dnl Check for system libcmis
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2],enabled)
-+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
-
- dnl ===================================================================
- dnl C++11
---
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
deleted file mode 100644
index 7ec34f336fdf..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.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://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
-
-# 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 valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- 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/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.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.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
- 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
- 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
- )
- valgrind? ( dev-util/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
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- 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"
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.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}"
-
- # 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"
-
- # Workaround for bug #907905
- filter-lto
-
- # 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
-
- 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)
-
- 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-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-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)
- $(use_with valgrind)
- )
-
- 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
-}
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
deleted file mode 100644
index 984ca1c390bb..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ /dev/null
@@ -1,671 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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}-7.5.2.2-loong-buildsys-fix.patch.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://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
-
-# 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 valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- 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/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.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.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
- 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
- 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
- )
- valgrind? ( dev-util/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
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- 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"
-
- # maybe upstreamable
- "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
-
- # 7.5.9.1
- "${FILESDIR}/${P}-libcmis-0.6.patch" # prerequisite for below
- "${FILESDIR}/${P}-curl-8.3.0-mitigation.patch" # bug 891903(?)
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.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}"
-
- # 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"
-
- # Workaround for bug #907905
- filter-lto
-
- # 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
-
- 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)
-
- 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-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-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)
- $(use_with valgrind)
- )
-
- 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
-}
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
deleted file mode 100644
index c0a3d703ff40..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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}-7.5.2.2-loong-buildsys-fix.patch.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://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
-
-# 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 valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- 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/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.5.2-r2:0.5
- 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.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
- 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
- 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
- )
- valgrind? ( dev-util/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
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- 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"
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.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}"
-
- # 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"
-
- # Workaround for bug #907905
- filter-lto
-
- # 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
-
- 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)
-
- 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-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-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)
- $(use_with valgrind)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2023-12-07 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2023-12-07 18:50 UTC (permalink / raw
To: gentoo-commits
commit: bd327737a7988fc40e8c46dd134d4d72ea79601c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 17:31:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 18:50:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd327737
app-office/libreoffice: Fix build with dev-libs/libxml2-2.12.0
Closes: https://bugs.gentoo.org/917691
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-7.5.9.2-libxml2-2.12.patch | 303 +++++++++++++++++++++
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 7 +-
2 files changed, 308 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
new file mode 100644
index 000000000000..bc7ae2a561ff
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.5.9.2-libxml2-2.12.patch
@@ -0,0 +1,303 @@
+From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos@collabora.com>
+Date: Mon, 27 Nov 2023 08:02:59 +0100
+Subject: tdf#158302 fix build against system-libxml-2.12
+
+Seen in a fedora:40 container, using --with-system-libcmis,
+--with-system-liblangtag and --with-system-xmlsec.
+
+Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980
+Tested-by: Jenkins
+Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
+---
+ drawinglayer/source/tools/primitive2dxmldump.cxx | 1 +
+ filter/source/xsltfilter/LibXSLTTransformer.cxx | 2 +-
+ helpcompiler/source/HelpLinker.cxx | 4 ++++
+ include/xmloff/xmltoken.hxx | 2 +-
+ sax/source/fastparser/fastparser.cxx | 2 +-
+ sc/source/core/tool/interpr7.cxx | 1 +
+ sc/source/filter/xml/XMLExportDataPilot.cxx | 2 +-
+ sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +-
+ sc/source/filter/xml/xmlfilti.cxx | 6 +++---
+ unoxml/source/dom/attr.cxx | 1 +
+ unoxml/source/dom/document.cxx | 1 +
+ unoxml/source/dom/documentbuilder.cxx | 1 +
+ unoxml/source/dom/entity.cxx | 1 +
+ unoxml/source/xpath/xpathapi.cxx | 7 ++++++-
+ xmloff/source/core/xmltoken.cxx | 2 +-
+ xmloff/source/style/PageMasterStyleMap.cxx | 2 +-
+ xmlsecurity/inc/xmlsec-wrapper.h | 1 +
+ xmlsecurity/inc/xmlsec/saxhelper.hxx | 1 +
+ 18 files changed, 28 insertions(+), 11 deletions(-)
+
+diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
+index 76aefec902ea..f3b9ef1bc919 100644
+--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
++++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
+@@ -15,6 +15,7 @@
+
+ #include <math.h>
+ #include <memory>
++#include <libxml/parser.h>
+ #include <sal/log.hxx>
+
+ #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
+diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
+index 1a7c34805f1b..5e9a7c4bcd35 100644
+--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
++++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
+@@ -333,7 +333,7 @@ namespace XSLT
+ }
+ else
+ {
+- xmlErrorPtr lastErr = xmlGetLastError();
++ const xmlError* lastErr = xmlGetLastError();
+ OUString msg;
+ if (lastErr)
+ msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
+diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
+index 3d52834dbe6b..898a8b26392a 100644
+--- a/helpcompiler/source/HelpLinker.cxx
++++ b/helpcompiler/source/HelpLinker.cxx
+@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr;
+
+ extern "C" {
+
++#if LIBXML_VERSION >= 21200
++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error)
++#else
+ static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
++#endif
+ {
+ std::string aErrorMsg = error->message;
+ std::string aXMLParsingFile;
+diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
+index 4e6441841774..ba42fae4d035 100644
+--- a/include/xmloff/xmltoken.hxx
++++ b/include/xmloff/xmltoken.hxx
+@@ -744,7 +744,7 @@ namespace xmloff::token {
+ XML_EMBEDDED_VISIBLE_AREA,
+ XML_EMBOSSED,
+ XML_EMISSIVE_COLOR,
+- XML_EMPTY,
++ XML_TOKEN_EMPTY,
+ XML_EMPTY_LINE_REFRESH,
+ XML_ENABLE_NUMBERING,
+ XML_ENABLED,
+diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
+index ec8065016a12..e0338e053cf0 100644
+--- a/sax/source/fastparser/fastparser.cxx
++++ b/sax/source/fastparser/fastparser.cxx
+@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType )
+ OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
+ {
+ const char* pMessage;
+- xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
++ const xmlError* error = xmlCtxtGetLastError( ctxt );
+ if( error && error->message )
+ pMessage = error->message;
+ else
+diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
+index 352c7cf70e45..ecb4ea346396 100644
+--- a/sc/source/core/tool/interpr7.cxx
++++ b/sc/source/core/tool/interpr7.cxx
+@@ -31,6 +31,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <string_view>
++#include <libxml/parser.h>
+
+ using namespace com::sun::star;
+
+diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
+index da65bec0dab7..bd5f16d828ff 100644
+--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
++++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
+@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo
+
+ if (aQueryEntry.IsQueryByEmpty())
+ {
+- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY));
++ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY));
+ }
+ else if (aQueryEntry.IsQueryByNonEmpty())
+ {
+diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+index 6905e02d651b..e4307065bd92 100644
+--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
++++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+@@ -376,7 +376,7 @@ private:
+ case SC_EQUAL:
+ {
+ if (rEntry.IsQueryByEmpty())
+- return GetXMLToken(XML_EMPTY);
++ return GetXMLToken(XML_TOKEN_EMPTY);
+ else if (rEntry.IsQueryByNonEmpty())
+ return GetXMLToken(XML_NOEMPTY);
+
+diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
+index 7585ce0c50fa..61f7cfe4a349 100644
+--- a/sc/source/filter/xml/xmlfilti.cxx
++++ b/sc/source/filter/xml/xmlfilti.cxx
+@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator(
+ rEntry.eOp = SC_BOTPERC;
+ else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
+ rEntry.eOp = SC_BOTVAL;
+- else if (IsXMLToken(aOpStr, XML_EMPTY))
++ else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY))
+ rEntry.SetQueryByEmpty();
+ else if (aOpStr == u">")
+ rEntry.eOp = SC_GREATER;
+@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ )
+ if (maQueryItems.empty())
+ {
+ ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
+- if (IsXMLToken(sOperator, XML_EMPTY))
++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
+ return;
+ if (IsXMLToken(sDataType, XML_NUMBER))
+ {
+@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ )
+ else
+ aFilterField.eConnect = SC_AND;
+ pFilterContext->SetIsCaseSensitive(bIsCaseSensitive);
+- if (IsXMLToken(sOperator, XML_EMPTY))
++ if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
+ aFilterField.SetQueryByEmpty();
+ else if (IsXMLToken(sOperator, XML_NOEMPTY))
+ aFilterField.SetQueryByNonEmpty();
+diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
+index dd974d910edb..d8d873cdf055 100644
+--- a/unoxml/source/dom/attr.cxx
++++ b/unoxml/source/dom/attr.cxx
+@@ -22,6 +22,7 @@
+ #include <string.h>
+
+ #include <memory>
++#include <libxml/entities.h>
+
+ #include <osl/diagnose.h>
+ #include <sal/log.hxx>
+diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
+index cb48bd1635f8..0825fc2cd7ed 100644
+--- a/unoxml/source/dom/document.cxx
++++ b/unoxml/source/dom/document.cxx
+@@ -41,6 +41,7 @@
+ #include <eventdispatcher.hxx>
+
+ #include <string.h>
++#include <libxml/xmlIO.h>
+
+ #include <osl/diagnose.h>
+
+diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
+index c3cd7663d2fc..3898d58e4be4 100644
+--- a/unoxml/source/dom/documentbuilder.cxx
++++ b/unoxml/source/dom/documentbuilder.cxx
+@@ -22,6 +22,7 @@
+ #include <string.h>
+
+ #include <libxml/xmlerror.h>
++#include <libxml/parser.h>
+
+ #include <memory>
+
+diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
+index ccc8a0872499..98909dfe8f12 100644
+--- a/unoxml/source/dom/entity.cxx
++++ b/unoxml/source/dom/entity.cxx
+@@ -22,6 +22,7 @@
+ #include <osl/diagnose.h>
+
+ #include <string.h>
++#include <libxml/entities.h>
+
+ using namespace css::uno;
+ using namespace css::xml::dom;
+diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
+index a60083983882..c2b753783176 100644
+--- a/unoxml/source/xpath/xpathapi.cxx
++++ b/unoxml/source/xpath/xpathapi.cxx
+@@ -26,6 +26,7 @@
+ #include <libxml/xmlerror.h>
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
++#include <libxml/xmlIO.h>
+
+ #include <com/sun/star/xml/xpath/XPathException.hpp>
+
+@@ -217,7 +218,7 @@ namespace XPath
+ return selectSingleNode(contextNode, expr);
+ }
+
+- static OUString make_error_message(xmlErrorPtr pError)
++ static OUString make_error_message(const xmlError* pError)
+ {
+ OUStringBuffer buf;
+ if (pError) {
+@@ -259,7 +260,11 @@ namespace XPath
+ SAL_WARN("unoxml", "libxml2 error: " << str);
+ }
+
++#if LIBXML_VERSION >= 21200
++ static void structured_error_func(void *, const xmlError* error)
++#else
+ static void structured_error_func(void *, xmlErrorPtr error)
++#endif
+ {
+ SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
+ }
+diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
+index 6879f37db295..e11dc0d16111 100644
+--- a/xmloff/source/core/xmltoken.cxx
++++ b/xmloff/source/core/xmltoken.cxx
+@@ -756,7 +756,7 @@ namespace xmloff::token {
+ TOKEN( "embedded-visible-area", XML_EMBEDDED_VISIBLE_AREA ),
+ TOKEN( "embossed", XML_EMBOSSED ),
+ TOKEN( "emissive-color", XML_EMISSIVE_COLOR ),
+- TOKEN( "empty", XML_EMPTY ),
++ TOKEN( "empty", XML_TOKEN_EMPTY ),
+ TOKEN( "empty-line-refresh", XML_EMPTY_LINE_REFRESH ),
+ TOKEN( "enable-numbering", XML_ENABLE_NUMBERING ),
+ TOKEN( "enabled", XML_ENABLED ),
+diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
+index 7b2cab4751aa..6f631289672b 100644
+--- a/xmloff/source/style/PageMasterStyleMap.cxx
++++ b/xmloff/source/style/PageMasterStyleMap.cxx
+@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
+ PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_WIDTH ),
+ PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM, CTF_PM_FTN_LINE_DISTANCE ),
+ PLMAP( PROP_FootnoteLineWeight, XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP, XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_WEIGHT ),
+- PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
++ PLMAP( PROP_FootnoteLineStyle, XML_NAMESPACE_STYLE, XML_TOKEN_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ),
+ PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER),
+
+ //////////////////////////////////////////////////////////////////////////
+diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
+index 7c6d267e8b73..3ad705400c52 100644
+--- a/xmlsecurity/inc/xmlsec-wrapper.h
++++ b/xmlsecurity/inc/xmlsec-wrapper.h
+@@ -23,6 +23,7 @@
+
+ #include <sal/types.h>
+
++#include <libxml/parser.h>
+ #include <xmlsec/base64.h>
+ #include <xmlsec/bn.h>
+ #include <xmlsec/errors.h>
+diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
+index a49ccef1894c..a5863ffd0e2a 100644
+--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
++++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
+@@ -23,6 +23,7 @@
+
+ #include <string_view>
+
++#include <libxml/parser.h>
+ #include <libxml/tree.h>
+
+ #include <rtl/ustring.hxx>
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index b0ffc896108d..786eff58ca6c 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -298,9 +298,12 @@ PATCHES=(
# maybe upstreamable
"${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
+ # 7.6 branch
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch" # bug 881389
+
# git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch" # bug 916621
+ "${FILESDIR}/${P}-libxml2-2.12.patch" # bug 917691
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2023-11-21 22:36 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2023-11-21 22:36 UTC (permalink / raw
To: gentoo-commits
commit: ae814da1be33ea0e11cc7fdb6fdfae6444c610d2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 22:04:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 22:19:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae814da1
app-office/libreoffice: curl: mitigate migration to OpenSSL on Linux
Bug: https://bugs.gentoo.org/891903
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch | 316 +++++++++++++++++++++
.../libreoffice/libreoffice-7.5.8.2-r2.ebuild | 3 +
2 files changed, 319 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch b/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
new file mode 100644
index 000000000000..78afc0e88692
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.5.8.2-curl-8.3.0-mitigation.patch
@@ -0,0 +1,316 @@
+From 045bef390a025c3615d904524bf5ee21fa697ca4 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <michael.stahl@allotropia.de>
+Date: Fri, 3 Nov 2023 20:16:09 +0100
+Subject: [PATCH] curl: mitigate migration to OpenSSL on Linux
+
+The problem is that curl 8.3.0 removed the NSS backend, so we now
+have no other choice than to use the bundled OpenSSL on Linux.
+
+Currently any curl https connection fails with:
+
+ CurlSession.cxx:963: curl_easy_perform failed: (60) SSL certificate problem: unable to get local issuer certificate
+
+Apparently this requires manually telling curl which CA certificates to
+trust; there is a configure flag --with-ca-bundle but that is useless as
+it tries to load the file relative to whatever is the current working
+directory, and also did i mention that there are at least 3 different
+locations where a Linux system may store its system trusted CA
+certificates because ALL ABOUT CHOICE.
+
+So add a new header with an init function to try out various file
+locations listed in this nice blog article and call it from way too many
+places that independently use curl.
+
+https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
+
+TODO: perhaps bundle a cacert.pem as a fallback in case the system chose
+to innovate by putting its certificates in yet another unexpected place
+
+(regression from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
+
+Change-Id: Ibf1cc0069bc2ae011ecead9a4c2b455e94b01241
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158915
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
+(cherry picked from commit 11f439b861922b9286b2e47ed326f3508a48d44e)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159125
+Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
+---
+ desktop/source/app/updater.cxx | 4 ++
+ desktop/source/minidump/minidump.cxx | 4 ++
+ extensions/source/update/check/download.cxx | 4 ++
+ include/curlinit.hxx | 59 +++++++++++++++++++
+ .../languagetool/languagetoolimp.cxx | 5 ++
+ linguistic/source/translate.cxx | 4 ++
+ svl/source/crypto/cryptosign.cxx | 6 ++
+ ucb/source/ucp/cmis/cmis_content.cxx | 5 ++
+ ucb/source/ucp/ftp/ftploaderthread.cxx | 4 ++
+ ucb/source/ucp/webdav-curl/CurlSession.cxx | 2 +
+ 10 files changed, 97 insertions(+)
+ create mode 100644 include/curlinit.hxx
+
+diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
+index 5fb18dfad0bf8..4e4d2cda413ff 100644
+--- a/desktop/source/app/updater.cxx
++++ b/desktop/source/app/updater.cxx
+@@ -37,6 +37,8 @@
+ #include <orcus/json_document_tree.hpp>
+ #include <orcus/config.hpp>
+ #include <orcus/pstring.hpp>
++
++#include <curlinit.hxx>
+ #include <comphelper/hash.hxx>
+
+ #include <com/sun/star/container/XNameAccess.hpp>
+@@ -546,6 +548,8 @@ std::string download_content(const OString& rURL, bool bFile, OUString& rHash)
+ if (!curl)
+ return std::string();
+
++ ::InitCurl_easy(curl.get());
++
+ curl_easy_setopt(curl.get(), CURLOPT_URL, rURL.getStr());
+ curl_easy_setopt(curl.get(), CURLOPT_USERAGENT, kUserAgent);
+ bool bUseProxy = false;
+diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx
+index 0bf20f2aa419e..7fbb0884987d8 100644
+--- a/desktop/source/minidump/minidump.cxx
++++ b/desktop/source/minidump/minidump.cxx
+@@ -17,6 +17,8 @@
+
+ #include <curl/curl.h>
+
++#include <curlinit.hxx>
++
+ #ifdef _WIN32
+ #include <memory>
+ #include <windows.h>
+@@ -95,6 +97,8 @@ static bool uploadContent(std::map<std::string, std::string>& parameters, std::s
+ if (!curl)
+ return false;
+
++ ::InitCurl_easy(curl);
++
+ std::string proxy, proxy_user_pwd, ca_certificate_file, file, url, version;
+
+ getProperty("Proxy", proxy, parameters);
+diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
+index ba371bdee570b..cdbbe2c327343 100644
+--- a/extensions/source/update/check/download.cxx
++++ b/extensions/source/update/check/download.cxx
+@@ -23,6 +23,8 @@
+
+ #include <curl/curl.h>
+
++#include <curlinit.hxx>
++
+ #include <o3tl/string_view.hxx>
+ #include <osl/diagnose.h>
+ #include <osl/file.h>
+@@ -222,6 +224,8 @@ static bool curl_run(std::u16string_view rURL, OutData& out, const OString& aPro
+
+ if( nullptr != pCURL )
+ {
++ ::InitCurl_easy(pCURL);
++
+ out.curl = pCURL;
+
+ OString aURL(OUStringToOString(rURL, RTL_TEXTENCODING_UTF8));
+diff --git a/include/curlinit.hxx b/include/curlinit.hxx
+new file mode 100644
+index 0000000000000..8b3a9968419da
+--- /dev/null
++++ b/include/curlinit.hxx
+@@ -0,0 +1,59 @@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
++/*
++ * This file is part of the LibreOffice project.
++ *
++ * This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
++ */
++
++#pragma once
++
++#include <curl/curl.h>
++
++#if defined(LINUX) && !defined(SYSTEM_CURL)
++#include <com/sun/star/uno/RuntimeException.hpp>
++
++#include <unistd.h>
++
++static char const* GetCABundleFile()
++{
++ // try system ones first; inspired by:
++ // https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
++ auto const candidates = {
++ "/etc/pki/tls/certs/ca-bundle.crt",
++ "/etc/pki/tls/certs/ca-bundle.trust.crt",
++ "/etc/ssl/certs/ca-certificates.crt",
++ "/var/lib/ca-certificates/ca-bundle.pem",
++ };
++ for (char const* const candidate : candidates)
++ {
++ if (access(candidate, R_OK) == 0)
++ {
++ return candidate;
++ }
++ }
++
++ throw css::uno::RuntimeException("no OpenSSL CA certificate bundle found");
++}
++
++static void InitCurl_easy(CURL* const pCURL)
++{
++ char const* const path = GetCABundleFile();
++ auto rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path);
++ if (rc != CURLE_OK) // only if OOM?
++ {
++ throw css::uno::RuntimeException("CURLOPT_CAINFO failed");
++ }
++}
++
++#else
++
++static void InitCurl_easy(CURL* const)
++{
++ // these don't use OpenSSL so CAs work out of the box
++}
++
++#endif
++
++/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
+diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+index 4fa88ac0118f4..455fa12803d51 100644
+--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
++++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+@@ -35,6 +35,9 @@
+ #include <boost/property_tree/json_parser.hpp>
+ #include <algorithm>
+ #include <string_view>
++
++#include <curlinit.hxx>
++
+ #include <sal/log.hxx>
+ #include <svtools/languagetoolcfg.hxx>
+ #include <tools/color.hxx>
+@@ -336,6 +339,8 @@ std::string LanguageToolGrammarChecker::makeHttpRequest(std::string_view aURL, H
+ if (!curl)
+ return {}; // empty string
+
++ ::InitCurl_easy(curl.get());
++
+ bool isPremium = false;
+ SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
+ OString apiKey = OUStringToOString(rLanguageOpts.getApiKey(), RTL_TEXTENCODING_UTF8);
+diff --git a/linguistic/source/translate.cxx b/linguistic/source/translate.cxx
+index 12f5491e21297..fdd95fca2988e 100644
+--- a/linguistic/source/translate.cxx
++++ b/linguistic/source/translate.cxx
+@@ -4,6 +4,7 @@
+ #include <rtl/string.h>
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#include <curlinit.hxx>
+ #include <vcl/htmltransferable.hxx>
+ #include <tools/long.hxx>
+
+@@ -16,6 +17,9 @@ OString Translate(const OString& rTargetLang, const OString& rAPIUrl, const OStr
+
+ std::unique_ptr<CURL, std::function<void(CURL*)>> curl(curl_easy_init(),
+ [](CURL* p) { curl_easy_cleanup(p); });
++
++ ::InitCurl_easy(curl.get());
++
+ (void)curl_easy_setopt(curl.get(), CURLOPT_URL, rAPIUrl.getStr());
+ (void)curl_easy_setopt(curl.get(), CURLOPT_FAILONERROR, 1L);
+ (void)curl_easy_setopt(curl.get(), CURLOPT_TIMEOUT, CURL_TIMEOUT);
+diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
+index 1d63378455690..b5e2eb0155e13 100644
+--- a/svl/source/crypto/cryptosign.cxx
++++ b/svl/source/crypto/cryptosign.cxx
+@@ -15,6 +15,10 @@
+ #include <svl/sigstruct.hxx>
+ #include <config_crypto.h>
+
++#if USE_CRYPTO_NSS
++#include <curlinit.hxx>
++#endif
++
+ #include <rtl/character.hxx>
+ #include <rtl/strbuf.hxx>
+ #include <rtl/string.hxx>
+@@ -1081,6 +1085,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
+ return false;
+ }
+
++ ::InitCurl_easy(curl);
++
+ SAL_INFO("svl.crypto", "Setting curl to verbose: " << (curl_easy_setopt(curl, CURLOPT_VERBOSE, 1) == CURLE_OK ? "OK" : "FAIL"));
+
+ if ((rc = curl_easy_setopt(curl, CURLOPT_URL, OUStringToOString(m_aSignTSA, RTL_TEXTENCODING_UTF8).getStr())) != CURLE_OK)
+diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
+index 0bd38ea31f651..2ec1c336a706b 100644
+--- a/ucb/source/ucp/cmis/cmis_content.cxx
++++ b/ucb/source/ucp/cmis/cmis_content.cxx
+@@ -56,6 +56,8 @@
+ #include <ucbhelper/proxydecider.hxx>
+ #include <ucbhelper/macros.hxx>
+ #include <sax/tools/converter.hxx>
++#include <curlinit.hxx>
++
+ #include <utility>
+
+ #include "auth_provider.hxx"
+@@ -335,6 +337,9 @@ namespace cmis
+ new CertValidationHandler( xEnv, m_xContext, aBindingUrl.GetHost( ) ) );
+ libcmis::SessionFactory::setCertificateValidationHandler( certHandler );
+
++ // init libcurl callback
++ libcmis::SessionFactory::setCurlInitProtocolsFunction(&::InitCurl_easy);
++
+ // Get the auth credentials
+ AuthProvider aAuthProvider(xEnv, m_xIdentifier->getContentIdentifier(), m_aURL.getBindingUrl());
+ AuthProvider::setXEnv( xEnv );
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index f5ebfe36cdda5..91130fc1bc9cf 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -25,6 +25,8 @@
+ #include "ftploaderthread.hxx"
+ #include "curl.hxx"
+
++#include <curlinit.hxx>
++
+ using namespace ftp;
+
+
+@@ -75,6 +77,8 @@ CURL* FTPLoaderThread::handle() {
+ if(!ret) {
+ ret = curl_easy_init();
+ if (ret != nullptr) {
++ ::InitCurl_easy(ret);
++
+ // Make sure curl is not internally using environment variables like
+ // "ftp_proxy":
+ if (curl_easy_setopt(ret, CURLOPT_PROXY, "") != CURLE_OK) {
+diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
+index 4839a1f85e03d..346d58b5969d5 100644
+--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
++++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
+@@ -34,6 +34,7 @@
+ #include <rtl/uri.hxx>
+ #include <rtl/strbuf.hxx>
+ #include <rtl/ustrbuf.hxx>
++#include <curlinit.hxx>
+ #include <config_version.h>
+
+ #include <map>
+@@ -679,6 +680,7 @@ CurlSession::CurlSession(uno::Reference<uno::XComponentContext> xContext,
+ assert(rc == CURLE_OK);
+ rc = curl_easy_setopt(m_pCurl.get(), CURLOPT_HEADERFUNCTION, &header_callback);
+ assert(rc == CURLE_OK);
++ ::InitCurl_easy(m_pCurl.get());
+ // tdf#149921 by default, with schannel (WNT) connection fails if revocation
+ // lists cannot be checked; try to limit the checking to when revocation
+ // lists can actually be retrieved (usually not the case for self-signed CA)
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
index 855040bd7842..e2f24692185b 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
@@ -298,6 +298,9 @@ PATCHES=(
# maybe upstreamable
"${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
+ # 7.5.9.1
+ "${FILESDIR}/${P}-curl-8.3.0-mitigation.patch" # bug 891903(?)
+
# git master
"${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
"${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2023-06-10 9:39 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2023-06-10 9:39 UTC (permalink / raw
To: gentoo-commits
commit: 2df4c43f17ff05e2bf30a9c3f8329cd0faba035b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 08:53:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 09:38:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df4c43f
app-office/libreoffice: drop 7.4.6.2-r1
Bug: https://bugs.gentoo.org/908083
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice-7.3.7.2-boost-1.81-locale.patch | 41 --
.../libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch | 59 --
...libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch | 36 --
.../libreoffice/libreoffice-7.4.6.2-r1.ebuild | 655 ---------------------
5 files changed, 793 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5f3e930714da..d717eb30a241 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,12 +17,10 @@ DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d
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
-DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
DIST libreoffice-7.5.4.2.tar.xz 270237076 BLAKE2B d9903c46c899c129749b32b720788f2c56583524117624b161a84be356b08e3ed80cd1e34d5825ccbc2f627e7e37fc50407edbbd994d20071b9c3a10684b98c4 SHA512 582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
DIST libreoffice-help-7.5.4.2.tar.xz 166236736 BLAKE2B 2e1a2e6c77ae9aa7198f889623b5022176e424c95d57d1d45a5206c0c56526ed8aed0bcafa92ac57b7a852aba8bed5a12c0524c227d66626883ae05239243fd6 SHA512 cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch b/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch
deleted file mode 100644
index 18b2222fd313..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.3.7.2-boost-1.81-locale.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 23dcd4339428e4080029ec5ae658e75f01e79a62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Sun, 27 Nov 2022 18:59:24 +0700
-Subject: [PATCH] i18n: fix build with Boost 1.81.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Boost.Locale since 1.81.0 switch to enum classes for facet type [1].
-Switch our resource manager accordingly.
-
-1: https://github.com/boostorg/locale/commit/e5ed439ea39a4de915e9fb939cca95cae7d9d8d1
-
-Change-Id: Ief215363ceb79b2019606b20a7cde55c8df6a042
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143343
-Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- unotools/source/i18n/resmgr.cxx | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
-index ddedf5b9e8a2f..3a71163500624 100644
---- a/unotools/source/i18n/resmgr.cxx
-+++ b/unotools/source/i18n/resmgr.cxx
-@@ -127,8 +127,13 @@ namespace Translate
- if (aFind != aCache.end())
- return aFind->second;
- boost::locale::generator gen;
-+#if BOOST_VERSION < 108100
- gen.characters(boost::locale::char_facet);
- gen.categories(boost::locale::message_facet | boost::locale::information_facet);
-+#else
-+ gen.characters(boost::locale::char_facet_t::char_f);
-+ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information);
-+#endif
- #if defined(ANDROID)
- OString sPath(OString(lo_get_app_data_dir()) + "/program/resource");
- #else
diff --git a/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch b/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch
deleted file mode 100644
index 52b383a9d3e9..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 15e5d86cc55ad94ac946e04d5e25b84be5810970 Mon Sep 17 00:00:00 2001
-From: "Brett T. Warden" <brett.t.warden@intel.com>
-Date: Fri, 30 Dec 2022 08:43:25 +0100
-Subject: Remove dependency on BitArray.h from zxing-1.2.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In zxing-1.4.0, numerous headers are no longer public. Rework the
-ConvertToSVGFormat method so it uses bitmatrix.get instead of
-bitmatrix.getRow, similar to the ToSVG method in zxing itself.
-
-See https://github.com/zxing-cpp/zxing-cpp/issues/361
-
-Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874
-Tested-by: René Engelhard <rene@debian.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- cui/source/dialogs/QrCodeGenDialog.cxx | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
-index f8cbac1d758d..817be7f21ede 100644
---- a/cui/source/dialogs/QrCodeGenDialog.cxx
-+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
-@@ -27,7 +27,6 @@
- #endif
-
- #include <BarcodeFormat.h>
--#include <BitArray.h>
- #include <BitMatrix.h>
- #include <MultiFormatWriter.h>
- #include <TextUtfEncoding.h>
-@@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
- OStringBuffer sb;
- const int width = bitmatrix.width();
- const int height = bitmatrix.height();
-- ZXing::BitArray row(width);
- sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 "
- + OString::number(width) + " " + OString::number(height)
-@@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
- "<path d=\"");
- for (int i = 0; i < height; ++i)
- {
-- bitmatrix.getRow(i, row);
- for (int j = 0; j < width; ++j)
- {
-- if (row.get(j))
-+ if (bitmatrix.get(j, i))
- {
- sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z");
- }
---
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch b/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
deleted file mode 100644
index 0c47a14fe308..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gerrit.libreoffice.org/c/core/+/145479
-
-From a7a6b436f1a83321ccba5b6b44a275205aa729e0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 13 Jan 2023 15:09:59 +0000
-Subject: [PATCH] configure.ac: Fix build with --with-system-zxing and < Clang
- 16
-
-Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 onwards).
-
-This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
-
-The new version of libzxing requires C++ 17, per its release notes. Adapt
-the configure check accordingly to pass -std=c++17 when checking for its
-headers and save accordingly if successful.
-
-(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
-for our compiler, despite its name.)
-
-Bug: https://bugs.gentoo.org/890324
-Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -11187,7 +11187,7 @@ else
- continue
- fi
- dnl TODO: White space in $i would cause problems:
-- CXXFLAGS="$save_CXXFLAGS -I$i/ZXing"
-+ CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing"
- AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; break],
- [unset ac_cv_header_MultiFormatWriter_h], [#include <stdexcept>])
- done
---
-2.39.0
-
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
deleted file mode 100644
index de5dc3cb189f..000000000000
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# 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 )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-# xmlsec version cap for bug #904387
-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]
- <dev-libs/xmlsec-1.3.0
- >=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-2.6.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[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* )
- )
- )
- 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"
- "${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"
-)
-
-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"
-
- # 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
-
- 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)
-
- 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-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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2023-02-01 13:22 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 13:22 UTC (permalink / raw
To: gentoo-commits
commit: fd22f8abf0603ff08e6ce2d8fc1b97d16236d6fe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 13:21:01 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 13:22:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd22f8ab
app-office/libreoffice: Revert "fix build w/ gcc 13"
Apparently breaks build with USE=vulkan.
This reverts commit 3fae1aff9ce351bf561bb18cd9332b200d76b7d6.
Bug: https://bugs.gentoo.org/892523
Closes: https://bugs.gentoo.org/892800
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-7.4.4.2-gcc-13.patch | 82 ----------------------
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 1 -
2 files changed, 83 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch b/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch
deleted file mode 100644
index e27637416db4..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.4.4.2-gcc-13.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/892523
-https://gerrit.libreoffice.org/c/core/+/141833
-https://gerrit.libreoffice.org/c/core/+/145552
-https://github.com/LibreOffice/core/commit/3e009159cd1801507f6e965444a7dade5497f89a
-https://github.com/LibreOffice/core/commit/5877c6b118c99c9ec807a111471bfd67720a5086
-
-From 3e009159cd1801507f6e965444a7dade5497f89a Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Wed, 26 Oct 2022 08:06:01 +0200
-Subject: [PATCH] external/skia: Missing include
-
-...at least when building with Visual Studio 2022 Preview 17.4.0,
-
-> In file included from workdir/UnpackedTarball/skia/src/core/SkKeyHelpers.cpp:14:
-> workdir/UnpackedTarball/skia\src/core/SkShaderCodeDictionary.h(45,43): error: no type named 'string' in namespace 'std'
-> using GenerateGlueCodeForEntry = std::string (*)(const std::string& resultName,
-> ~~~~~^
-
-etc.
-
-Change-Id: Idd8dafb4e57e04088ee60954ecfa601cc7588e55
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141833
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---- a/external/skia/UnpackedTarball_skia.mk
-+++ b/external/skia/UnpackedTarball_skia.mk
-@@ -38,6 +38,7 @@ skia_patches := \
- allow-no-es2restrictions.patch.1 \
- vk_mem_alloc.patch.1 \
- tdf148624.patch.1 \
-+ missing-include.patch.0 \
-
- $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
-
---- /dev/null
-+++ b/external/skia/missing-include.patch.0
-@@ -0,0 +1,10 @@
-+--- src/core/SkShaderCodeDictionary.h
-++++ src/core/SkShaderCodeDictionary.h
-+@@ -9,6 +9,7 @@
-+ #define SkShaderCodeDictionary_DEFINED
-+
-+ #include <array>
-++#include <string>
-+ #include <unordered_map>
-+ #include <vector>
-+ #include "include/core/SkSpan.h"
-
-From 5877c6b118c99c9ec807a111471bfd67720a5086 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Mon, 16 Jan 2023 08:16:00 +0100
-Subject: [PATCH] external/skia: Missing include
-
-> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp:27:
-> In file included from workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:35:
-> workdir/UnpackedTarball/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h:2817:9: error: use of undeclared identifier 'snprintf'
-> snprintf(outStr, strLen, "%u", static_cast<unsigned int>(num));
-> ^
-
-etc.
-
-Change-Id: I4f13c8a137f23ef62d67c3b4dfa8f1c0ddfc5ec9
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145552
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---- a/external/skia/missing-include.patch.0
-+++ b/external/skia/missing-include.patch.0
-@@ -8,3 +8,13 @@
- #include <unordered_map>
- #include <vector>
- #include "include/core/SkSpan.h"
-+--- third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-++++ third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
-+@@ -2570,6 +2570,7 @@
-+ #include <cstring>
-+ #include <utility>
-+ #include <type_traits>
-++#include <stdio.h>
-+
-+ #ifdef _MSC_VER
-+ #include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
-
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index c470475c8bda..9e8e362925ae 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -298,7 +298,6 @@ PATCHES=(
"${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
"${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.4.2-gcc-13.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2022-09-02 4:38 Sam James
0 siblings, 0 replies; 49+ messages in thread
From: Sam James @ 2022-09-02 4:38 UTC (permalink / raw
To: gentoo-commits
commit: 3fe3e0dc873e97eb1bb5ccb2846fffee35182caa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 04:20:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 04:37:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe3e0dc
app-office/libreoffice: fix build with Poppler 22.09.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libreoffice-7.3.5.2-poppler-22.09.0.patch | 46 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 1 +
2 files changed, 47 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
new file mode 100644
index 000000000000..f269d53196da
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
@@ -0,0 +1,46 @@
+https://gerrit.libreoffice.org/c/core/+/139249
+
+From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 04:31:18 +0100
+Subject: [PATCH] Fix build with Poppler 22.09.0
+
+With Poppler 22.09.0, LO fails to build with:
+```
+/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
+ state->getLineDash(&dashArray, &arrayLen, &startOffset);
+ ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
+ const std::vector<double> &getLineDash(double *start)
+ ^
+1 error generated.
+```
+
+Poppler changed the getLineDash interface:
+```
+- void getLineDash(double **dash, int *length, double *start)
++ const std::vector<double> &getLineDash(double *start)
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state)
+ return;
+ assert(state);
+
+- double* dashArray; int arrayLen; double startOffset;
++ int arrayLen; double startOffset;
++#if POPPLER_CHECK_VERSION(22, 9, 0)
++ const double* dashArray;
++ const std::vector<double> &dash = state->getLineDash(&startOffset);
++ dashArray = dash.data();
++ arrayLen = dash.size();
++#else
++ double* dashArray;
+ state->getLineDash(&dashArray, &arrayLen, &startOffset);
++#endif
+
+ printf( "updateLineDash" );
+ if( arrayLen && dashArray )
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 07c41dd1473e..92051c1009c6 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -296,6 +296,7 @@ PATCHES=(
# Upstream
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+ "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2022-05-13 22:51 Conrad Kostecki
0 siblings, 0 replies; 49+ messages in thread
From: Conrad Kostecki @ 2022-05-13 22:51 UTC (permalink / raw
To: gentoo-commits
commit: b6a93415bdb253c924b8c9d31c3cf15b8dbeaf9d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 22:47:06 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri May 13 22:51:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a93415
app-office/libreoffice: add user/group for headless server
Closes: https://github.com/gentoo/gentoo/pull/24938
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-office/libreoffice/files/soffice.confd | 5 +++++
app-office/libreoffice/files/soffice.initd | 14 ++++++++++++++
...ice-7.3.3.2-r2.ebuild => libreoffice-7.3.3.2-r3.ebuild} | 5 +++++
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 5 +++++
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++++
5 files changed, 34 insertions(+)
diff --git a/app-office/libreoffice/files/soffice.confd b/app-office/libreoffice/files/soffice.confd
new file mode 100644
index 000000000000..df1a26969158
--- /dev/null
+++ b/app-office/libreoffice/files/soffice.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Default options for the soffice daemon
+libreoffice_opts="--accept=\"socket,host=localhost,port=8100,tcpNoDelay=1;urp;\""
diff --git a/app-office/libreoffice/files/soffice.initd b/app-office/libreoffice/files/soffice.initd
new file mode 100644
index 000000000000..ecd650145735
--- /dev/null
+++ b/app-office/libreoffice/files/soffice.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="LibreOffice headless daemon for generating documents"
+name="LibreOffice headless daemon"
+pidfile="/run/soffice.pid"
+soffice_args="${libreoffice_opts}"
+
+command="/usr/bin/soffice"
+command_args="--nodefault --nofirststartwizard --nolockcheck --nologo --norestore --headless ${soffice_args}"
+command_background="true"
+command_group="libreoffice"
+command_user="libreoffice"
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
rename to app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
index 22d36d585f5f..e03a37669e72 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND}
)
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
@@ -654,6 +656,9 @@ EOF
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() {
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 68cf55317be3..67730f9d7995 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND}
)
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
@@ -649,6 +651,9 @@ EOF
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() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b155f2f2f525..7fe70e573e21 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -250,6 +250,8 @@ DEPEND="${COMMON_DEPEND}
)
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
@@ -649,6 +651,9 @@ EOF
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() {
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2022-05-08 21:57 Sam James
0 siblings, 0 replies; 49+ messages in thread
From: Sam James @ 2022-05-08 21:57 UTC (permalink / raw
To: gentoo-commits
commit: af49d8e308d23be5066757c0c624a4f71d6fdaa4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 21:52:15 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 8 21:57:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af49d8e3
app-office/libreoffice: add 7.3.3.2 (unkeyworded)
Unkeyworded briefly until I get a chance to test PDF import/export
with Poppler patches.
Bug: https://bugs.gentoo.org/843311
Thanks-to: Stephan Hartmann <sultan <AT> gentoo.org> (improvement on the FreeBSD patch)
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
...Add-missing-nSize-set-for-Poppler-22.04.0.patch | 25 +
...t-FreeBSD-patch-for-Poppler-22.04.0-build.patch | 76 +++
app-office/libreoffice/libreoffice-7.3.3.2.ebuild | 669 +++++++++++++++++++++
4 files changed, 772 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 644b9adc3ee6..29b86b003ae9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,8 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
+DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
+DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
new file mode 100644
index 000000000000..f273d9565051
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/843311
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 8 May 2022 21:22:49 +0000
+Subject: [PATCH 2/2] Add missing nSize set for Poppler 22.04.0
+
+Thanks-to: Stephan Hartmann <sultan@gentoo.org>
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -478,6 +478,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ #else
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++ nSize = pBuf->size();
+ #endif
+ if( pBuf )
+ {
+@@ -502,6 +503,7 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
+ #else
+ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++ nSize = pBuf->size();
+ #endif
+ if( !pBuf )
+ return;
diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
new file mode 100644
index 000000000000..7879f87a516b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/843311
+https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd0366eae81b03bfa89689ec73c6f7
+
+From: Sam James <sam@gentoo.org>
+Date: Sun, 8 May 2022 21:20:25 +0000
+Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
+
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -474,11 +474,17 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st
+ {
+ // TODO(P3): Unfortunately, need to read stream twice, since
+ // we must write byte count to stdout before
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( pBuf )
+ {
+ aNewFont.isEmbedded = true;
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ gfree(pBuf);
++#endif
+ }
+ }
+
+@@ -492,21 +498,32 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+ return;
+
+ int nSize = 0;
+- char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
++#else
++ std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
++#endif
+ if( !pBuf )
+ return;
+
+ // ---sync point--- see SYNC STREAMS above
+ fflush(stdout);
+-
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#else
++ if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
++#endif
+ {
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ exit(1); // error
+ }
+ // ---sync point--- see SYNC STREAMS above
+ fflush(g_binary_out);
+- gfree(pBuf);
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
++ gfree(pBuf);
++#endif
+ }
+
+ #if POPPLER_CHECK_VERSION(0, 83, 0)
+@@ -759,7 +776,11 @@ void PDFOutDev::updateFont(GfxState *state)
+ {
+ assert(state);
+
++#if !POPPLER_CHECK_VERSION(22, 3, 0)
+ GfxFont *gfxFont = state->getFont();
++#else
++ GfxFont *gfxFont = state->getFont().get();
++#endif
+ if( !gfxFont )
+ return;
+
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2.ebuild
new file mode 100644
index 000000000000..f229dff9382b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.3.2.ebuild
@@ -0,0 +1,669 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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, https://github.com/efficient/libcuckoo/
+ "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
+ # 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, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.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
+
+# 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 )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+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.1
+ >=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
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[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/libzmf
+ media-libs/openjpeg:=
+ 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? (
+ 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:=[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
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ (
+ sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ )
+ )
+ 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.
+ PDEPEND="!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"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
+ "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
+ "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD 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() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ 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."
+ fi
+
+ [[ ${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
+ 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-cuckoo
+ --without-system-jfreereport
+ --without-system-libcmis
+ --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}"
+ )
+ 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="${EPREFIX}/opt/openjdk-bin-11" )
+ fi
+
+ 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() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ 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
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2022-02-18 20:09 Andreas K. Hüttel
0 siblings, 0 replies; 49+ messages in thread
From: Andreas K. Hüttel @ 2022-02-18 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 5ff5d5c8f4b48fa53945c6255663d2e44ee2ea69
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 20:08:56 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 20:08:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff5d5c8
app-office/libreoffice: Add fix for KF-5.91
Closes: https://bugs.gentoo.org/833524
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/libreoffice-7.2.5.2-kf591.patch | 56 ++++++++++++++++++++++
.../libreoffice/libreoffice-7.2.5.2-r1.ebuild | 3 ++
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 3 ++
.../libreoffice/libreoffice-7.3.0.3-r1.ebuild | 3 ++
.../libreoffice/libreoffice-7.3.1.1-r1.ebuild | 3 ++
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ++
6 files changed, 71 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
new file mode 100644
index 000000000000..ac920867e4d5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
@@ -0,0 +1,56 @@
+From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Wed, 16 Feb 2022 13:38:47 +0100
+Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
+
+The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
+subdirectory in kcoreaddons commit
+
+ commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
+ Author: Ahmad Samir <a.samirh78@gmail.com>
+ Date: Sat Jan 15 14:14:13 2022 +0200
+
+ Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
+
+ Instead of /usr/include/KF5/kcoreaddons_version.h.
+
+ For more details see:
+ https://invent.kde.org/frameworks/kservice/-/merge_requests/79
+
+ GIT_SILENT
+
+Adapt the KF5 check to check for the 'KFileWidget' header and
+the 'libKF5KIOFileWidgets.so' library instead.
+This is more exact anyway, since we require KIOFileWidgets,
+and the previous check didn't ensure that.
+(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
+configure would previously pass, but the build fail.)
+
+[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
+
+Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6acb3107cea3..4e84f9a33980 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13017,8 +13017,8 @@ then
+ kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+ fi
+
+- kf5_test_include="KF5/kcoreaddons_version.h"
+- kf5_test_library="libKF5CoreAddons.so"
++ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
++ kf5_test_library="libKF5KIOFileWidgets.so"
+ kf5_libdirs="$qt5_libdir $kf5_libdirs"
+
+ dnl kf5 KDE4 support compatibility installed
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
index bdf13f03b39c..f9cc748f0b85 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
# 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index e2b8f99a1ca1..32c95181ca6e 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
# 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
index 702733b0f4d2..a192705bcdf3 100644
--- a/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
index e4211ec16391..96318dc2ec53 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 74a8caa49137..c8ad5df807a3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2021-09-14 13:39 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2021-09-14 13:39 UTC (permalink / raw
To: gentoo-commits
commit: bb92360d332e021a36ed663263ef01e565a9e529
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 13:04:49 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 13:39:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb92360d
app-office/libreoffice: Fix build with >=sys-devel/bison-3.8
Revert sys-devel/bison upper bound.
See also:
https://lists.freedesktop.org/archives/libreoffice/2021-September/087852.html
Upstream commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197
Closes: https://bugs.gentoo.org/812923
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-7.1.5.2-bison-3.8.patch | 53 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 1 +
app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 4 +-
3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
new file mode 100644
index 00000000000..b60b99a6c6c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.1.5.2-bison-3.8.patch
@@ -0,0 +1,53 @@
+From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 14 Sep 2021 12:20:48 +0200
+Subject: Adapt to Bison 3.8 internal yyn -> yyrule rename
+
+see
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865>
+"glr2.cc: log the execution of deferred actions" including "Rename argument yyn
+as yyrule for clarity."
+
+YYBISON was defined as 1 rather than as a representation of the Bison version
+prior to
+<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09>
+"yacc.c: provide the Bison version as an integral macro", which shouldn't be a
+problem here. And YYBISON is apparently completely undefined with
+/usr/bin/bison on macOS.
+
+(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch
+with the actually used "yyn" and "yyr1" ever since
+c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
+untouched.)
+
+Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ connectivity/source/parse/sqlbison.y | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
+index d14f36e7794f..c4be0bc00bd0 100644
+--- a/connectivity/source/parse/sqlbison.y
++++ b/connectivity/source/parse/sqlbison.y
+@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
+
+ // yyi is the internal number of the rule that is currently being reduced
+ // This can be mapped to external rule number via the yyrmap.
++#if defined YYBISON && YYBISON >= 30800
++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule])
++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule])
++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule])
++#else
+ #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn])
+ #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn])
+ #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
++#endif
+
+
+ extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
index c44dee00e18..08d09ea8bd9 100644
--- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -295,6 +295,7 @@ PATCHES=(
# master branch
"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+ "${FILESDIR}/${P}-bison-3.8.patch" # bug 812923
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
index ec8c361bf6c..f2d42758311 100644
--- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
@@ -107,10 +107,9 @@ SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-# Bison upper bound due to bug #812923
BDEPEND="
dev-util/intltool
- <sys-devel/bison-3.8.1
+ sys-devel/bison
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
@@ -302,6 +301,7 @@ PATCHES=(
# master branch
"${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+ "${FILESDIR}/${PN}-7.1.5.2-bison-3.8.patch" # bug 812923
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2021-09-13 5:19 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2021-09-13 5:19 UTC (permalink / raw
To: gentoo-commits
commit: 9375148624f5611fa7d4de66905a66732f47d514
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 20:59:04 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 05:19:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93751486
app-office/libreoffice: 7.1.6.2 version bump
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
...ce-7.1.6.2-KF5-fix-double-buffer-graphics.patch | 310 +++++++++++++++++++++
...-7.1.9999.ebuild => libreoffice-7.1.6.2.ebuild} | 6 +
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 3 +
4 files changed, 321 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bbb1df88721..51645c123ad 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,8 +20,10 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
+DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
+DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8
diff --git a/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch b/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch
new file mode 100644
index 00000000000..36ed138f2a3
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.1.6.2-KF5-fix-double-buffer-graphics.patch
@@ -0,0 +1,310 @@
+From ec23228a3a2fc4e8868f7f04b838313be59ad719 Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Sun, 11 Apr 2021 17:40:26 +0200
+Subject: tdf#143796 Qt5/KF5 fix double-buffer graphics
+
+This is a squashed commit for:
+
+"Qt5/KF5 get rid of unneeded own grahics handling"
+"tdf#143334 Qt5 don't reset buffer on style change"
+"tdf#144008 Qt5/Kf5 create frames in the GUI thread"
+
+commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89
+commit ec77a2ed0283cb3446f6e352fc329afd3dfb785c
+commit 923b30aa27ceb377d6a540c012000e89ce5db31e
+
+The first commit exposed the same problem to kf5, the 2nd patch is
+the real fix and the 3rd partly a regression for kf5 from the 1st
+commit but also an additional bugfix for qt5.
+
+Change-Id: I84b8dd106a35a5c2fda08a525f657b0b733a5cb7
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121795
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
+Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
+---
+ vcl/inc/qt5/Qt5Frame.hxx | 8 +-------
+ vcl/inc/qt5/Qt5Instance.hxx | 1 +
+ vcl/qt5/Qt5Frame.cxx | 34 ++++++++++++----------------------
+ vcl/qt5/Qt5Instance.cxx | 18 +++++++++++++++---
+ vcl/unx/kf5/KF5SalFrame.cxx | 24 ------------------------
+ vcl/unx/kf5/KF5SalFrame.hxx | 6 ------
+ vcl/unx/kf5/KF5SalInstance.cxx | 16 +++++++++++++---
+ vcl/unx/kf5/KF5SalInstance.hxx | 1 +
+ 8 files changed, 43 insertions(+), 65 deletions(-)
+
+diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
+index 54a721e03730..9b6e3811c3bb 100644
+--- a/vcl/inc/qt5/Qt5Frame.hxx
++++ b/vcl/inc/qt5/Qt5Frame.hxx
+@@ -77,17 +77,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame
+ std::unique_ptr<QImage> m_pQImage;
+ std::unique_ptr<Qt5Graphics> m_pQt5Graphics;
+ UniqueCairoSurface m_pSurface;
+- std::unique_ptr<Qt5SvpGraphics> m_pOurSvpGraphics;
+- // in base class, this ptr is the same as m_pOurSvpGraphic
+- // in derived class, it can point to a derivative
+- // of Qt5SvpGraphics (which the derived class then owns)
+- Qt5SvpGraphics* m_pSvpGraphics;
++ std::unique_ptr<Qt5SvpGraphics> m_pSvpGraphics;
+ DamageHandler m_aDamageHandler;
+ QRegion m_aRegion;
+ bool m_bNullRegion;
+
+ bool m_bGraphicsInUse;
+- bool m_bGraphicsInvalid;
+ SalFrameStyleFlags m_nStyle;
+ Qt5Frame* m_pParent;
+ PointerStyle m_ePointerStyle;
+@@ -144,7 +139,6 @@ public:
+ void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth,
+ sal_Int32 nExtentsHeight) const;
+
+- void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics);
+ virtual SalGraphics* AcquireGraphics() override;
+ virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
+
+diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
+index d73a59de51c1..a2372e58f8c9 100644
+--- a/vcl/inc/qt5/Qt5Instance.hxx
++++ b/vcl/inc/qt5/Qt5Instance.hxx
+@@ -82,6 +82,7 @@ protected:
+ virtual Qt5FilePicker*
+ createPicker(css::uno::Reference<css::uno::XComponentContext> const& context,
+ QFileDialog::FileMode);
++ bool useCairo() const { return m_bUseCairo; }
+
+ public:
+ explicit Qt5Instance(std::unique_ptr<QApplication>& pQApp, bool bUseCairo = false);
+diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
+index b398e9a5cf3b..d39d1729c812 100644
+--- a/vcl/qt5/Qt5Frame.cxx
++++ b/vcl/qt5/Qt5Frame.cxx
+@@ -104,10 +104,8 @@ sal_Int32 screenNumber(const QScreen* pScreen)
+ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
+ : m_pTopLevel(nullptr)
+ , m_bUseCairo(bUseCairo)
+- , m_pSvpGraphics(nullptr)
+ , m_bNullRegion(true)
+ , m_bGraphicsInUse(false)
+- , m_bGraphicsInvalid(false)
+ , m_ePointerStyle(PointerStyle::Arrow)
+ , m_pDragSource(nullptr)
+ , m_pDropTarget(nullptr)
+@@ -288,17 +286,6 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExten
+ 1 / devicePixelRatioF()));
+ }
+
+-void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
+-{
+- QSize aSize = m_pQWidget->size() * devicePixelRatioF();
+- m_pSvpGraphics = pQt5SvpGraphics;
+- m_pSurface.reset(
+- cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
+- m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(aSize.width(), aSize.height()));
+- cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
+- nullptr);
+-}
+-
+ SalGraphics* Qt5Frame::AcquireGraphics()
+ {
+ if (m_bGraphicsInUse)
+@@ -308,24 +295,28 @@ SalGraphics* Qt5Frame::AcquireGraphics()
+
+ if (m_bUseCairo)
+ {
+- if (!m_pOurSvpGraphics || m_bGraphicsInvalid)
++ if (!m_pSvpGraphics)
+ {
+- m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
+- InitQt5SvpGraphics(m_pOurSvpGraphics.get());
+- m_bGraphicsInvalid = false;
++ QSize aSize = m_pQWidget->size() * devicePixelRatioF();
++ m_pSvpGraphics.reset(new Qt5SvpGraphics(this));
++ m_pSurface.reset(
++ cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), aSize.height()));
++ m_pSvpGraphics->setSurface(m_pSurface.get(),
++ basegfx::B2IVector(aSize.width(), aSize.height()));
++ cairo_surface_set_user_data(m_pSurface.get(), Qt5SvpGraphics::getDamageKey(),
++ &m_aDamageHandler, nullptr);
+ }
+- return m_pOurSvpGraphics.get();
++ return m_pSvpGraphics.get();
+ }
+ else
+ {
+- if (!m_pQt5Graphics || m_bGraphicsInvalid)
++ if (!m_pQt5Graphics)
+ {
+ m_pQt5Graphics.reset(new Qt5Graphics(this));
+ m_pQImage.reset(
+ new QImage(m_pQWidget->size() * devicePixelRatioF(), Qt5_DefaultFormat32));
+ m_pQImage->fill(Qt::transparent);
+ m_pQt5Graphics->ChangeQImage(m_pQImage.get());
+- m_bGraphicsInvalid = false;
+ }
+ return m_pQt5Graphics.get();
+ }
+@@ -335,7 +326,7 @@ void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph)
+ {
+ (void)pSalGraph;
+ if (m_bUseCairo)
+- assert(pSalGraph == m_pOurSvpGraphics.get());
++ assert(pSalGraph == m_pSvpGraphics.get());
+ else
+ assert(pSalGraph == m_pQt5Graphics.get());
+ m_bGraphicsInUse = false;
+@@ -1145,7 +1136,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
+ style.SetShadowColor(toColor(pal.color(QPalette::Disabled, QPalette::WindowText)));
+ style.SetDarkShadowColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
+
+- m_bGraphicsInvalid = true;
+ rSettings.SetStyleSettings(style);
+ }
+
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index ca1f914dd707..bceae35e9016 100644
+--- a/vcl/qt5/Qt5Instance.cxx
++++ b/vcl/qt5/Qt5Instance.cxx
+@@ -252,13 +252,21 @@ void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater();
+
+ SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
+ {
+- return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
++ SalFrame* pRet(nullptr);
++ RunInMainThread([&, this]() { pRet = new Qt5Frame(nullptr, nStyle, useCairo()); });
++ assert(pRet);
++ return pRet;
+ }
+
+ SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
+ {
+ assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
+- return new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, m_bUseCairo);
++
++ SalFrame* pRet(nullptr);
++ RunInMainThread(
++ [&, this]() { pRet = new Qt5Frame(static_cast<Qt5Frame*>(pParent), nStyle, useCairo()); });
++ assert(pRet);
++ return pRet;
+ }
+
+ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
+@@ -273,7 +281,11 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
+ SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, bool bShow)
+ {
+ assert(!pParent || dynamic_cast<Qt5Frame*>(pParent));
+- return new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow);
++
++ SalObject* pRet(nullptr);
++ RunInMainThread([&]() { pRet = new Qt5Object(static_cast<Qt5Frame*>(pParent), bShow); });
++ assert(pRet);
++ return pRet;
+ }
+
+ void Qt5Instance::DestroyObject(SalObject* pObject)
+diff --git a/vcl/unx/kf5/KF5SalFrame.cxx b/vcl/unx/kf5/KF5SalFrame.cxx
+index 1aa0b9008de7..8f14594586d2 100644
+--- a/vcl/unx/kf5/KF5SalFrame.cxx
++++ b/vcl/unx/kf5/KF5SalFrame.cxx
+@@ -45,7 +45,6 @@
+
+ KF5SalFrame::KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nState, bool bUseCairo)
+ : Qt5Frame(pParent, nState, bUseCairo)
+- , m_bGraphicsInUse(false)
+ {
+ }
+
+@@ -162,27 +161,4 @@ void KF5SalFrame::UpdateSettings(AllSettings& rSettings)
+ rSettings.SetStyleSettings(style);
+ }
+
+-SalGraphics* KF5SalFrame::AcquireGraphics()
+-{
+- if (m_bGraphicsInUse)
+- return nullptr;
+-
+- m_bGraphicsInUse = true;
+-
+- if (!m_pKF5Graphics)
+- {
+- m_pKF5Graphics.reset(new Qt5SvpGraphics(this));
+- Qt5Frame::InitQt5SvpGraphics(m_pKF5Graphics.get());
+- }
+-
+- return m_pKF5Graphics.get();
+-}
+-
+-void KF5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph)
+-{
+- (void)pSalGraph;
+- assert(pSalGraph == m_pKF5Graphics.get());
+- m_bGraphicsInUse = false;
+-}
+-
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/vcl/unx/kf5/KF5SalFrame.hxx b/vcl/unx/kf5/KF5SalFrame.hxx
+index f757535c2f35..d0fdd91978e6 100644
+--- a/vcl/unx/kf5/KF5SalFrame.hxx
++++ b/vcl/unx/kf5/KF5SalFrame.hxx
+@@ -28,15 +28,9 @@ class QWidget;
+
+ class KF5SalFrame : public Qt5Frame
+ {
+-private:
+- std::unique_ptr<Qt5SvpGraphics> m_pKF5Graphics;
+- bool m_bGraphicsInUse;
+-
+ public:
+ KF5SalFrame(KF5SalFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo);
+
+- virtual SalGraphics* AcquireGraphics() override;
+- virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
+ virtual void UpdateSettings(AllSettings& rSettings) override;
+ };
+
+diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
+index 5b95ff8df572..d9d7747fe647 100644
+--- a/vcl/unx/kf5/KF5SalInstance.cxx
++++ b/vcl/unx/kf5/KF5SalInstance.cxx
+@@ -40,11 +40,21 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr<QApplication>& pQApp)
+ pSVData->maAppData.mxToolkitName = OUString("kf5");
+ }
+
+-SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nState)
++SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
+ {
+ SalFrame* pRet(nullptr);
+- RunInMainThread([&pRet, pParent, nState]() {
+- pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nState, true);
++ RunInMainThread([&, this]() { pRet = new KF5SalFrame(nullptr, nStyle, useCairo()); });
++ assert(pRet);
++ return pRet;
++}
++
++SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
++{
++ assert(!pParent || dynamic_cast<KF5SalFrame*>(pParent));
++
++ SalFrame* pRet(nullptr);
++ RunInMainThread([&, this]() {
++ pRet = new KF5SalFrame(static_cast<KF5SalFrame*>(pParent), nStyle, useCairo());
+ });
+ assert(pRet);
+ return pRet;
+diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx
+index 5dd306da5231..b951df59ab33 100644
+--- a/vcl/unx/kf5/KF5SalInstance.hxx
++++ b/vcl/unx/kf5/KF5SalInstance.hxx
+@@ -28,6 +28,7 @@ class KF5SalInstance final : public Qt5Instance
+ QFileDialog::FileMode) override;
+
+ SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle) override;
++ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags nStyle) override;
+
+ public:
+ explicit KF5SalInstance(std::unique_ptr<QApplication>& pQApp);
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-7.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.1.6.2.ebuild
index 752bacd6f31..f18f1e2704a 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
@@ -295,6 +295,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # 7.1 branch
+ "${FILESDIR}/${P}-KF5-fix-double-buffer-graphics.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 752bacd6f31..74914f80b47 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -295,6 +295,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2021-05-21 14:28 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2021-05-21 14:28 UTC (permalink / raw
To: gentoo-commits
commit: ed90a6e8daf6a9ec03b4c62e9d17ee7422a6cc0c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 21 14:19:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 21 14:21:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed90a6e8
app-office/libreoffice: Fix configure.ac bashism
Upstream commit 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://bugs.gentoo.org/780432
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-7.1.3.2-bashism.patch | 33 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 3 ++
2 files changed, 36 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch
new file mode 100644
index 00000000000..36d43f29d39
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.1.3.2-bashism.patch
@@ -0,0 +1,33 @@
+From 2c4dd73c4c9f471fa2083f9f99dd27a7148f3175 Mon Sep 17 00:00:00 2001
+From: Julien Nabet <serval2412@yahoo.fr>
+Date: Mon, 17 May 2021 18:43:48 +0200
+Subject: tdf#142335: fix bashism in configure.ac
+
+Thanks to Matt Whitlock!
+
+(also reported in https://bugs.gentoo.org/show_bug.cgi?id=780432)
+
+Change-Id: I38fec6faf9a929adf1f300b8c369ec6c16a91ed8
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115716
+Tested-by: Jenkins
+Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d7b831435713..3d14c5e4258c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2682,7 +2682,7 @@ AC_SUBST(ENABLE_RELEASE_BUILD)
+ AC_SUBST(GET_TASK_ALLOW_ENTITLEMENT)
+
+ AC_MSG_CHECKING([whether to build a Community flavor])
+-if test -z "$enable_community_flavor" -o "$enable_community_flavor" == "yes"; then
++if test -z "$enable_community_flavor" -o "$enable_community_flavor" = "yes"; then
+ AC_DEFINE(HAVE_FEATURE_COMMUNITY_FLAVOR)
+ AC_MSG_RESULT([yes])
+ else
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 43efb5a6625..57948352e89 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -292,6 +292,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${P}-bashism.patch" # bug 780432
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2021-03-12 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2021-03-12 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 0de92787e2db5111fffbed196ef90b98c6c06469
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 21:11:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 21:12:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de92787
app-office/libreoffice: Drop 7.0.4.2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../files/libreoffice-7.0.4.2-gcc11.patch | 31 -
app-office/libreoffice/libreoffice-7.0.4.2.ebuild | 663 ---------------------
3 files changed, 696 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8381f13b763..25c3a0d4e76 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352 SHA512 cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
DIST libreoffice-7.0.5.2.tar.xz 236703992 BLAKE2B 71ae5cfbb18e012d8214d09ac1f151b8b1e6045b8453dae5dd888c8e8fe20a0675e4c58c81a179e7fd78a67f5992c124d7c1d3c9cee1a58bc2c444cbded410c4 SHA512 aff01224881d4971a44e754e0a6a15466dc2bb1e10fa4f3249453356389b3dfd6efd2d588b80359f1d06075ac7e4f7b74a711904d125e17206346808f2ddb4b8
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
deleted file mode 100644
index 748a6c21d74..00000000000
--- a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Tue, 3 Nov 2020 08:05:03 -0700
-Subject: include cstddef for gcc11
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
-Tested-by: Jenkins
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
----
- include/o3tl/lru_map.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
-index c7132fd079c4..96fb3161782d 100644
---- a/include/o3tl/lru_map.hxx
-+++ b/include/o3tl/lru_map.hxx
-@@ -14,6 +14,7 @@
- #include <cassert>
- #include <list>
- #include <unordered_map>
-+#include <cstddef>
-
- namespace o3tl
- {
---
-cgit v1.2.1
-
diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
deleted file mode 100644
index 77c24f8b7d6..00000000000
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ /dev/null
@@ -1,663 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 eapi8-dosym 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, 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"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.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? ( ${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 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 )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-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.1
- >=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.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.15
- 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]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- 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? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- 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.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[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/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-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.
- PDEPEND="!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.0.3.1-qt5detect.patch"
-
- # 7.0 branch
- "${FILESDIR}/${PN}-7.0.4.2-gcc11.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
- 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 CLANG_CC=${CC}
- export 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
- # --without-system-qrcodegen: has no real build system and LO is the only user
- 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-neon
- --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-vlc
- --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-ucpp
- --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-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(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}"
- )
- 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" )
- fi
-
- 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 js.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
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- 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
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- 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() {
- 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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2020-12-17 13:31 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2020-12-17 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 3b226f6138e966e0629120e37d47a7f4412d6442
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:15:26 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:31:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b226f61
app-office/libreoffice: Drop 7.0.3.1
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
...reoffice-7.0.3.1-fix-disable-pdfium-build.patch | 82 ---
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 664 ---------------------
3 files changed, 748 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ccd5560cf58..788ba8b0c10 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352 SHA512 cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch b/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
deleted file mode 100644
index 346699d5527..00000000000
--- a/app-office/libreoffice/files/libreoffice-7.0.3.1-fix-disable-pdfium-build.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From b9e5d5347e5dece693fe56b88570abc07a30a8ba Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Thu, 29 Oct 2020 15:45:01 +0000
-Subject: [PATCH] fix --disable-pdfium build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
-Tested-by: Jenkins
-Tested-by: René Engelhard <rene@debian.org>
-Reviewed-by: René Engelhard <rene@debian.org>
-Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
----
- vcl/source/filter/ipdf/pdfread.cxx | 2 +-
- xmlsecurity/source/pdfio/pdfdocument.cxx | 11 +++++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
-index 3066c4deba4a..bf11578089e0 100644
---- a/vcl/source/filter/ipdf/pdfread.cxx
-+++ b/vcl/source/filter/ipdf/pdfread.cxx
-@@ -218,7 +218,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
- (void)rBitmaps;
- (void)nFirstPage;
- (void)nPages;
-- (void)fResolutionDPI;
-+ (void)pSizeHint;
- return 0;
- #endif // HAVE_FEATURE_PDFIUM
- }
-diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
-index c132d02cc2b0..b229206391f2 100644
---- a/xmlsecurity/source/pdfio/pdfdocument.cxx
-+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
-@@ -138,10 +138,10 @@ bool IsCompleteSignature(SvStream& rStream, vcl::filter::PDFDocument& rDocument,
- return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != rAllEOFs.end();
- }
-
-+#if HAVE_FEATURE_PDFIUM
- /// Collects the checksum of each page of one version of the PDF.
- void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum>& rPageChecksums)
- {
--#if HAVE_FEATURE_PDFIUM
- auto pPdfium = vcl::pdf::PDFiumLibrary::get();
- vcl::pdf::PDFiumDocument aPdfDocument(
- FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), /*password=*/nullptr));
-@@ -158,10 +158,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum
- BitmapChecksum nPageChecksum = pPdfPage->getChecksum();
- rPageChecksums.push_back(nPageChecksum);
- }
--#else
-- (void)rStream;
--#endif
- }
-+#endif
-
- /**
- * Checks if incremental updates after singing performed valid modifications only.
-@@ -175,6 +173,7 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu
- return false;
- }
-
-+#if HAVE_FEATURE_PDFIUM
- SvMemoryStream aSignatureStream;
- sal_uInt64 nPos = rStream.Tell();
- rStream.Seek(0);
-@@ -196,6 +195,10 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu
- // Fail if any page looks different after signing and at the end. Annotations/commenting doesn't
- // count, though.
- return aSignedPages == aAllPages;
-+#else
-+ (void)rStream;
-+ return true;
-+#endif
- }
- }
-
---
-2.26.2
-
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
deleted file mode 100644
index 2d3f699e1f9..00000000000
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-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 eapi8-dosym 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, 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"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.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? ( ${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 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 )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-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.1
- >=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.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.15
- 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]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- 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? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- 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.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[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/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-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.
- PDEPEND="!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.0.3.1-qt5detect.patch"
-
- # 7.0 branch
- "${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
- "${FILESDIR}/${PN}-6.4.7.2-icu-68-1.patch" # bug 752021
-)
-
-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
- 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 CLANG_CC=${CC}
- export 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
- # --without-system-qrcodegen: has no real build system and LO is the only user
- 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-neon
- --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-vlc
- --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-ucpp
- --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-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(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}"
- )
- 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" )
- fi
-
- 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 js.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
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- 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
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- 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() {
- 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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2020-08-07 23:24 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2020-08-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 947faddaa0c012fe78adaf3fb3d0d1f1fde2be4e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 21:08:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 23:23:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947fadda
app-office/libreoffice: Fix build with LLVM-10
Closes: https://bugs.gentoo.org/713574
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.4.6.2-llvm-10.patch | 102 +++++++++++++++++++++
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 1 +
2 files changed, 103 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
new file mode 100644
index 00000000000..4a1ff516029
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch
@@ -0,0 +1,102 @@
+From 986bd28388df745dd969e7be7c3bda36b2b2cb0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 6 Aug 2020 10:50:47 +0100
+Subject: [PATCH] ofz#24641 libc++abi __cxa_exception has grown another member
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https: //github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183
+
+this is the same problem as
+
+commit f4b6f6a8ae60bdec53512728d00853b73fa18500
+Author: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu Feb 13 08:40:11 2020 +0100
+
+ Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi
+
+ (where the new change to __cxa_exception effectively reverts the change that
+ prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to
+ __cxa_exceptiom in LLVM 5.0 libcxxabi")
+
+ Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7
+ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583
+ Tested-by: Jenkins
+ Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+
+so c-n-p that solution here
+
+Change-Id: I4475757a766e3ade7b9fcaf6149e535c9f9a4fa4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100209
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+---
+ .../cpp_uno/gcc3_linux_x86-64/except.cxx | 28 +++++++++++++++++++
+ .../cpp_uno/gcc3_linux_x86-64/share.hxx | 14 ++++++++++
+ 2 files changed, 42 insertions(+)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+index e9e861f1c210..25931671f7dc 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+@@ -150,6 +150,34 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
+ return;
+ }
+
++#if defined _LIBCPPABI_VERSION // detect libc++abi
++ // Very bad HACK to find out whether we run against a libcxxabi that has a new
++ // __cxa_exception::reserved member at the start, introduced with LLVM 11
++ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
++ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The layout of the
++ // start of __cxa_exception is
++ //
++ // [8 byte void *reserve]
++ // 8 byte size_t referenceCount
++ //
++ // where the (bad, hacky) assumption is that reserve (if present) is null
++ // (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, and nothing actively
++ // sets reserve) while referenceCount is non-null (__cxa_throw sets it to 1, and
++ // __cxa_decrement_exception_refcount destroys the exception as soon as it drops to 0; for a
++ // __cxa_dependent_exception, the referenceCount member is rather
++ //
++ // 8 byte void* primaryException
++ //
++ // but which also will always be set to a non-null value in __cxa_rethrow_primary_exception).
++ // As described in the definition of __cxa_exception
++ // (bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx), this hack (together with the "#if 0"
++ // there) can be dropped once we can be sure that we only run against new libcxxabi that has the
++ // reserve member:
++ if (*reinterpret_cast<void **>(header) == nullptr) {
++ header = reinterpret_cast<__cxxabiv1::__cxa_exception*>(reinterpret_cast<void **>(header) + 1);
++ }
++#endif
++
+ std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
+
+ typelib_TypeDescription * pExcTypeDescr = nullptr;
+diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+index e8afe35c4f59..53c8841fbbcb 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
++++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+@@ -108,6 +108,20 @@ namespace __cxxabiv1 {
+ struct __cxa_exception {
+ #if defined _LIBCPPABI_VERSION // detect libc++abi
+ #if defined __LP64__ || LIBCXXABI_ARM_EHABI
++#if 0
++ // This is a new field added with LLVM 11
++ // <https://github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183>
++ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The HACK in
++ // fillUnoException (bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx) tries to find out at
++ // runtime whether a __cxa_exception has this member. Once we can be sure that we only run
++ // against new libcxxabi that has this member, we can drop the "#if 0" here and drop the hack
++ // in fillUnoException.
++
++ // Now _Unwind_Exception is marked with __attribute__((aligned)),
++ // which implies __cxa_exception is also aligned. Insert padding
++ // in the beginning of the struct, rather than before unwindHeader.
++ void *reserve;
++#endif
+ std::size_t referenceCount;
+ #endif
+ #endif
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index ecae7dbf2c7..6f4a72b4e47 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -271,6 +271,7 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+ "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2020-05-14 20:10 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2020-05-14 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 5058ef8800018f93e7297a7ed722960502df486d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 19:41:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 14 20:10:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5058ef88
app-office/libreoffice: Fix build with boost-1.73
Reported-by: Dennis Schridde <devurandom <AT> gmx.net>
Closes: https://bugs.gentoo.org/721806
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 +++++++++++++++++++++
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 3 +
2 files changed, 121 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
new file mode 100644
index 00000000000..0eb40699922
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch
@@ -0,0 +1,118 @@
+From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 29 Jan 2020 12:44:52 +0000
+Subject: replace boost::bimap in sdext pdfimport
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
+bimap out and use something simpler
+
+Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++--------
+ sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 ++++++++++++---------
+ 2 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+index 89f9d601b7b0..9e08d6a6a765 100644
+--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
++++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+@@ -37,9 +37,6 @@
+ #include "treevisitorfactory.hxx"
+ #include "genericelements.hxx"
+
+-#include <boost/bimap/bimap.hpp>
+-#include <boost/bimap/unordered_set_of.hpp>
+-
+ namespace pdfi
+ {
+
+@@ -160,10 +157,8 @@ namespace pdfi
+ typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
+ typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
+
+- typedef boost::bimaps::bimap<
+- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
+- boost::bimaps::unordered_set_of<sal_Int32>
+- > GCToIdBiMap;
++ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
++ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
+
+ typedef std::vector<GraphicsContext> GraphicsContextStack;
+
+@@ -178,7 +173,8 @@ namespace pdfi
+
+ GraphicsContextStack m_aGCStack;
+ sal_Int32 m_nNextGCId;
+- GCToIdBiMap m_aGCToId;
++ IdToGCMap m_aIdToGC;
++ GCToIdMap m_aGCToId;
+
+ ImageContainer m_aImages;
+
+diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+index c6baa7fee8b2..ed2eaf6510b9 100644
+--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
++++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+@@ -54,6 +54,7 @@ namespace pdfi
+ m_aFontToId(),
+ m_aGCStack(),
+ m_nNextGCId( 1 ),
++ m_aIdToGC(),
+ m_aGCToId(),
+ m_aImages(),
+ m_nPages(0),
+@@ -65,12 +66,13 @@ namespace pdfi
+ aDefFont.isBold = false;
+ aDefFont.isItalic = false;
+ aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72;
+- m_aIdToFont[ 0 ] = aDefFont;
+- m_aFontToId[ aDefFont ] = 0;
++ m_aIdToFont.insert({0, aDefFont});
++ m_aFontToId.insert({aDefFont, 0});
+
+ GraphicsContext aDefGC;
+ m_aGCStack.push_back( aDefGC );
+- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
++ m_aGCToId.insert({aDefGC, 0});
++ m_aIdToGC.insert({0, aDefGC});
+ }
+
+ void PDFIProcessor::setPageNum( sal_Int32 nPages )
+@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
+ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+ {
+ sal_Int32 nGCId = 0;
+- auto it = m_aGCToId.left.find( rGC );
+- if( it != m_aGCToId.left.end() )
++ auto it = m_aGCToId.find( rGC );
++ if( it != m_aGCToId.end() )
+ nGCId = it->second;
+ else
+ {
+- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
++ m_aGCToId.insert({rGC, m_nNextGCId});
++ m_aIdToGC.insert({m_nNextGCId, rGC});
+ nGCId = m_nNextGCId;
+ m_nNextGCId++;
+ }
+@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
+
+ const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
+ {
+- auto it = m_aGCToId.right.find( nGCId );
+- if( it == m_aGCToId.right.end() )
+- it = m_aGCToId.right.find( 0 );
++ auto it = m_aIdToGC.find( nGCId );
++ if( it == m_aIdToGC.end() )
++ it = m_aIdToGC.find( 0 );
+ return it->second;
+ }
+
+--
+cgit v1.2.1
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
index 604dc556242..b379ae94244 100644
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -253,6 +253,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ # git master
+ "${FILESDIR}/${P}-boost-1.73.patch" # bug 721806
+
# TODO: upstream (for now taken from Arch Linux)
"${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
)
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-12-26 8:36 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-12-26 8:36 UTC (permalink / raw
To: gentoo-commits
commit: c4f7f90528b26fbd9e4f96313cc7102a2dca6cd0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 20:56:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 08:36:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f7f905
app-office/libreoffice: 6.3.4.2 version bump
Fixes build with app-text/poppler-0.83.0.
Closes: https://bugs.gentoo.org/703624
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
.../files/libreoffice-6.3.4.2-poppler-0.83.patch | 72 +++
app-office/libreoffice/libreoffice-6.3.4.2.ebuild | 554 +++++++++++++++++++++
3 files changed, 628 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 50f980722c3..16a3e96ee7a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,6 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934
+DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
+DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
diff --git a/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch b/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch
new file mode 100644
index 00000000000..d5697f29f01
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch
@@ -0,0 +1,72 @@
+From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001
+From: Martin Milata <martin@martinmilata.cz>
+Date: Wed, 4 Dec 2019 02:37:40 +0100
+Subject: Fix build with poppler-0.83
+
+Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9
+Reviewed-on: https://gerrit.libreoffice.org/84384
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <michael.stahl@cib.de>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 26048177e87d..e9c2a407c279 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
+ gfree(pBuf);
+ }
+
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++void PDFOutDev::printPath( const GfxPath* pPath )
++#else
+ void PDFOutDev::printPath( GfxPath* pPath )
++#endif
+ {
+ int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
+ for( int i=0; i<nSubPaths; i++ )
+ {
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++ const
++#endif
+ GfxSubpath* pSub = pPath->getSubpath( i );
+ const int nPoints = pSub->getNumPoints();
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 02f6b59f6f15..2e7d2186f9a1 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -149,7 +149,11 @@ namespace pdfi
+
+ int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const;
+ void writeFontFile( GfxFont* gfxFont ) const;
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++ static void printPath( const GfxPath* pPath );
++#else
+ static void printPath( GfxPath* pPath );
++#endif
+
+ public:
+ explicit PDFOutDev( PDFDoc* pDoc );
+diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+index 42178b650cdd..b1a54bd09c5f 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -68,7 +68,11 @@ int main(int argc, char **argv)
+ }
+
+ // read config file
++#if POPPLER_CHECK_VERSION(0, 83, 0)
++ globalParams = std::make_unique<GlobalParams>();
++#else
+ globalParams = new GlobalParams();
++#endif
+ globalParams->setErrQuiet(true);
+ #if defined(_MSC_VER)
+ globalParams->setupBaseFonts(nullptr);
+--
+cgit v1.2.1
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
new file mode 100644
index 00000000000..550acf13ab8
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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=(
+ "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
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+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.1
+ app-text/libnumbertext
+ >=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.5.2
+ 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.14.0
+ 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]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype: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/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( 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
+ 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? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ 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.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[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.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+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.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
+ "${FILESDIR}/${P}-poppler-0.83.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() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${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
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # 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"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ 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
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${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-ucpp
+ --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-sane
+ $(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 gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(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-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ 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 js.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
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # 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
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-10-29 17:39 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-10-29 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 47d327ef500e23ebefe355d0dbff6dbc657018ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 17:31:07 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 17:38:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d327ef
app-office/libreoffice: Drop 6.2.7.1 and 6.3.2.2
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 -
.../libreoffice-6.3.2.2-mysql-connector-c-8.patch | 45 --
app-office/libreoffice/libreoffice-6.2.7.1.ebuild | 552 --------------------
app-office/libreoffice/libreoffice-6.3.2.2.ebuild | 553 ---------------------
4 files changed, 1154 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 78da4892a63..58a9bd64826 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,13 +4,9 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
-DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
-DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930
DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
-DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
-DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1
DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
diff --git a/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch b/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch
deleted file mode 100644
index 677ba399575..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.3.2.2-mysql-connector-c-8.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001
-From: Peter Levine <plevine457@gmail.com>
-Date: Thu, 17 Oct 2019 23:08:57 -0400
-Subject: Fix building against MySQL Connector/C 8
-
-In MySQL Connector/C 8, my_bool is replaced by bool. It was
-previously defined as char. When building against
-MySQL Connector/C 8, this leads to type punning build errors.
-Redefine affected members of struct BindMetaData as bool if using
-version 8 of greater. Otherwise, default to char.
-
-Change-Id: If12b975d95afae86502867cb334cb4195802f91d
-Reviewed-on: https://gerrit.libreoffice.org/81002
-Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
----
- .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
-index 1df2c70..3450473 100644
---- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
-+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
-@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Type;
-
-+#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000)
-+using my_bool = bool;
-+#else
-+using my_bool = char;
-+#endif
-+
- struct BindMetaData
- {
-- char is_null = 0;
-+ my_bool is_null = 0;
- unsigned long length = 0;
-- char error = 0;
-+ my_bool error = 0;
- };
-
- typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters,
---
-cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.7.1.ebuild b/app-office/libreoffice/libreoffice-6.2.7.1.ebuild
deleted file mode 100644
index 8a89bd5092b..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.7.1.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-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=(
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-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.1
- app-text/libnumbertext
- >=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.5*
- 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.14.0
- 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]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( 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
- 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? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- 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.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[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
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-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.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.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() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${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
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- 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
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${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-ucpp
- --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-sane
- $(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 gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(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-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- 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 js.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
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # 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
-}
-
-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
-}
diff --git a/app-office/libreoffice/libreoffice-6.3.2.2.ebuild b/app-office/libreoffice/libreoffice-6.3.2.2.ebuild
deleted file mode 100644
index 0233e28a4fb..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.2.2.ebuild
+++ /dev/null
@@ -1,553 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-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=(
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-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.1
- app-text/libnumbertext
- >=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.5.2
- 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.14.0
- 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]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( 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
- 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? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- 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.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[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.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-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.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${FILESDIR}/${P}-mysql-connector-c-8.patch" # bug #692422
-)
-
-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() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${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
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- 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
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${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-ucpp
- --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-sane
- $(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 gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(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-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- 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 js.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
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # 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
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-10-29 17:39 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-10-29 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 421194839bf05e5af9c02f1a6ec343ba1f575374
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 17:29:17 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 17:36:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42119483
app-office/libreoffice: 6.3.3.2 version bump
Closes: https://bugs.gentoo.org/698504
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
.../libreoffice-6.3.3.2-mysql-connector-c-8.patch | 45 ++
app-office/libreoffice/libreoffice-6.3.3.2.ebuild | 553 +++++++++++++++++++++
3 files changed, 600 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fb1e34f891c..78da4892a63 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,8 +7,10 @@ DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a787
DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930
+DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1
+DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
diff --git a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch
new file mode 100644
index 00000000000..5fa7b343f4f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch
@@ -0,0 +1,45 @@
+From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Thu, 17 Oct 2019 23:08:57 -0400
+Subject: Fix building against MySQL Connector/C 8
+
+In MySQL Connector/C 8, my_bool is replaced by bool. It was
+previously defined as char. When building against
+MySQL Connector/C 8, this leads to type punning build errors.
+Redefine affected members of struct BindMetaData as bool if using
+version 8 of greater. Otherwise, default to char.
+
+Change-Id: If12b975d95afae86502867cb334cb4195802f91d
+Reviewed-on: https://gerrit.libreoffice.org/81002
+Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
+Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
+---
+ .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+index 1df2c70..3450473 100644
+--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
++++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference;
+ using ::com::sun::star::uno::RuntimeException;
+ using ::com::sun::star::uno::Type;
+
++#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION
++using my_bool = bool;
++#else
++using my_bool = char;
++#endif
++
+ struct BindMetaData
+ {
+- char is_null = 0;
++ my_bool is_null = 0;
+ unsigned long length = 0;
+- char error = 0;
++ my_bool error = 0;
+ };
+
+ typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters,
+--
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
new file mode 100644
index 00000000000..0233e28a4fb
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
@@ -0,0 +1,553 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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=(
+ "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
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+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.1
+ app-text/libnumbertext
+ >=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.5.2
+ 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.14.0
+ 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]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype: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/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( 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
+ 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? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ 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.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[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.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+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.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # master branch
+ "${FILESDIR}/${P}-mysql-connector-c-8.patch" # bug #692422
+)
+
+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() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${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
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # 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"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ 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
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${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-ucpp
+ --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-sane
+ $(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 gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(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-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ 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 js.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
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # 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
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-04-03 12:02 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-04-03 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 087928add8a0b3e3df1f6276b03c09843144962b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 11:50:19 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 12:02:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=087928ad
app-office/libreoffice: 6.2.3.1 version bump, pre-release w/o keywords
With backported patch from 6.2 branch fixing dire hidpi scaling.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
...6.2.3.1-kf5-update-delayed-frame-destruct.patch | 113 +++++
...-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch | 82 +++
app-office/libreoffice/libreoffice-6.2.3.1.ebuild | 549 +++++++++++++++++++++
4 files changed, 746 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7f795f47d96..de991b313cf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
+DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
+DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857
diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
new file mode 100644
index 00000000000..17843e007e0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-kf5-update-delayed-frame-destruct.patch
@@ -0,0 +1,113 @@
+From d622be2d6bcfcc2c7260421e0eaa09c76ce15da2 Mon Sep 17 00:00:00 2001
+From: Aleksei Nikiforov <darktemplar@basealt.ru>
+Date: Wed, 6 Mar 2019 16:10:17 +0300
+Subject: tdf#123406 KDE5: Update delayed frame destruction
+
+Move deleteLater() call to the different event loop.
+This fixes issue with frames not being disposed of
+deterministically, and previously opened window
+not reactivating.
+
+Also hide modal dialog window before unsetting modal mode.
+Unsetting modal mode may require to toggle window visibility.
+Window will be hidden soon anyway,
+and additional generated events might make finding correct
+focused window harder.
+
+Change-Id: Id7839f817075785287b09f6ac79eb3fb211726aa
+Reviewed-on: https://gerrit.libreoffice.org/68852
+Tested-by: Jenkins
+Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
+Reviewed-on: https://gerrit.libreoffice.org/70078
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+---
+ vcl/inc/qt5/Qt5Instance.hxx | 2 ++
+ vcl/qt5/Qt5Instance.cxx | 12 ++++++++++--
+ vcl/source/window/dialog.cxx | 4 ++--
+ 3 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
+index 91682bd..cece484 100644
+--- a/vcl/inc/qt5/Qt5Instance.hxx
++++ b/vcl/inc/qt5/Qt5Instance.hxx
+@@ -50,10 +50,12 @@ public:
+
+ private Q_SLOTS:
+ bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
++ static void deleteObjectLater(QObject* pObject);
+
+ Q_SIGNALS:
+ bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
+ std::unique_ptr<SalMenu> createMenuSignal(bool, Menu*);
++ void deleteObjectLaterSignal(QObject* pObject);
+
+ public:
+ explicit Qt5Instance(bool bUseCairo = false);
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index 8de9fc7..58f93fe 100644
+--- a/vcl/qt5/Qt5Instance.cxx
++++ b/vcl/qt5/Qt5Instance.cxx
+@@ -67,6 +67,12 @@ Qt5Instance::Qt5Instance(bool bUseCairo)
+ Qt::BlockingQueuedConnection);
+ connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu,
+ Qt::BlockingQueuedConnection);
++
++ // this one needs to be queued non-blocking
++ // in order to have this event arriving to correct event processing loop
++ connect(this, &Qt5Instance::deleteObjectLaterSignal, this,
++ [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); },
++ Qt::QueuedConnection);
+ }
+
+ Qt5Instance::~Qt5Instance()
+@@ -78,6 +84,8 @@ Qt5Instance::~Qt5Instance()
+ free(m_pFakeArgvFreeable[i]);
+ }
+
++void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); }
++
+ SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle)
+ {
+ return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
+@@ -94,7 +102,7 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
+ if (pFrame)
+ {
+ assert(dynamic_cast<Qt5Frame*>(pFrame));
+- static_cast<Qt5Frame*>(pFrame)->deleteLater();
++ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Frame*>(pFrame));
+ }
+ }
+
+@@ -109,7 +117,7 @@ void Qt5Instance::DestroyObject(SalObject* pObject)
+ if (pObject)
+ {
+ assert(dynamic_cast<Qt5Object*>(pObject));
+- static_cast<Qt5Object*>(pObject)->deleteLater();
++ Q_EMIT deleteObjectLaterSignal(static_cast<Qt5Object*>(pObject));
+ }
+ }
+
+diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
+index 0c75f85..1688163 100644
+--- a/vcl/source/window/dialog.cxx
++++ b/vcl/source/window/dialog.cxx
+@@ -1097,6 +1097,8 @@ void Dialog::EndDialog( long nResult )
+
+ const bool bModal = GetType() != WindowType::MODELESSDIALOG;
+
++ Hide();
++
+ if (bModal)
+ {
+ SetModalInputMode(false);
+@@ -1121,8 +1123,6 @@ void Dialog::EndDialog( long nResult )
+ }
+ }
+
+- Hide();
+-
+ if (bModal && GetParent())
+ {
+ NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this );
+--
+cgit v1.1
diff --git a/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
new file mode 100644
index 00000000000..12f3ddc2958
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch
@@ -0,0 +1,82 @@
+From c3eeb421526f284419e90d2c4c4da5b0d7bbcc0e Mon Sep 17 00:00:00 2001
+From: Jan-Marek Glogowski <glogow@fbihome.de>
+Date: Fri, 29 Mar 2019 02:58:59 +0100
+Subject: tdf#124292 Qt5 / KDE5 disable Qt's HiDPI scaling
+
+LO does its own layouting and also all the scaling, so disable
+the automatic HiDPI scaling explicitly. Otherwise fonts will be
+rendered in LoDPI and just scaled as an image, if UI scaling is
+enabled in KDE, resulting in really blocky / ugly fonts.
+
+Change-Id: I38503ce27c1671e80d0749d21c6c6dcff1a808a6
+Reviewed-on: https://gerrit.libreoffice.org/69941
+Tested-by: Jenkins
+Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
+(cherry picked from commit b4698a2241ec26d796c66da3a814f7cc693785b6)
+Reviewed-on: https://gerrit.libreoffice.org/69984
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
+---
+ vcl/qt5/Qt5Graphics_GDI.cxx | 4 ++--
+ vcl/qt5/Qt5Instance.cxx | 2 ++
+ vcl/unx/kde5/KDE5SalGraphics.cxx | 4 ++--
+ vcl/unx/kde5/KDE5SalInstance.cxx | 2 ++
+ 4 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
+index 90baba3..851d222 100644
+--- a/vcl/qt5/Qt5Graphics_GDI.cxx
++++ b/vcl/qt5/Qt5Graphics_GDI.cxx
+@@ -643,8 +643,8 @@ void Qt5Graphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+ return;
+
+ QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+- rDPIX = pScreen->logicalDotsPerInchX();
+- rDPIY = pScreen->logicalDotsPerInchY();
++ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
++ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
+ }
+
+ sal_uInt16 Qt5Graphics::GetBitCount() const { return getFormatBits(m_pQImage->format()); }
+diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
+index adbe70b..8de9fc7 100644
+--- a/vcl/qt5/Qt5Instance.cxx
++++ b/vcl/qt5/Qt5Instance.cxx
+@@ -336,6 +336,8 @@ VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
+ unsetenv("SESSION_MANAGER");
+ }
+
++ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
++
+ int* pFakeArgc = new int;
+ *pFakeArgc = nFakeArgc;
+ pQApplication = new QApplication(*pFakeArgc, pFakeArgv);
+diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
+index 290127d..0b4b428 100644
+--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
++++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
+@@ -78,8 +78,8 @@ void KDE5SalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+ return;
+
+ QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+- rDPIX = pScreen->logicalDotsPerInchX();
+- rDPIY = pScreen->logicalDotsPerInchY();
++ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
++ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
+ }
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
+index 401afbc..32998cd 100644
+--- a/vcl/unx/kde5/KDE5SalInstance.cxx
++++ b/vcl/unx/kde5/KDE5SalInstance.cxx
+@@ -144,6 +144,8 @@ VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
+ unsetenv("SESSION_MANAGER");
+ }
+
++ QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
++
+ int* pFakeArgc = new int;
+ *pFakeArgc = nFakeArgc;
+ pQApplication = new QApplication(*pFakeArgc, pFakeArgv);
+--
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.3.1.ebuild b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild
new file mode 100644
index 00000000000..ff477aefb76
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.3.1.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+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
+
+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=(
+ "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
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+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.1
+ app-text/libnumbertext
+ >=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.5*
+ 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.14.0
+ 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.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype: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/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( 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
+ 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? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets: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.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[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
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+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.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # 6.2 stable branch
+ "${FILESDIR}/${P}-qt5-kf5-disable-qt-hidpi-scaling.patch"
+ "${FILESDIR}/${P}-kf5-update-delayed-frame-destruct.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.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 java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${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() {
+ xdg_src_prepare
+
+ # 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
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # 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"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ 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
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${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-ucpp
+ --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-sane
+ $(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 gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(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 gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ 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-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ 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 js.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
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # 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
+}
+
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-02-14 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 075dff2bd19715962f2d2488c46f3ee54d46e562
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 22:06:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075dff2b
app-office/libreoffice: Add USE ldap
Backported patch to 6.2 branch.
Upstream commit 6776c53b7ce2e431d8636f4e5a755f50f787ec8f
See also: https://archives.gentoo.org/gentoo-user/message/0feb6472b10bf112db4b4920ce334a37
See also: https://github.com/gentoo/gentoo/pull/9351
Thanks-to: Andrew Udvare <audvare <AT> gmail.com>
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.2-ldap-optional.patch | 178 +++++++++++++++++++++
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 6 +-
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 +-
app-office/libreoffice/libreoffice-9999.ebuild | 5 +-
4 files changed, 189 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
new file mode 100644
index 00000000000..c9268973252
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2-ldap-optional.patch
@@ -0,0 +1,178 @@
+From 6776c53b7ce2e431d8636f4e5a755f50f787ec8f Mon Sep 17 00:00:00 2001
+From: Andrew Udvare <audvare@gmail.com>
+Date: Tue, 8 Jan 2019 04:53:51 -0500
+Subject: Make LDAP support optional
+
+Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4
+Reviewed-on: https://gerrit.libreoffice.org/65958
+Tested-by: Jenkins
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+---
+ Repository.mk | 2 +-
+ RepositoryExternal.mk | 3 ++-
+ configure.ac | 24 ++++++++++++++++++++++-
+ connectivity/Library_postgresql-sdbc-impl.mk | 2 +-
+ extensions/Module_extensions.mk | 7 ++++++-
+ external/postgresql/ExternalProject_postgresql.mk | 5 +++--
+ postprocess/Rdb_services.mk | 2 +-
+ 7 files changed, 37 insertions(+), 8 deletions(-)
+
+diff --git a/Repository.mk b/Repository.mk
+index 4ae8528..4d8389b 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -389,7 +389,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ hyphen \
+ icg \
+ $(if $(ENABLE_JAVA),jdbc) \
+- ldapbe2 \
++ $(if $(ENABLE_LDAP),ldapbe2) \
+ $(if $(filter WNT,$(OS)),WinUserInfoBe) \
+ localebe1 \
+ log \
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 602ff6d..3c9be87 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -2900,7 +2900,7 @@ endef
+
+ endif # SYSTEM_HSQLDB
+
+-
++ifeq ($(ENABLE_LDAP),TRUE)
+ ifneq ($(SYSTEM_OPENLDAP),)
+
+ define gb_LinkTarget__use_openldap
+@@ -2929,6 +2929,7 @@ $(call gb_LinkTarget_add_libs,$(1), \
+ )
+
+ endef
++endif
+
+ define gb_ExternalProject__use_openldap
+ $(call gb_ExternalProject_use_external_project,$(1),openldap)
+diff --git a/configure.ac b/configure.ac
+index f880308..35c7e02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1519,6 +1519,11 @@ libo_FUZZ_ARG_ENABLE(formula-logger,
+ )
+ )
+
++AC_ARG_ENABLE(ldap,
++ AS_HELP_STRING([--disable-ldap],
++ [Disable LDAP support.]),
++,enable_ldap=yes)
++
+ dnl ===================================================================
+ dnl Optional Packages (--with/without-)
+ dnl ===================================================================
+@@ -9214,12 +9219,29 @@ else
+ fi
+ AC_SUBST(SYSTEM_ODBC_HEADERS)
+
++dnl ===================================================================
++dnl Enable LDAP support
++dnl ===================================================================
++
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
++AC_MSG_CHECKING([whether to enable LDAP support])
++ if test "$enable_ldap" != "yes"; then
++ AC_MSG_RESULT([no])
++ ENABLE_LDAP=""
++ enable_ldap=no
++ else
++ AC_MSG_RESULT([yes])
++ ENABLE_LDAP="TRUE"
++ AC_DEFINE(HAVE_FEATURE_LDAP)
++ fi
++fi
++AC_SUBST(ENABLE_LDAP)
+
+ dnl ===================================================================
+ dnl Check for system openldap
+ dnl ===================================================================
+
+-if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
++if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android" -a "$ENABLE_LDAP" != ""; then
+ AC_MSG_CHECKING([which openldap library to use])
+ if test "$with_system_openldap" = "yes"; then
+ AC_MSG_RESULT([external])
+diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
+index 53cebd0..3d048f3 100644
+--- a/connectivity/Library_postgresql-sdbc-impl.mk
++++ b/connectivity/Library_postgresql-sdbc-impl.mk
+@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
+ postgresql \
+ $(if $(filter-out MSC,$(COM)), \
+ openssl \
+- openldap \
++ $(if $(ENABLE_LDAP),openldap) \
+ nss3 \
+ plc4 \
+ ssl3 \
+diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
+index f84a9ca..43dd929 100644
+--- a/extensions/Module_extensions.mk
++++ b/extensions/Module_extensions.mk
+@@ -16,7 +16,6 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\
+ ifneq ($(filter-out iOS ANDROID,$(OS)),)
+ $(eval $(call gb_Module_add_targets,extensions,\
+ Library_abp \
+- Library_ldapbe2 \
+ $(if $(filter WNT,$(OS)),Library_WinUserInfoBe) \
+ Library_log \
+ Library_scn \
+@@ -28,6 +27,12 @@ $(eval $(call gb_Module_add_targets,extensions,\
+ ))
+ endif
+
++ifeq ($(ENABLE_LDAP),TRUE)
++$(eval $(call gb_Module_add_targets,extensions,\
++ Library_ldapbe2 \
++))
++endif
++
+ ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+ $(eval $(call gb_Module_add_targets,extensions,\
+ Library_bib \
+diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
+index f6617e5..fc4342c 100644
+--- a/external/postgresql/ExternalProject_postgresql.mk
++++ b/external/postgresql/ExternalProject_postgresql.mk
+@@ -10,7 +10,7 @@
+ $(eval $(call gb_ExternalProject_ExternalProject,postgresql))
+
+ $(eval $(call gb_ExternalProject_use_externals,postgresql,\
+- openldap \
++ $(if $(ENABLE_LDAP),openldap) \
+ openssl \
+ zlib \
+ ))
+@@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
+ $(if $(DISABLE_OPENSSL),,--with-openssl \
+ $(if $(WITH_KRB5), --with-krb5) \
+ $(if $(WITH_GSSAPI),--with-gssapi)) \
++ $(if $(ENABLE_LDAP),,--with-ldap=no) \
+ CPPFLAGS="$(postgresql_CPPFLAGS)" \
+ LDFLAGS="$(postgresql_LDFLAGS)" \
+- EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
++ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
+ && cd src/interfaces/libpq \
+ && MAKEFLAGS= && $(MAKE) all-static-lib)
+
+diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
+index c70d1ca..342f19b 100644
+--- a/postprocess/Rdb_services.mk
++++ b/postprocess/Rdb_services.mk
+@@ -293,7 +293,7 @@ $(eval $(call gb_Rdb_add_components,services,\
+ desktop/source/offacc/offacc \
+ $(if $(DISABLE_GUI),,desktop/source/splash/spl) \
+ extensions/source/abpilot/abp \
+- extensions/source/config/ldap/ldapbe2 \
++ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \
+ $(if $(filter WNT,$(OS)),\
+ extensions/source/config/WinUserInfo/WinUserInfoBe \
+ ) \
+--
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
index 12be7ce5989..a49542b0993 100644
--- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -134,7 +134,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libzmf
net-libs/neon
net-misc/curl
- net-nds/openldap
sci-mathematics/lpsolve
sys-libs/zlib
virtual/glu
@@ -186,6 +185,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
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.6 )
mariadb? ( dev-db/mariadb-connector-c )
@@ -248,6 +248,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
@@ -446,6 +447,7 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
+ $(use_enable ldap)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 12765a8bb8c..bc72c7c13fd 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -133,7 +133,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libzmf
net-libs/neon
net-misc/curl
- net-nds/openldap
sci-mathematics/lpsolve
sys-libs/zlib
virtual/glu
@@ -185,6 +184,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
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.6 )
mariadb? ( dev-db/mariadb-connector-c )
@@ -247,6 +247,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
@@ -445,6 +446,7 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
+ $(use_enable ldap)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 20e311f8d5c..b86252e215d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -133,7 +133,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libzmf
net-libs/neon
net-misc/curl
- net-nds/openldap
sci-mathematics/lpsolve
sys-libs/zlib
virtual/glu
@@ -185,6 +184,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
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.6 )
mariadb? ( dev-db/mariadb-connector-c )
@@ -442,6 +442,7 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
+ $(use_enable ldap)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-01-16 8:17 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 8:17 UTC (permalink / raw
To: gentoo-commits
commit: 1a60273805cf51fd56385301b250d909df53d8c2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 08:16:19 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 08:16:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a602738
app-office/libreoffice: Fix build with poppler-0.73
Bug: https://bugs.gentoo.org/675452
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.2.0.2-poppler-0.73.patch | 101 +++++++++++++++++++++
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 1 +
2 files changed, 102 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
new file mode 100644
index 00000000000..eb6d597c195
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
@@ -0,0 +1,101 @@
+From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <Michael.Stahl@cib.de>
+Date: Mon, 14 Jan 2019 15:08:42 +0100
+Subject: sdext: fix build with poppler 0.73
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+... which has removed Guchar, Gushort, Guint, Gulong...
+
+Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d
+Reviewed-on: https://gerrit.libreoffice.org/66305
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
+Reviewed-on: https://gerrit.libreoffice.org/66356
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
+ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 6 +++---
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+(limited to 'sdext/source/pdfimport/xpdfwrapper')
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 575a90a..35490a0 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer& o_rOutputBuf,
+ o_rOutputBuf.resize(header_size);
+
+ // initialize stream
+- Guchar *p;
++ unsigned char *p;
+ GfxRGB rgb;
+ std::unique_ptr<ImageStream> imgStr(
+ new ImageStream(str,
+@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer& o_rOutputBuf,
+ oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
+ if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
+ {
+- Guchar nIndex = 0;
++ unsigned char nIndex = 0;
+ colorMap->getRGB( &nIndex, &zeroColor );
+ nIndex = 1;
+ colorMap->getRGB( &nIndex, &oneColor );
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da021a2a..443e757 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -267,9 +267,13 @@ extern FILE* g_binary_out;
+
+ // note: if you ever change Output_t, please keep in mind that the current code
+ // relies on it being of 8 bit size
+-typedef Guchar Output_t;
++typedef unsigned char Output_t;
+ typedef std::vector< Output_t > OutputBuffer;
+
++#if !POPPLER_CHECK_VERSION(0, 73, 0)
++static_assert(std::is_same_v<Guchar, unsigned char>, "unexpected typedef");
++#endif
++
+ #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+index 4d9e3bb..b582856 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+ appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+
+ // initialize stream
+- Guchar *p, *pm;
++ unsigned char *p, *pm;
+ GfxRGB rgb;
+ GfxGray alpha;
+ std::unique_ptr<ImageStream> imgStr(
+@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+ appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+
+ // initialize stream
+- Guchar *p;
++ unsigned char *p;
+ GfxRGB rgb;
+ std::unique_ptr<ImageStream> imgStr(
+ new ImageStream(str,
+@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+ {
+ for( int x = 0; x < maskWidth; ++x )
+ {
+- Guchar aPixel = 0;
++ unsigned char aPixel = 0;
+ imgStrMask->getPixel( &aPixel );
+ int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
+ (x*width/maskWidth)*4 + 1 + 3 // mapped column
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
index 91afb2dd020..9dc3659a431 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -256,6 +256,7 @@ PATCHES=(
# master branch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
+ "${FILESDIR}"/${P}-poppler-0.73.patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-01-09 10:00 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-01-09 10:00 UTC (permalink / raw
To: gentoo-commits
commit: c54fce8c6a4fc87a08b9caea2597afb4ba003ebb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 20:20:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 09:51:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54fce8c
app-office/libreoffice: Drop 6.0.6.2
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 -
.../files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 -
...libreoffice-6.0.3.2-disable-flaky-tests-1.patch | 216 --------
.../files/libreoffice-6.0.3.2-testTdf108947.patch | 13 -
app-office/libreoffice/libreoffice-6.0.6.2.ebuild | 568 ---------------------
5 files changed, 810 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 866b8121e48..1186c6f0e49 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,9 +3,6 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
-DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
deleted file mode 100644
index d714ff2074b..00000000000
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800
-+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
-
- /* do_pagein */
- static void do_pagein (const char * filename)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
deleted file mode 100644
index 03421c5e12b..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Kindly borrowed from Debian.
-
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
- system dependent way) e.g. on the Win@6 tinderbox it always
- crashes
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
- the time
-
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
-index 25db0b6..14e507c 100644
---- a/toolkit/Module_toolkit.mk
-+++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
- JunitTest_toolkit_complex \
-- JunitTest_toolkit_unoapi_1 \
-- JunitTest_toolkit_unoapi_2 \
-- JunitTest_toolkit_unoapi_3 \
-- JunitTest_toolkit_unoapi_4 \
- ))
- endif
-+# JunitTest_toolkit_unoapi_1 \
-+# JunitTest_toolkit_unoapi_2 \
-+# JunitTest_toolkit_unoapi_3 \
-+# JunitTest_toolkit_unoapi_4 \
-
- # vim: set noet sw=4 ts=4:
-diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
-index fa1684c..cc8e1a5 100644
---- a/sc/qa/unoapi/sc_1.sce
-+++ b/sc/qa/unoapi/sc_1.sce
-@@ -24,10 +24,3 @@
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
- -o sc.AccessibleEditableTextPara_PreviewCell
---o sc.ScAccessibleCell
--# i91044 -o sc.ScAccessibleCsvCell
--# i91044 -o sc.ScAccessibleCsvGrid
--# i84641 -o sc.ScAccessibleCsvRuler
--# i88330 -o sc.ScAccessibleDocument
--# i91045 -o sc.ScAccessibleDocumentPagePreview
---o sc.ScAccessiblePageHeader
-diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
-index dbfc3e1..d235c5d 100644
---- a/sc/qa/unoapi/sc_2.sce
-+++ b/sc/qa/unoapi/sc_2.sce
-@@ -15,11 +15,6 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea
---o sc.ScAccessiblePreviewCell
---o sc.ScAccessiblePreviewHeaderCell
---o sc.ScAccessiblePreviewTable
--# fdo#45337 -o sc.ScAccessibleSpreadsheet
- # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
- # -o sc.ScAnnotationObj
- # -o sc.ScAnnotationShapeObj
-
-12:18 < _rene_> chris_wot: ping?
-12:18 < chris_wot> heya
-12:18 < chris_wot> you pinged?
-12:19 < _rene_> chris_wot: any news on
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not
- gotten any further on that one
-12:22 < chris_wot> I honestly think that for this one just disable the test for
- now
-12:22 < chris_wot> I'll ping the ML
-
-This seems fixed when opening the original doc.
-
-diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 54eed4d..78019bd 100644
---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
-
-
-
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
--{
-- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-- if (!pXmlDoc)
-- return;
-- // there should be no flipH and flipV attributes in this case
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-- // check rotation angle
-- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-- // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding roundtrip error
-- * hard to smooth out due to the use of string compare
-- * instead of number */
--#if !defined(_WIN32)
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
--#endif
--#endif
--}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+// if (!pXmlDoc)
-+// return;
-+// // there should be no flipH and flipV attributes in this case
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+// // check rotation angle
-+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+// // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding roundtrip error
-+// * hard to smooth out due to the use of string compare
-+// * instead of number */
-+//#if !defined(_WIN32)
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//#endif
-+//}
-
-
- CPPUNIT_PLUGIN_IMPLEMENT();
-diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
-index 1c3925f..a16f001 100644
---- a/svx/qa/unoapi/svx.sce
-+++ b/svx/qa/unoapi/svx.sce
-@@ -25,7 +25,7 @@
- #i111216 -o svx.AccessiblePresentationGraphicShape
- #i111216 -o svx.AccessiblePresentationOLEShape
- #i85539 -o svx.AccessiblePresentationShape
---o svx.AccessibleShape
-+#-o svx.AccessibleShape
- #i90294 -o svx.GraphicExporter
- -o svx.SvxDrawPage
- #i85501 -o svx.SvxGraphCtrlAccessibleContext
-
-19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it
- fails on your side probably because the paragraph style is
- different. 1. I will change the test to avoid the exact
- dimensions. 2. meantime you can skip that test:
-https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd
-19:26 < IZBot> core - disable UI test that does exact comparison
-19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :)
-19:27 -!- jacobo [~jaragunde@fanzine.igalia.com] has quit [Quit: Leaving.]
-19:27 < _rene_> thanks, will do
-
-diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py
-index 8585e48d8c64..704f42c009a1 100644
---- a/uitest/writer_tests/tdf79236.py
-+++ b/uitest/writer_tests/tdf79236.py
-@@ -8,8 +8,11 @@ from uitest.framework import UITestCase
- import time
- from uitest.uihelper.common import get_state_as_dict, type_text
-
-+import unittest
-+
- class tdf79236(UITestCase):
-
-+ @unittest.skip("Currently broken")
- def test_paragraph(self):
-
- self.ui_test.create_doc_in_start_center("writer")
-
-14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it
- fails for you.
-14:40 <@sberg_> noelgrandin, no
-14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output
-14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished
- yet, I guess
-diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
-index 3273055d5373..cb452139170c 100644
---- a/chart2/Module_chart2.mk
-+++ b/chart2/Module_chart2.mk
-@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
- CppunitTest_chart2_export \
- CppunitTest_chart2_import \
- CppunitTest_chart2_trendcalculators \
-- CppunitTest_chart2_dump \
- CppunitTest_chart2_pivot_chart_test \
- ))
-+# CppunitTest_chart2_dump \
-
- ifeq ($(ENABLE_CHART_TESTS),TRUE)
- ifeq ($(WITH_FONTS), TRUE)
-diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-index 4d65beeb90c4..f3d71501c41a 100644
---- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
- }
-
-
--DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
-+/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
- {
- // the position of the flying text frame should be off page
- // 30624 below its anchor
- OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
- CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
-
--}
-+}*/
-
- DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
- {
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
deleted file mode 100644
index bd84b316252..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
-index 457aedce0acb..4f02cf2b4040 100644
---- a/sw/qa/extras/rtfimport/rtfimport.cxx
-+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
-@@ -1352,7 +1352,7 @@ DECLARE_RTFIMPORT_TEST(testImportHeaderFooter, "tdf108055.rtf")
- DECLARE_RTFIMPORT_TEST(testTdf108947, "tdf108947.rtf")
- {
- //Check page count
-- CPPUNIT_ASSERT_EQUAL(2, getPages());
-+ CPPUNIT_ASSERT_EQUAL(1, getPages());
-
- //Check if Headers/Footers contain what they should in this document
- uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>(
diff --git a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
deleted file mode 100644
index a05ea79b58b..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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="${PN}-6.0.5.2-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-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=(
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-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.1
- >=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.5*
- 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.13.3
- 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.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib:=
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- 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? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-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.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-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 java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${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"
-
- 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
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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/galaxy/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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- 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-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --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-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(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 gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(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 mysql system-mysql-cppconn)
- $(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-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- 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 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- 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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2019-01-09 10:00 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2019-01-09 10:00 UTC (permalink / raw
To: gentoo-commits
commit: c852d4be4693df8f538b4e15eaebae4053f1c25c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 20:31:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 09:51:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c852d4be
app-office/libreoffice: Patch was accepted upstream
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.2.0.1-poppler-0.72.patch | 25 ++++++++++++++++++----
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 ++----
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
index 07e7a17d2f2..7f0b1f71a1e 100644
--- a/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.1-poppler-0.72.patch
@@ -1,6 +1,21 @@
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-01-07 23:10:04.301278414 +0100
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2019-01-07 23:29:11.653479068 +0100
-@@ -555,7 +555,11 @@
+From 65a6c9ae4791188ffcecf489073cf38873ce5e17 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 8 Jan 2019 11:24:40 +0100
+Subject: Fix build with poppler-0.72
+
+Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134
+Reviewed-on: https://gerrit.libreoffice.org/65960
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 101e3be..dab405b 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -555,7 +555,11 @@ void PDFOutDev::processLink(Link* link, Catalog*)
LinkAction* pAction = link->getAction();
if (pAction && pAction->getKind() == actionURI)
{
@@ -12,7 +27,7 @@
std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
-@@ -757,7 +761,11 @@
+@@ -757,7 +761,11 @@ void PDFOutDev::updateFont(GfxState *state)
aFont = it->second;
@@ -24,3 +39,5 @@
printf( " %d %d %d %d %f %d %s",
aFont.isEmbedded,
aFont.isBold,
+--
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index f50c9dc3071..d1351356c1e 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -253,11 +253,8 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
# master branch
- "${FILESDIR}/${PN}-6.2.0.1-poppler-0.71-1.patch"
- "${FILESDIR}/${PN}-6.2.0.1-poppler-0.71-2.patch"
-
- # pending upstream
- "${FILESDIR}/${PN}-6.2.0.1-poppler-0.72.patch"
+ "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
+ "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-11-22 21:48 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-11-22 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 3b2f93ad16204f009ef5b2688fac86bd762cf425
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 01:08:15 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 21:48:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2f93ad
app-office/libreoffice: QA: Don't install compressed manpages
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-6.1-nomancompress.patch | 29 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
3 files changed, 31 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
new file mode 100644
index 00000000000..ea6eb8b816f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.1-nomancompress.patch
@@ -0,0 +1,29 @@
+--- a/bin/distro-install-desktop-integration 2018-10-29 20:55:29.000000000 +0100
++++ b/bin/distro-install-desktop-integration 2018-11-22 02:03:36.464866894 +0100
+@@ -39,22 +39,20 @@
+
+ create_man_link()
+ {
+- echo "Install $MANDIR/man1/$1.1.gz"
++ echo "Install $MANDIR/man1/$1.1"
+
+ mkdir -p $DESTDIR$MANDIR/man1
+ echo ".so man1/$2.1" >| $DESTDIR$MANDIR/man1/$1.1
+- gzip -f $DESTDIR$MANDIR/man1/$1.1
+- test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$3"
++ test -f "$DESTDIR/$3" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$3"
+ }
+
+ install_man()
+ {
+- echo "Install $MANDIR/man1/$1.1.gz"
++ echo "Install $MANDIR/man1/$1.1"
+
+ mkdir -p $DESTDIR$MANDIR/man1
+ cp "${SRCDIR?}"/sysui/desktop/man/$1.1 $DESTDIR$MANDIR/man1 || exit 1;
+- gzip -f $DESTDIR$MANDIR/man1/$1.1
+- test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1.gz" >>"$DESTDIR/$2"
++ test -f "$DESTDIR/$2" && echo "$MANDIR/man1/$1.1" >>"$DESTDIR/$2"
+ }
+
+
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 437ac1b2f00..3c7a646b955 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -247,6 +247,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d2235c0033d..c7399b1a5ac 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -250,6 +250,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: e50b4bcc829521e384529251d85af59e0a0a1b1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 19:16:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50b4bcc
app-office/libreoffice: Fix gio support with USE=gtk3
Thanks-to: Christian Becke <christianbecke <AT> gmail.com>
Closes: https://bugs.gentoo.org/661062
Package-Manager: Portage-2.3.42, Repoman-2.3.9
.../libreoffice-6.0.5.2-enable-gio-w-gtk3.patch | 46 ++
.../libreoffice/libreoffice-6.0.5.2-r1.ebuild | 575 +++++++++++++++++++++
2 files changed, 621 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
new file mode 100644
index 00000000000..4a018711ca2
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.5.2-enable-gio-w-gtk3.patch
@@ -0,0 +1,46 @@
+From a560bcbea943cb317e96c15c608c5e2f66e5698f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Thu, 31 May 2018 14:14:48 +0200
+Subject: --enable-gio also for --disable-gtk --enable-gtk3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+...as is used by the Flatpak build. Other settings only checked in that block
+controlled by ENABLE_GTK, and thus potentially erronously left empty for
+--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related settings.
+GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
+being empty apparently has no negative effects, so leave it at that for now.
+On the GTK_PRINT-related settings, Caolan commented on IRC: "ENABLE_GTK_PRINT
+is probably best removed entirely I guess, it didn't work out and they're
+redoing the dialog in upstream gtk again I'm told."
+
+Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
+Reviewed-on: https://gerrit.libreoffice.org/55127
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
+Reviewed-on: https://gerrit.libreoffice.org/55164
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e35db48..9da61d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9875,7 +9875,9 @@ if test "$test_gtk" = "yes"; then
+ GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+ FilterLibs "${GTK_PRINT_LIBS}"
+ GTK_PRINT_LIBS="${filteredlibs}"
++ fi
+
++ if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then
+ AC_MSG_CHECKING([whether to enable GIO support])
+ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
+ dnl Need at least 2.26 for the dbus support.
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
new file mode 100644
index 00000000000..1ed29b9c997
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -0,0 +1,575 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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-02.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+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=(
+ "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
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+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.1
+ >=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.5*
+ 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.13.3
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype: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/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ 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? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+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.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
+
+ # 6.0 branch
+ "${FILESDIR}/${P}-enable-gio-w-gtk3.patch" #bug 661062
+
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+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
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_setup
+ fi
+}
+
+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"
+
+ 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
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # 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/galaxy/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"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ 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-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --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-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(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 gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(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 mysql system-mysql-cppconn)
+ $(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-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ 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 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ 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
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # 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
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: d415443669b964032fc629babd4db038a2924116
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 18:15:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4154436
app-office/libreoffice: Drop 5.4.7.2
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/Manifest | 2 -
.../libreoffice-5.4.4.2-gtk3-no-gtk-build.patch | 13 -
.../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 --
.../files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 ---
app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 550 ---------------------
app-office/libreoffice/metadata.xml | 1 -
6 files changed, 692 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1a7ea0406ec..49895535eda 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,13 +3,11 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
DIST libreoffice-help-6.0.5.2.tar.xz 2972956 BLAKE2B cfe585fb690bc0a348b67aae1330daa61a0a08acc580fad147853d84c9496d0ad4c4b14598492d4aba9af4afe7fa65bff0161a77b1c0cae9089d50e2a542e0c1 SHA512 975c547e59280e08e554bc658642660fc17e5785b45254b40f969f4b42088d5a350dec72ae6b6f1aa60d7bc95bd9d2c2134f6b395ee86e6f9f5af09f52cc50e1
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
deleted file mode 100644
index f0e2c55c936..00000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-gtk3-no-gtk-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with USE="gtk3 -gtk"
-https://bugs.gentoo.org/641812
-
---- a/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-12 18:45:07.000000000 +0100
-+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx 2017-12-21 13:20:31.935843032 +0100
-@@ -21,6 +21,7 @@
- #include <unx/gtk/gtkdata.hxx>
- #include <unx/gtk/gtkinst.hxx>
- #include <unx/gtk/gtkgdi.hxx>
-+#include <unx/gtk/gtksalmenu.hxx>
- #include <vcl/help.hxx>
- #include <vcl/keycodes.hxx>
- #include <vcl/layout.hxx>
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
deleted file mode 100644
index e6d7dff898d..00000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
-
---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100
-+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100
-@@ -10403,7 +10403,7 @@
- if test "$with_system_poppler" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_POPPLER=TRUE
-- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
-+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- save_CPPFLAGS=$CPPFLAGS
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100
-@@ -32,13 +32,11 @@
- #pragma warning(push, 1)
- #endif
-
--// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- // because the internal poppler does not provide poppler-version.h and the macro always returns 0
--#if POPPLER_CHECK_VERSION(0, 21, 1)
--#include "UTF8.h"
--#elif POPPLER_CHECK_VERSION(0, 21, 0)
--#include "UTF.h"
-+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+#include "UnicodeMapFuncs.h"
- #else
- #include "UTF8.h"
- #endif
-@@ -918,7 +916,11 @@
- );
-
- // silence spurious warning
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+ (void)&mapUTF16;
-+#else
- (void)&mapUCS2;
-+#endif
-
- char buf[9];
- for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
deleted file mode 100644
index 28982d90c36..00000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Sun, 28 Jan 2018 19:48:25 +0100
-Subject: fix build with glm 0.9.9
-
-In file included from /usr/include/glm/gtx/norm.hpp:18:0,
- from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
-ls.hxx:16,
- from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
-rUtils.hxx:14,
- from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
-ls.cxx:11:
-/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
- is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
- ^~~~~
-
-so just define it.
-
-Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
-Reviewed-on: https://gerrit.libreoffice.org/48799
-Tested-by: Jenkins <ci@libreoffice.org>
-Tested-by: Rene Engelhard <rene@debian.org>
-Reviewed-by: Rene Engelhard <rene@debian.org>
----
- chart2/Library_chartcore.mk | 6 ++++++
- chart2/Library_chartopengl.mk | 6 ++++++
- vcl/Library_vcl.mk | 6 ++++++
- 3 files changed, 18 insertions(+)
-
-diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
-index f785d09..08455f9 100644
---- a/chart2/Library_chartcore.mk
-+++ b/chart2/Library_chartcore.mk
-@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
- -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
- ))
-
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,chartcore,\
-+ -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
-
- $(eval $(call gb_Library_use_externals,chartcore,\
-diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
-index f999f94..8b5a22c 100644
---- a/chart2/Library_chartopengl.mk
-+++ b/chart2/Library_chartopengl.mk
-@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
- chart2/source/view/main/DummyXShape \
- chart2/source/view/main/OpenGLRender \
- ))
-+
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,chartopengl,\
-+ -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-
- # vim: set noet sw=4 ts=4:
-diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
-index 699d6ab..a2caa8e 100644
---- a/vcl/Library_vcl.mk
-+++ b/vcl/Library_vcl.mk
-@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
- -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
- ))
-
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,vcl,\
-+ -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_use_sdk_api,vcl))
-
- $(eval $(call gb_Library_use_custom_headers,vcl,\
---
-cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
deleted file mode 100644
index a2e8ed475fa..00000000000
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# 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/${PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-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+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${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=(
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-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/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- 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.5*
- 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.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- 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? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- # 6.0 branch
- "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
- "${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
- "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
- # 6.1 branch
- "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- 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
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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/galaxy/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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- # 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-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-collada
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gltf
- --disable-gstreamer-0-10
- --disable-kde4
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --disable-systray
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --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-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(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)
- $(use_enable gtk3)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(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 mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk3; 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-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- 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 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- 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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 174cf72da38..b63d524dac8 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,6 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="gtk2">Enable legacy gtk2 frontend</flag>
- <flag name="gtk3">Enable experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-06-10 9:19 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-06-10 9:19 UTC (permalink / raw
To: gentoo-commits
commit: c3bba70d6c0670228fd4da49e64fbbd17aa1a0aa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 10 08:30:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 10 08:58:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3bba70d
app-office/libreoffice: Fix configure with >=media-libs/glm-0.9.9
Bug: https://bugs.gentoo.org/657178
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 ++++++++++++++++++++++
.../files/libreoffice-6.0.4.2-glm-0.9.9.patch | 19 +++++
app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 2 +
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 1 +
4 files changed, 104 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
new file mode 100644
index 00000000000..28982d90c36
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
@@ -0,0 +1,82 @@
+From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sun, 28 Jan 2018 19:48:25 +0100
+Subject: fix build with glm 0.9.9
+
+In file included from /usr/include/glm/gtx/norm.hpp:18:0,
+ from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
+ls.hxx:16,
+ from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
+rUtils.hxx:14,
+ from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
+ls.cxx:11:
+/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
+ is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+ # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+ ^~~~~
+
+so just define it.
+
+Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
+Reviewed-on: https://gerrit.libreoffice.org/48799
+Tested-by: Jenkins <ci@libreoffice.org>
+Tested-by: Rene Engelhard <rene@debian.org>
+Reviewed-by: Rene Engelhard <rene@debian.org>
+---
+ chart2/Library_chartcore.mk | 6 ++++++
+ chart2/Library_chartopengl.mk | 6 ++++++
+ vcl/Library_vcl.mk | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
+index f785d09..08455f9 100644
+--- a/chart2/Library_chartcore.mk
++++ b/chart2/Library_chartcore.mk
+@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+ ))
+
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartcore,\
++ -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
+
+ $(eval $(call gb_Library_use_externals,chartcore,\
+diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
+index f999f94..8b5a22c 100644
+--- a/chart2/Library_chartopengl.mk
++++ b/chart2/Library_chartopengl.mk
+@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
+ chart2/source/view/main/DummyXShape \
+ chart2/source/view/main/OpenGLRender \
+ ))
++
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartopengl,\
++ -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
+
+ # vim: set noet sw=4 ts=4:
+diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
+index 699d6ab..a2caa8e 100644
+--- a/vcl/Library_vcl.mk
++++ b/vcl/Library_vcl.mk
+@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
+ -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+ ))
+
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,vcl,\
++ -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_use_sdk_api,vcl))
+
+ $(eval $(call gb_Library_use_custom_headers,vcl,\
+--
+cgit v1.1
diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
new file mode 100644
index 00000000000..ea667d03ceb
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
@@ -0,0 +1,19 @@
+Fix build with >=media-libs/glm-0.9.9
+https://bugs.gentoo.org/657178
+https://bugs.documentfoundation.org/show_bug.cgi?id=118070
+
+--- a/vcl/Executable_icontest.mk
++++ a/vcl/Executable_icontest.mk
+@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
+ ))
+ endif
+
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Executable_add_defs,icontest,\
++ -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Executable_use_api,icontest,\
+ offapi \
+ udkapi \
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
index 8b6c7e2e1ca..7f73e8fc0a4 100644
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
@@ -232,10 +232,12 @@ PATCHES=(
# 6.0 branch
"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
+ "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
+ "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index b1c28905c33..304982e8d2d 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -251,6 +251,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
+ "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-05-29 14:59 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-05-29 14:59 UTC (permalink / raw
To: gentoo-commits
commit: b20d064bc910e4365155da6a4b925902906dba38
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 14:58:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 29 14:58:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20d064b
app-office/libreoffice: Re-shuffle disable-flaky-tests
Closes: https://bugs.gentoo.org/656846
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...ibreoffice-6.0.3.2-disable-flaky-tests-1.patch} | 37 ----------------------
...libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
similarity index 87%
rename from app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
rename to app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
index b25e4fc3ae5..03421c5e12b 100644
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
@@ -214,40 +214,3 @@ index 4d65beeb90c4..f3d71501c41a 100644
DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
{
---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
-+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
-@@ -114,7 +114,7 @@
- /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
- void testODFBrokenDsigGPG();
- /// Test loading an encrypted ODF document
-- void testODFEncryptedGPG();
-+// void testODFEncryptedGPG();
- #endif
- CPPUNIT_TEST_SUITE(SigningTest);
- CPPUNIT_TEST(testDescription);
-@@ -143,7 +143,7 @@
- CPPUNIT_TEST(testODFUntrustedGoodGPG);
- CPPUNIT_TEST(testODFBrokenStreamGPG);
- CPPUNIT_TEST(testODFBrokenDsigGPG);
-- CPPUNIT_TEST(testODFEncryptedGPG);
-+// CPPUNIT_TEST(testODFEncryptedGPG);
- #endif
- CPPUNIT_TEST_SUITE_END();
-
-@@ -743,14 +743,14 @@
- CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
- }
-
--void SigningTest::testODFEncryptedGPG()
-+/*void SigningTest::testODFEncryptedGPG()
- {
- createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
- SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
- CPPUNIT_ASSERT(pBaseModel);
- SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
- CPPUNIT_ASSERT(pObjectShell);
--}
-+}*/
-
- #endif
-
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
new file mode 100644
index 00000000000..55f2d8a55fc
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
@@ -0,0 +1,37 @@
+--- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
+@@ -114,7 +114,7 @@
+ /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
+ void testODFBrokenDsigGPG();
+ /// Test loading an encrypted ODF document
+- void testODFEncryptedGPG();
++// void testODFEncryptedGPG();
+ #endif
+ CPPUNIT_TEST_SUITE(SigningTest);
+ CPPUNIT_TEST(testDescription);
+@@ -143,7 +143,7 @@
+ CPPUNIT_TEST(testODFUntrustedGoodGPG);
+ CPPUNIT_TEST(testODFBrokenStreamGPG);
+ CPPUNIT_TEST(testODFBrokenDsigGPG);
+- CPPUNIT_TEST(testODFEncryptedGPG);
++// CPPUNIT_TEST(testODFEncryptedGPG);
+ #endif
+ CPPUNIT_TEST_SUITE_END();
+
+@@ -743,14 +743,14 @@
+ CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
+ }
+
+-void SigningTest::testODFEncryptedGPG()
++/*void SigningTest::testODFEncryptedGPG()
+ {
+ createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
+ SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+ CPPUNIT_ASSERT(pBaseModel);
+ SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+ CPPUNIT_ASSERT(pObjectShell);
+-}
++}*/
+
+ #endif
+
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index a7d6373ce84..837b49a029d 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -245,7 +245,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+ "${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
# 6.0 branch
"${FILESDIR}/${P}-poppler-0.64.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index 433d077bc2c..a7f087f49e2 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -246,7 +246,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+ "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 433d077bc2c..a7f087f49e2 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -246,7 +246,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+ "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-02-10 9:43 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-02-10 9:43 UTC (permalink / raw
To: gentoo-commits
commit: c48fa388500567bae7f3e7cfdb2660998d089f4c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 09:39:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 09:43:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48fa388
app-office/libreoffice: 5.4.5.1 version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 +
.../files/libreoffice-5.4.5.1-pyuno-crash.patch | 87 ++++
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 580 +++++++++++++++++++++
3 files changed, 669 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 266e3bc93e3..78dfafcffc8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,10 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
+DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
+DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
diff --git a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch
new file mode 100644
index 00000000000..850f56465c7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch
@@ -0,0 +1,87 @@
+From 42e2c4af310deb7660b07c6307459c9d2a42bb8b Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl@redhat.com>
+Date: Thu, 1 Feb 2018 13:52:00 +0100
+Subject: tdf#114815 pyuno: avoid 2 threads initing python in parallel
+
+According to the crash reports, it's possible for the grammar checking
+thread to call GetGrammarChecker, instantiating lightproof, at the same
+time as the main thread instantiates LngSvcMgr, which also instantiates
+(some?) (all?) grammar checkers.
+
+Ensure that pyuno_loader::CreateInstance() initialises Python only
+once with a C++11 thread safe static.
+
+For the backport, use rtl::Static instead, because on the 5.4 branch
+MSVC does not have HAVE_THREADSAFE_STATICS enabled.
+
+Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf
+(cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0)
+Reviewed-on: https://gerrit.libreoffice.org/49116
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+(cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4)
+Reviewed-on: https://gerrit.libreoffice.org/49298
+Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
+Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+---
+ pyuno/source/loader/pyuno_loader.cxx | 25 +++++++++++++++++++++----
+ 1 file changed, 21 insertions(+), 4 deletions(-)
+
+diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
+index adbf6c8..0408af0 100644
+--- a/pyuno/source/loader/pyuno_loader.cxx
++++ b/pyuno/source/loader/pyuno_loader.cxx
+@@ -31,6 +31,7 @@
+ #include <rtl/ustrbuf.hxx>
+ #include <rtl/strbuf.hxx>
+ #include <rtl/bootstrap.hxx>
++#include <rtl/instance.hxx>
+
+ #include <cppuhelper/implementationentry.hxx>
+ #include <cppuhelper/factory.hxx>
+@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
+ osl_setEnvironment(envVar.pData, envValue.pData);
+ }
+
+-Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx )
++struct PythonInit
+ {
+- Reference< XInterface > ret;
+-
+- if( ! Py_IsInitialized() )
++PythonInit() {
++ if (! Py_IsInitialized()) // may be inited by getComponentContext() already
+ {
+ OUString pythonPath;
+ OUString pythonHome;
+@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
+ // PyThreadAttach below.
+ PyThreadState_Delete(tstate);
+ }
++}
++};
++
++namespace {
++ struct thePythonInit : public rtl::Static<PythonInit, thePythonInit> {};
++}
++
++Reference<XInterface> CreateInstance(const Reference<XComponentContext> & ctx)
++{
++ // tdf#114815 thread-safe static to init python only once
++ thePythonInit::get();
++
++ Reference< XInterface > ret;
+
+ PyThreadAttach attach( PyInterpreterState_Head() );
+ {
++ // note: this can't race against getComponentContext() because
++ // either (in soffice.bin) CreateInstance() must be called before
++ // getComponentContext() can be called, or (in python.bin) the other
++ // way around
+ if( ! Runtime::isInitialized() )
+ {
+ Runtime::initialize( ctx );
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
new file mode 100644
index 00000000000..9ebcfd8ed95
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# 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/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+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+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${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=(
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "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
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+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/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ 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.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.12*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype: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/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( media-libs/opencollada )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ gltf? ( >=media-libs/libgltf-0.1.0 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ x11-libs/gtk+:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ kde? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-frameworks/kdelibs
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/oxygen-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.2:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
+
+ "${FILESDIR}/${P}-pyuno-crash.patch" # 5.4.5 branch commit after release
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ unpack "${PN}-help-${PV}.tar.xz"
+ else
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ 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() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ default
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # 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" "${S}/icon-themes/galaxy/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"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ 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-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --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-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable collada)
+ $(use_enable cups)
+ $(use_enable debug)
+ $(use_enable dbus)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gltf)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk)
+ $(use_enable gtk3)
+ $(use_enable kde kde4)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable quickstarter systray)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with collada system-opencollada)
+ $(use_with gltf system-libgltf)
+ $(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 mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk3; 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-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ 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 js.jar) )
+ fi
+
+ 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
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; 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
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-02-09 23:14 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-02-09 23:14 UTC (permalink / raw
To: gentoo-commits
commit: eed7c643bbd0418cfd8b98e9d5e57cad5fb33ece
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 23:14:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 23:14:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed7c643
app-office/libreoffice: Drop 6.0.0.3
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 -
.../files/libreoffice-6.0.0.1-poppler-0.62.patch | 44 --
.../files/libreoffice-6.0.0.3-jpeg-9.patch | 41 --
app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 571 ---------------------
4 files changed, 658 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e4802dfc595..266e3bc93e3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,9 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
-DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
-DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
deleted file mode 100644
index f0ecc3b990b..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
-
---- a/configure.ac 2017-12-12 18:45:07.000000000 +0100
-+++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100
-@@ -10403,7 +10403,7 @@
- if test "$with_system_poppler" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_POPPLER=TRUE
-- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
-+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- save_CPPFLAGS=$CPPFLAGS
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100
-@@ -32,13 +32,11 @@
- #pragma warning(push, 1)
- #endif
-
--// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
- // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
- // because the internal poppler does not provide poppler-version.h and the macro always returns 0
--#if POPPLER_CHECK_VERSION(0, 21, 1)
--#include <UTF8.h>
--#elif POPPLER_CHECK_VERSION(0, 21, 0)
--#include "UTF.h"
-+// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+#include "UnicodeMapFuncs.h"
- #else
- #include "UTF8.h"
- #endif
-@@ -918,7 +916,11 @@
- );
-
- // silence spurious warning
-+#if POPPLER_CHECK_VERSION(0, 62, 0)
-+ (void)&mapUTF16;
-+#else
- (void)&mapUCS2;
-+#endif
-
- char buf[9];
- for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
deleted file mode 100644
index 40dfb08d56a..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5184506ffddca982f22eede24cffad64ff3576e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Sat, 3 Feb 2018 16:39:12 +0000
-Subject: tdf#115416 allow build with classic libjpeg
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
-Reviewed-on: https://gerrit.libreoffice.org/49187
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- vcl/source/filter/jpeg/jpegc.cxx | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
-index 570c036..059ec20 100644
---- a/vcl/source/filter/jpeg/jpegc.cxx
-+++ b/vcl/source/filter/jpeg/jpegc.cxx
-@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
- eScanlineFormat = ScanlineFormat::N8BitPal;
- nPixelSize = 1;
- }
-+#if defined(JCS_EXTENSIONS)
- else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
- {
- best_out_color_space = JCS_EXT_BGRA;
-@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
- eScanlineFormat = eFinalFormat;
- nPixelSize = 4;
- }
--
-+#endif
- if (rContext.cinfo.jpeg_color_space == JCS_YCCK)
- rContext.cinfo.out_color_space = JCS_CMYK;
-
---
-cgit v1.1
-
diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
deleted file mode 100644
index 170a95f8825..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# 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/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-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 [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${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=(
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-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.1
- >=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.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype: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/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- x11-libs/gtk+:3
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # 6.1 branch
- "${FILESDIR}/${P}-jpeg-9.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- 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
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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" "${S}/icon-themes/galaxy/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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- 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-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --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-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(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 gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(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 mysql system-mysql-cppconn)
- $(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-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- 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 js.jar) )
- fi
-
- 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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-02-04 18:58 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-02-04 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 9340ca0e6718d790d4fdd949a7e8f7392441a4d9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 4 18:57:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 4 18:57:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9340ca0e
app-office/libreoffice: Fix build with media-libs/jpeg
Backport picked from upstream.
Bug: https://bugs.gentoo.org/638520
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/libreoffice-6.0.0.3-jpeg-9.patch | 41 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 7 ++--
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 4 +--
app-office/libreoffice/libreoffice-9999.ebuild | 4 +--
4 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
new file mode 100644
index 00000000000..40dfb08d56a
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.0.3-jpeg-9.patch
@@ -0,0 +1,41 @@
+From 5184506ffddca982f22eede24cffad64ff3576e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Sat, 3 Feb 2018 16:39:12 +0000
+Subject: tdf#115416 allow build with classic libjpeg
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I96252e1a78dbc52d21095e11b7bdb0807e5d76b6
+Reviewed-on: https://gerrit.libreoffice.org/49187
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ vcl/source/filter/jpeg/jpegc.cxx | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
+index 570c036..059ec20 100644
+--- a/vcl/source/filter/jpeg/jpegc.cxx
++++ b/vcl/source/filter/jpeg/jpegc.cxx
+@@ -244,6 +244,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
+ eScanlineFormat = ScanlineFormat::N8BitPal;
+ nPixelSize = 1;
+ }
++#if defined(JCS_EXTENSIONS)
+ else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
+ {
+ best_out_color_space = JCS_EXT_BGRA;
+@@ -262,7 +263,7 @@ void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream,
+ eScanlineFormat = eFinalFormat;
+ nPixelSize = 4;
+ }
+-
++#endif
+ if (rContext.cinfo.jpeg_color_space == JCS_YCCK)
+ rContext.cinfo.out_color_space = JCS_CMYK;
+
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
index fb3e9b376d0..170a95f8825 100644
--- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
@@ -254,6 +254,9 @@ PATCHES=(
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # 6.1 branch
+ "${FILESDIR}/${P}-jpeg-9.patch"
)
pkg_pretend() {
@@ -261,8 +264,8 @@ pkg_pretend() {
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 9890bb1bf83..95d104f0bb3 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -260,8 +260,8 @@ pkg_pretend() {
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4869257cf96..59c64ab8a1c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -258,8 +258,8 @@ pkg_pretend() {
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-01-07 16:02 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-01-07 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 79852718db9074e427412b2400003b565dad3c05
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 15:29:44 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 16:01:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79852718
app-office/libreoffice: Fix build w/ USE=pdfimport and poppler-0.62
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/libreoffice-6.0.0.1-poppler-0.62.patch | 44 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 3 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 3 +-
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
new file mode 100644
index 00000000000..f0ecc3b990b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
@@ -0,0 +1,44 @@
+Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
+
+--- a/configure.ac 2017-12-12 18:45:07.000000000 +0100
++++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100
+@@ -10403,7 +10403,7 @@
+ if test "$with_system_poppler" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_POPPLER=TRUE
+- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
++ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100
+@@ -32,13 +32,11 @@
+ #pragma warning(push, 1)
+ #endif
+
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ // because the internal poppler does not provide poppler-version.h and the macro always returns 0
+-#if POPPLER_CHECK_VERSION(0, 21, 1)
+-#include <UTF8.h>
+-#elif POPPLER_CHECK_VERSION(0, 21, 0)
+-#include "UTF.h"
++// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++#include "UnicodeMapFuncs.h"
+ #else
+ #include "UTF8.h"
+ #endif
+@@ -918,7 +916,11 @@
+ );
+
+ // silence spurious warning
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++ (void)&mapUTF16;
++#else
+ (void)&mapUCS2;
++#endif
+
+ char buf[9];
+ for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac54..d6e9a757db6 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -245,6 +245,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 9b35442a6de..5fca4ae10c0 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -250,6 +250,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8e..ba7d38f7d30 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -249,6 +249,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2018-01-05 0:35 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2018-01-05 0:35 UTC (permalink / raw
To: gentoo-commits
commit: db869f1cfa8ee0887d6729bcdc29e3865800e64e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 23:01:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 00:34:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db869f1c
app-office/libreoffice: Fix build w/ USE=pdfimport and poppler-0.62
Closes: https://bugs.gentoo.org/642602
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/libreoffice-5.4.4.2-poppler-0.62.patch | 44 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
new file mode 100644
index 00000000000..e6d7dff898d
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.4.2-poppler-0.62.patch
@@ -0,0 +1,44 @@
+Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
+
+--- a/configure.ac 2017-12-12 18:45:07.000000000 +0100
++++ b/configure.ac 2018-01-04 23:57:16.410999542 +0100
+@@ -10403,7 +10403,7 @@
+ if test "$with_system_poppler" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_POPPLER=TRUE
+- PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
++ PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2017-12-12 18:45:07.000000000 +0100
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-05 00:29:16.541246738 +0100
+@@ -32,13 +32,11 @@
+ #pragma warning(push, 1)
+ #endif
+
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ // because the internal poppler does not provide poppler-version.h and the macro always returns 0
+-#if POPPLER_CHECK_VERSION(0, 21, 1)
+-#include "UTF8.h"
+-#elif POPPLER_CHECK_VERSION(0, 21, 0)
+-#include "UTF.h"
++// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++#include "UnicodeMapFuncs.h"
+ #else
+ #include "UTF8.h"
+ #endif
+@@ -918,7 +916,11 @@
+ );
+
+ // silence spurious warning
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++ (void)&mapUTF16;
++#else
+ (void)&mapUCS2;
++#endif
+
+ char buf[9];
+ for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 303d903bcb7..2e4b24caa4b 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -246,6 +246,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${P}-gtk3-no-gtk-build.patch" # bug 641812
+ "${FILESDIR}/${P}-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2017-06-25 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2017-06-25 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 0f3b29bb1e019af4afd5b3bc34abb03ddf4f509b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 23:12:25 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 21:52:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3b29bb
app-office/libreoffice: Allow alternatives to kioclient:4
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch | 11 +++++++++++
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 3 ++-
app-office/libreoffice/libreoffice-9999.ebuild | 3 ++-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
new file mode 100644
index 00000000000..a6e732f7f37
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
@@ -0,0 +1,11 @@
+--- a/shell/source/unix/misc/senddoc.sh 2017-06-15 15:44:22.000000000 +0200
++++ b/shell/source/unix/misc/senddoc.sh 2017-06-25 01:00:08.525435930 +0200
+@@ -389,6 +389,8 @@
+ elif [ -n "$DESKTOP_LAUNCH" ]; then
+ # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
+ MAILER=${DESKTOP_LAUNCH}
++ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
++ MAILER=/usr/bin/kde-open5
+ elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
+ MAILER=/usr/bin/kde-open
+ elif [ -x /usr/bin/xdg-open ] ; then
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 5f6ac8e8e0d..186bd71a3a3 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -181,8 +181,8 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/liberation-fonts
media-fonts/libertine
media-fonts/urw-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
vlc? ( media-video/vlc )
"
@@ -243,6 +243,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ccb30f204f7..ca3407b6f01 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -184,8 +184,8 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/liberation-fonts
media-fonts/libertine
media-fonts/urw-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
vlc? ( media-video/vlc )
"
@@ -246,6 +246,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2017-02-12 0:13 Andreas Sturmlechner
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Sturmlechner @ 2017-02-12 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 40e6223ba49d58c47a58e708b3419795f95ac95c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 7 02:16:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 00:12:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e6223b
app-office/libreoffice: Fix build with glibc-2.24
Gentoo-bug: 604176
Package-Manager: portage-2.3.3
.../libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch | 10 ++++++++++
app-office/libreoffice/libreoffice-5.2.5.1.ebuild | 3 +++
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-5.3.0.3.ebuild | 3 +++
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++
6 files changed, 25 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
new file mode 100644
index 0000000000..d714ff2074
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
@@ -0,0 +1,10 @@
+--- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c 2017-01-11 16:54:33.000000000 -0800
++++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c 2017-02-03 10:22:51.697673613 -0800
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+
+ /* do_pagein */
+ static void do_pagein (const char * filename)
diff --git a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
index d104014a02..4da4a96eb6 100644
--- a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
@@ -245,6 +245,9 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index d104014a02..4da4a96eb6 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -245,6 +245,9 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
index 66fe06013a..9dc3f33d8a 100644
--- a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index b8cd07d14d..187b52ebe9 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -244,6 +244,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e0e9d615e0..edc20fcdbb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -245,6 +245,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2016-11-29 19:55 Andreas Hüttel
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Hüttel @ 2016-11-29 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 5353274f08c187aaeb38b6688e6a6e20177977aa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 19:52:49 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 19:55:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5353274f
app-office/libreoffice: Remove old
Package-Manager: portage-2.3.2
app-office/libreoffice/Manifest | 6 -
.../files/libreoffice-4.4-system-pyuno.patch | 44 --
.../files/libreoffice-5.1.4.2-gcc6.patch | 40 --
.../files/libreoffice-curl-7.50.0.patch | 23 -
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 578 ---------------------
app-office/libreoffice/libreoffice-5.2.2.2.ebuild | 558 --------------------
app-office/libreoffice/libreoffice-5.2.3.3.ebuild | 567 --------------------
7 files changed, 1816 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 07c1897..d9ff85e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,17 +1,11 @@
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
-DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
-DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba
-DIST libreoffice-5.2.2.2.tar.xz 182258452 SHA256 5952eaa0b06a0659cf7cca397f95c00e73f0f410f14310deb363985746dad9e0 SHA512 1b59a0b8e28471a9ea97334b4e383d177f6cd6624dd2dad6541aa87fd836188a1c26a8755aef22510e53c2cf1b7b711a647867e07bde6e86ea8692a61b4679c8 WHIRLPOOL 0b9a1e59f6211a3196f6efb3f445f9b1c841e6ed640c2023c0791820de3b3166e99ad4d6b74e0abb24b35fa849fbf0a32dae4f630bb723d2af1b4e84d0c36855
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70
-DIST libreoffice-help-5.2.2.2.tar.xz 1919792 SHA256 01c639223d9a31b58480935e1fef4f1bc7b82306f5fac8b6269541ab411ca2be SHA512 3691d843d84d21aae8be2d9dfe88f47e83fb13d0b92f9158e55bdfa40193c5102bafef40f048757d35c5c4b9660740c87614b5140760293e069ec01934b02223 WHIRLPOOL c0b29a181fa9b6df5299b77032908d88842f41ff2a66ca84af7f02ddbf2540b668649ea3e8be205cbc6ccde70fe30e548a38dd43877ea394be0e7fcd467b50cb
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
deleted file mode 100644
index 1cf8e19..00000000
--- a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index a259bf6..672fa23 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
- exit 1;
- fi
-
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index 4ff2606..6a05eed 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -16,8 +16,12 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import sys
-
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
- import pyuno
-
- try:
-diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
-index 99d3b03..704edab 100755
---- a/pyuno/source/officehelper.py
-+++ b/pyuno/source/officehelper.py
-@@ -44,7 +44,7 @@ def bootstrap():
- if "UNO_PATH" in os.environ:
- sOffice = os.environ["UNO_PATH"]
- else:
-- sOffice = "" # lets hope for the best
-+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
- sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
- sOffice += ".exe"
diff --git a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch b/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
deleted file mode 100644
index 9e7ee73..00000000
--- a/app-office/libreoffice/files/libreoffice-5.1.4.2-gcc6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Tue, 24 May 2016 16:35:57 +0200
-Subject: [PATCH] KDE4 cflags no /usr/include usage to fix build failure with
- gcc6
-
-Change-Id: I53106b9ebfa7cc5c7b6c6d6f3bb3a4e5f2261f4f
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 091abb4..86cc7b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11117,6 +11117,7 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
- if test "x$kde_incdir" = "xno"; then
- AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
- fi
-+ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
-
- dnl Check for KDE4 libraries
- AC_MSG_CHECKING([for KDE4 libraries])
-@@ -11134,7 +11135,12 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
- fi
-
- PKG_CHECK_MODULES([QT4],[QtNetwork QtGui])
-- KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-+ if ! test -z "$kde_incdir"; then
-+ KDE4_CFLAGS="-I$kde_incdir $QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-+ else
-+ KDE4_CFLAGS="$QT4_CFLAGS -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-+ fi
-+
- KDE4_LIBS="-L$kde_libdir -lkio -lkfile -lkdeui -lkdecore -L$qt_lib_dir $QT4_LIBS"
- KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- FilterLibs "$KDE4_LIBS"
---
-2.9.0
-
diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
deleted file mode 100644
index 4a947d0..00000000
--- a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 25 Jul 2016 12:08:35 +0100
-Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
-
-Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
-
-diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
-index be68d9a..315ccb7 100644
---- a/ucb/source/ucp/ftp/ftploaderthread.cxx
-+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
-@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
-
-
- CURL* FTPLoaderThread::handle() {
-- CURL* ret = osl_getThreadKeyData(m_threadKey);
-+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
- if(!ret) {
- ret = curl_easy_init();
- if (ret != nullptr) {
---
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
deleted file mode 100644
index ddada96..00000000
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- 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=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- app-text/poppler:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- <dev-libs/icu-58:=
- =dev-libs/liborcus-0.9*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from 5.2 branch
- "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
- "${FILESDIR}/${PN}-curl-7.50.0.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local ext_opts
-
- # Set up Google API keys, see http://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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --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
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-online-update \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --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-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with google gdrive-client-id ${google_default_client_id}) \
- $(use_with google gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
deleted file mode 100644
index 6ebd947..00000000
--- a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- 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=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- 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.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- <dev-libs/icu-58:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --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
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --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-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(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 mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
- 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
deleted file mode 100644
index 96fefc7..00000000
--- a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- 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=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "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
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- 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.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # 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
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://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"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --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
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --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-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(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 mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
- 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
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2016-09-17 21:32 Andreas Hüttel
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Hüttel @ 2016-09-17 21:32 UTC (permalink / raw
To: gentoo-commits
commit: e5b3ed5473a6331485306565953d8436533fe59d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 8 15:17:41 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b3ed54
app-office/libreoffice: Fix system-pyuno.patch, libxmlsec tarball
Gentoo-bug: 577278
bump libxmlsec tarball to 1.2.22
Gentoo-bug: 589040
adapted patch kindly provided by 'cyrillic'
Also, recent upstream commits removed some build options:
9ee01c424e37f7cd76d2edf38e9bc5f6e988d18d,
8dc38d9ded92960eda46343b67da8a8b95404b5a
Package-Manager: portage-2.3.0
app-office/libreoffice/Manifest | 1 +
.../files/libreoffice-5.3-system-pyuno.patch | 47 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-9999.ebuild | 6 +--
3 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 60572d8..97e7f23 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,3 +1,4 @@
+DIST 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz 1792363 SHA256 8c06bf161c565b907a499e6d906f0b640f063b2b4efd2b471048ac5b3c1ad527 SHA512 69ea729cc8e3154e0644b076c8217905920b7e5ef0360640a750f73d90c8a1d8bf139c6400571a7940727c85413a8f69b2204801d2fe97796ff944eb09bbbb69 WHIRLPOOL a443c0542cf19d1491db86bb0e12970c6d6fc80b4ba9f98cb5caecd2cd1c290809b2756f8a95daabe6493bed8f4ae39991288552bece1599eb218c43da9f6efe
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
diff --git a/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch
new file mode 100644
index 00000000..3ab3e82
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.3-system-pyuno.patch
@@ -0,0 +1,47 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -139,6 +139,9 @@ if echo "$checks" | grep -q "cc" ; then
+ exit 1;
+ fi
+
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+
+--- a/pyuno/source/module/uno.py 2016-08-07 20:57:51.653712240 -0400
++++ b/pyuno/source/module/uno.py 2016-08-07 20:59:33.958896861 -0400
+@@ -16,11 +16,16 @@
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import pyuno
+ import sys
+ import traceback
+ import warnings
+
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
++
+ # since on Windows sal3.dll no longer calls WSAStartup
+ import socket
+
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+ if "UNO_PATH" in os.environ:
+ sOffice = os.environ["UNO_PATH"]
+ else:
+- sOffice = "" # lets hope for the best
++ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+ sOffice = os.path.join(sOffice, "soffice")
+ if platform.startswith("win"):
+ sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1e137d5..1cea506 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -57,7 +57,7 @@ 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=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "${ADDONS_URI}/0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -241,7 +241,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
)
CHECKREQS_MEMORY="512M"
@@ -424,7 +424,6 @@ src_configure() {
--disable-epm \
--disable-fetch-external \
--disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
--disable-online-update \
--disable-report-builder \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
@@ -443,7 +442,6 @@ src_configure() {
--without-myspell-dicts \
--without-help \
--with-helppack-integration \
- --without-sun-templates \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2016-07-26 7:39 Lars Wendler
0 siblings, 0 replies; 49+ messages in thread
From: Lars Wendler @ 2016-07-26 7:39 UTC (permalink / raw
To: gentoo-commits
commit: 9c1e96216f410c4ab68dd91b575609cde1d9c842
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 07:39:17 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 07:39:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1e9621
app-office/libreoffice: Fixed building with >=net-misc/curl-7.50.0
Gentoo bug #589578
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/libreoffice-curl-7.50.0.patch | 23 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
new file mode 100644
index 0000000..4a947d0
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-curl-7.50.0.patch
@@ -0,0 +1,23 @@
+From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 25 Jul 2016 12:08:35 +0100
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
+
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
+
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index be68d9a..315ccb7 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
+
+
+ CURL* FTPLoaderThread::handle() {
+- CURL* ret = osl_getThreadKeyData(m_threadKey);
++ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
+ if(!ret) {
+ ret = curl_easy_init();
+ if (ret != nullptr) {
+--
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 52653526..c0c2792 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -244,6 +244,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
PATCHES=(
# from 5.2 branch
"${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
+ "${FILESDIR}/${PN}-curl-7.50.0.patch"
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2016-03-19 21:39 Andreas Hüttel
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Hüttel @ 2016-03-19 21:39 UTC (permalink / raw
To: gentoo-commits
commit: ed39d0ca74f2e1bea693ca75a9cc78218864efbc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 13:22:42 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 21:39:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed39d0ca
app-office/libreoffice: Fix USE="gtk3 -gtk", restore keywords
Package-Manager: portage-2.2.27
.../files/libreoffice-5.1.1.3-gtk3.patch | 30 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-5.1.1.3.ebuild | 6 +++--
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
new file mode 100644
index 0000000..539ef7e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
@@ -0,0 +1,30 @@
+From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 7 Mar 2016 13:19:55 +0000
+Subject: gtktiledviewer needs gtk3 not gtk2
+
+Change-Id: Iede2008139cb570ff65202762e92f6694548a065
+
+diff --git a/Repository.mk b/Repository.mk
+index e9cd89a..423d58b 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
+ svptest \
+ svpclient \
+ pixelctl ) \
+- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
+ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
+ outdevgrind) \
+ vcldemo \
+ tiledrendering \
+ mtfdemo \
+- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
+ ))
+
+ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
+--
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
index 903ff34..56ec419 100644
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@@ -96,8 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -259,6 +258,9 @@ PATCHES=(
# submitted upstream
"${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+ # taken from 5.1 branch
+ "${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
@ 2015-11-28 0:13 Andreas Hüttel
0 siblings, 0 replies; 49+ messages in thread
From: Andreas Hüttel @ 2015-11-28 0:13 UTC (permalink / raw
To: gentoo-commits
commit: bc39edf16bae36a38856a164a2aac92fc80f579a
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 00:11:47 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 00:11:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc39edf1
app-office/libreoffice: Remove old
Package-Manager: portage-2.2.25
app-office/libreoffice/Manifest | 4 -
...breoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch | 80 ---
...ibreoffice-4.4.1.2-improve-KDE4FilePicker.patch | 192 -------
app-office/libreoffice/libreoffice-4.4.5.2.ebuild | 618 ---------------------
app-office/libreoffice/libreoffice-5.0.2.2.ebuild | 607 --------------------
5 files changed, 1501 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cf5d401..6b7786a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,12 +6,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
-DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
-DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
deleted file mode 100644
index 0f39688..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Sat, 14 Feb 2015 00:17:06 +0100
-Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
-
-A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
-fails because of these undefined symbols:
-
-> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
- \\bWindowListenerMultiplexer::acquire
- U non-virtual thunk to WindowListenerMultiplexer::acquire()
-
-They should probably be generated inline. Work around by out-lining the
-definition of the methods.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
-
-Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
-(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
-Reviewed-on: https://gerrit.libreoffice.org/14509
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-
-diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
-index e048e75..b212dff 100644
---- a/include/toolkit/helper/macros.hxx
-+++ b/include/toolkit/helper/macros.hxx
-@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
- : ListenerMultiplexerBase( rSource ) \
- { \
- } \
-+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
-+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
- ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
- { \
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
-diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
-index 797fad2..b109c5f 100644
---- a/toolkit/source/helper/listenermultiplexer.cxx
-+++ b/toolkit/source/helper/listenermultiplexer.cxx
-@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
- {
- }
-
-+void SAL_CALL EventListenerMultiplexer::acquire() throw ()
-+{
-+ return ListenerMultiplexerBase::acquire();
-+}
-+void SAL_CALL EventListenerMultiplexer::release() throw ()
-+{
-+ return ListenerMultiplexerBase::release();
-+}
-+
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
- {
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
deleted file mode 100644
index 61e036e..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
-
- #include "generic/geninst.h"
-
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
-
- KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
- : KDE4FilePicker_Base(_helperMutex)
-- , _resMgr( ResMgr::CreateResMgr("fps_office") )
- , allowRemoteUrls( false )
- {
- _extraControls = new QWidget();
-@@ -128,8 +129,7 @@
- #endif
-
- setMultiSelectionMode( false );
-- //default mode
-- _dialog->setOperationMode(KFileDialog::Opening);
-+ _dialog->setConfirmOverwrite( true );
-
- // XExecutableDialog functions
- connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +202,6 @@
- SalYieldMutexReleaser aReleaser;
- return Q_EMIT cleanupProxySignal();
- }
-- delete _resMgr;
- delete _dialog;
- }
-
-@@ -524,6 +523,24 @@
- return toOUString(label);
- }
-
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+ QString aResString;
-+
-+ if( aRedId < 0 )
-+ return aResString;
-+
-+ try
-+ {
-+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+ }
-+ catch(...)
-+ {
-+ }
-+
-+ return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
- QWidget* widget = 0;
-@@ -532,37 +549,37 @@
- switch (controlId)
- {
- case CHECKBOX_AUTOEXTENSION:
-- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+ resId = STR_FPICKER_AUTO_EXTENSION;
- break;
- case CHECKBOX_PASSWORD:
-- resId = STR_SVT_FILEPICKER_PASSWORD;
-+ resId = STR_FPICKER_PASSWORD;
- break;
- case CHECKBOX_FILTEROPTIONS:
-- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+ resId = STR_FPICKER_FILTER_OPTIONS;
- break;
- case CHECKBOX_READONLY:
-- resId = STR_SVT_FILEPICKER_READONLY;
-+ resId = STR_FPICKER_READONLY;
- break;
- case CHECKBOX_LINK:
-- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+ resId = STR_FPICKER_INSERT_AS_LINK;
- break;
- case CHECKBOX_PREVIEW:
-- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+ resId = STR_FPICKER_SHOW_PREVIEW;
- break;
- case CHECKBOX_SELECTION:
-- resId = STR_SVT_FILEPICKER_SELECTION;
-+ resId = STR_FPICKER_SELECTION;
- break;
- case PUSHBUTTON_PLAY:
-- resId = STR_SVT_FILEPICKER_PLAY;
-+ resId = STR_FPICKER_PLAY;
- break;
- case LISTBOX_VERSION:
-- resId = STR_SVT_FILEPICKER_VERSION;
-+ resId = STR_FPICKER_VERSION;
- break;
- case LISTBOX_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_TEMPLATES;
-+ resId = STR_FPICKER_TEMPLATES;
- break;
- case LISTBOX_IMAGE_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+ resId = STR_FPICKER_IMAGE_TEMPLATE;
- break;
- case LISTBOX_VERSION_LABEL:
- case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +598,7 @@
- case CHECKBOX_PREVIEW:
- case CHECKBOX_SELECTION:
- {
-- QString label;
--
-- if (_resMgr && resId != -1)
-- {
-- OUString s(ResId(resId, *_resMgr).toString());
-- label = toQString(s);
-- label.replace("~", "&");
-- }
--
-- widget = new QCheckBox(label, _extraControls);
-+ widget = new QCheckBox(getResString(resId), _extraControls);
-
- // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
- // code, but the checkbox is hidden and ignored
-@@ -719,8 +727,22 @@
- 1 );
- }
-
-- _dialog->setOperationMode(operationMode);
-- _dialog->setConfirmOverwrite(true);
-+ _dialog->setOperationMode( operationMode );
-+
-+ sal_Int16 resId = -1;
-+ switch (_dialog->operationMode())
-+ {
-+ case KFileDialog::Opening:
-+ resId = STR_FPICKER_OPEN;
-+ break;
-+ case KFileDialog::Saving:
-+ resId = STR_FPICKER_SAVE;
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ _dialog->setCaption(getResString(resId));
- }
-
- void SAL_CALL KDE4FilePicker::cancel()
-only in patch2:
-unchanged:
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@ class KFileDialog;
- class QWidget;
- class QLayout;
-
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- < ::com::sun::star::ui::dialogs::XFilePicker2
- , ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@ protected:
-
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
-
-- ResMgr *_resMgr;
--
- //the dialog to display
- KFileDialog* _dialog;
-
-@@ -225,6 +221,8 @@ private:
- //add a custom control widget to the file dialog
- void addCustomControl(sal_Int16 controlId);
-
-+ QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
- void cleanupProxy();
- void checkProtocol();
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
deleted file mode 100644
index 24f0563..0000000
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- 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+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.4
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.3*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.11.2:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from 5.0 branch
- "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
- "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
- "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
- "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
- "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
- "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
-
- # from master branch
- "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # 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
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --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
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --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
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --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-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- 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}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
deleted file mode 100644
index beabdc7..0000000
--- a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
+++ /dev/null
@@ -1,607 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- 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+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # 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
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --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
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --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
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --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-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-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
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- 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}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 49+ messages in thread
end of thread, other threads:[~2024-11-14 21:29 UTC | newest]
Thread overview: 49+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-13 21:25 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-14 21:29 Andreas Sturmlechner
2024-06-29 16:32 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-02-20 20:49 Andreas Sturmlechner
2024-02-14 19:55 Andreas Sturmlechner
2024-01-27 0:48 Andreas Sturmlechner
2024-01-07 9:29 Andreas Sturmlechner
2023-12-07 18:50 Andreas Sturmlechner
2023-11-21 22:36 Andreas Sturmlechner
2023-06-10 9:39 Andreas Sturmlechner
2023-02-01 13:22 Andreas Sturmlechner
2022-09-02 4:38 Sam James
2022-05-13 22:51 Conrad Kostecki
2022-05-08 21:57 Sam James
2022-02-18 20:09 Andreas K. Hüttel
2021-09-14 13:39 Andreas Sturmlechner
2021-09-13 5:19 Andreas Sturmlechner
2021-05-21 14:28 Andreas Sturmlechner
2021-03-12 21:12 Andreas Sturmlechner
2020-12-17 13:31 Andreas Sturmlechner
2020-08-07 23:24 Andreas Sturmlechner
2020-05-14 20:10 Andreas Sturmlechner
2019-12-26 8:36 Andreas Sturmlechner
2019-10-29 17:39 Andreas Sturmlechner
2019-10-29 17:39 Andreas Sturmlechner
2019-04-03 12:02 Andreas Sturmlechner
2019-02-14 18:36 Andreas Sturmlechner
2019-01-16 8:17 Andreas Sturmlechner
2019-01-09 10:00 Andreas Sturmlechner
2019-01-09 10:00 Andreas Sturmlechner
2018-11-22 21:48 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-06-10 9:19 Andreas Sturmlechner
2018-05-29 14:59 Andreas Sturmlechner
2018-02-10 9:43 Andreas Sturmlechner
2018-02-09 23:14 Andreas Sturmlechner
2018-02-04 18:58 Andreas Sturmlechner
2018-01-07 16:02 Andreas Sturmlechner
2018-01-05 0:35 Andreas Sturmlechner
2017-06-25 21:54 Andreas Sturmlechner
2017-02-12 0:13 Andreas Sturmlechner
2016-11-29 19:55 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-07-26 7:39 Lars Wendler
2016-03-19 21:39 Andreas Hüttel
2015-11-28 0:13 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox