diff options
Diffstat (limited to 'app-office/libreoffice/libreoffice-6.0.9999.ebuild')
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.0.9999.ebuild | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 90f72941a9bd..4ef05313f50d 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -17,7 +17,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.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} @@ -26,7 +26,7 @@ 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}" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs # Core MUST be first! @@ -157,17 +157,23 @@ COMMON_DEPEND="${PYTHON_DEPS} 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] ) - kde? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs - ) " RDEPEND="${COMMON_DEPEND} @@ -230,6 +236,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -244,6 +251,9 @@ 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 + + # gtk3-kde5 vcl plugin backported from master + "${WORKDIR}"/${PATCHSET/.tar.xz/} ) pkg_pretend() { @@ -284,13 +294,9 @@ pkg_setup() { } src_unpack() { - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" + default - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - unpack "${PN}-help-${PV}.tar.xz" - else + if [[ ${PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" @@ -305,7 +311,6 @@ src_unpack() { } src_prepare() { - [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" default AT_M4DIR="m4" eautoreconf @@ -360,9 +365,9 @@ src_configure() { export PYTHON_LIBS=$(python_get_LIBS) if use kde; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" + 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 @@ -398,7 +403,6 @@ src_configure() { --disable-gstreamer-0-10 --disable-online-update --disable-pdfium - --disable-qt5 --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") --with-build-version="Gentoo official package" @@ -421,18 +425,19 @@ src_configure() { $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) - $(use_enable debug) $(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 kde kde4) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) |