diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /app-office/libreoffice/libreoffice-6.2.9999.ebuild | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'app-office/libreoffice/libreoffice-6.2.9999.ebuild')
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.2.9999.ebuild | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index caf354cdab3b..0fa4dccc4d59 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -18,10 +18,10 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -PATCHSET="${PN}-6.2.1.1-patchset-01.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 pax-utils python-single-r1 qmake-utils toolchain-funcs xdg +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" @@ -247,9 +247,7 @@ fi PATCHES=( # master branch "${FILESDIR}/${PN}-6.2-ldap-optional.patch" - "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch - "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch + # "${WORKDIR}"/${PATCHSET/.tar.xz/} # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" @@ -428,8 +426,8 @@ src_configure() { --with-x --without-fonts --without-myspell-dicts - --without-help - --with-helppack-integration + --with-help="html" + --without-helppack-integration --with-system-gpgmepp --without-system-sane $(use_enable bluetooth sdremote-bluetooth) @@ -506,24 +504,6 @@ src_compile() { 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" @@ -557,15 +537,6 @@ src_install() { 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() { |