Attachment 134083 Details for Bug 108591 – patch that makes LibreOffice look for xdg-open in the path

[patch] patch that makes LibreOffice look for xdg-open in the path

xdg-open.patch (text/plain), 1.11 KB, created by lvernschrock on 2017-06-17 16:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lvernschrock

Created: 2017-06-17 16:21:38 UTC

Size: 1.11 KB

patch

obsolete

>diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
>--- a/shell/source/unix/exec/shellexec.cxx
>+++ b/shell/source/unix/exec/shellexec.cxx
>@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
>         if (std::getenv("LIBO_FLATPAK") != nullptr) {
>             aBuffer.append("/app/bin/xdg-open");
>         } else {
>-            aBuffer.append("/usr/bin/xdg-open");
>+            aBuffer.append("xdg-open");
>         }
> #endif
>         aBuffer.append(" ");
>diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
>index 4519e01f26e2..8985711a2c01 100755
>--- a/shell/source/unix/misc/senddoc.sh
>+++ b/shell/source/unix/misc/senddoc.sh
>@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
>             MAILER=/usr/bin/kde-open
>         elif [ -x /usr/bin/xdg-open ] ; then
>             MAILER=/usr/bin/xdg-open
>+        elif type -p xdg-open >/dev/null 2>&1 ; then
>+            MAILER="$(type -p xdg-open)"
>         else
>             echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
>             exit 2

Actions: View

Attachments on bug 108591: 134083