app-office/libreoffice: Drop offlinehelp hacks, use --with-help=html

Thanks-to: V. Reher <vreher@cox.net>
Bug: https://bugs.gentoo.org/671478
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index caf354cdab3ba343048b931de28ffd0aa7de5394..79a08e6a2d582e1d25182d2a2dbf06821a654f38 100644 (file)
--- 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 33af7c8cd646af4e5a4650e056a529e6eaf74b1d..c891354e8c0f8bdd580a49110e3a7956b075e326 100644 (file)
--- 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
 }