commit: 214fb6b50b013531dc3a255492726d5e0cc3bcda Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 28 16:05:24 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 30 09:58:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214fb6b5
app-office/libreoffice: Drop offlinehelp hacks, use --with-help=html Thanks-to: V. Reher <vreher <AT> cox.net> Bug: https://bugs.gentoo.org/671478 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/libreoffice/libreoffice-6.2.9999.ebuild | 28 ++-------------------- app-office/libreoffice/libreoffice-9999.ebuild | 28 ++-------------------- 2 files changed, 4 insertions(+), 52 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild index caf354cdab3..79a08e6a2d5 100644 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild @@ -428,8 +428,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 +506,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" @@ -558,12 +540,6 @@ src_install() { 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 } diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 33af7c8cd64..c891354e8c0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -424,8 +424,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) @@ -502,24 +502,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" @@ -554,12 +536,6 @@ src_install() { 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 }
