diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-05-07 23:34:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 23:34:04 +0200 |
| commit | 2fb1b3156fdb012ef015dc0aed5f00d3d07a4528 (patch) | |
| tree | 4f4c82cc3c572a6e7c5fd854c6bf92743c001d51 /pkgs/applications/office/libreoffice | |
| parent | 24b26eede445256b58edceb02f8e26d578f49866 (diff) | |
| parent | 9cb260d091f5a474ee70ddccc6b8ecad825a78dc (diff) | |
| download | nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.gz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.bz2 nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.lz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.xz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.zst nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.zip | |
Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
Diffstat (limited to 'pkgs/applications/office/libreoffice')
| -rw-r--r-- | pkgs/applications/office/libreoffice/xdg-open.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/applications/office/libreoffice/xdg-open.patch b/pkgs/applications/office/libreoffice/xdg-open.patch deleted file mode 100644 index 3ff7e5d80f7..00000000000 --- a/pkgs/applications/office/libreoffice/xdg-open.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 |