flatpak/build.sh | 23 ----------------------- 1 file changed, 23 deletions(-)
New commits: commit f2a84891650b250871b3dcde25b76d5f0e233ada Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Jul 3 18:20:07 2017 +0200 No more need for /app/bin/xdg-open See core commit da5356b099c2504b3e9238f1afce410233847f9d "Revert 'Workaround to call /app/bin/xdg-open when run under flatpak'". diff --git a/flatpak/build.sh b/flatpak/build.sh index f1687d2..5ff7b44 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -70,29 +70,6 @@ flatpak build --build-dir="${my_dir?}"/build --share=network "${my_dir?}"/app \ # 3 Assemble the app files and metadata: cp -r "${my_dir?}"/inst/lib/libreoffice "${my_dir?}"/app/files/ -## Per "man gdbus" and <https://developer.gnome.org/glib/stable/ -## gvariant-text.html#gvariant-text-strings> (cf. -## <https://bugzilla.gnome.org/show_bug.cgi?id=768555#c1>, comment 1 to "'man -## gdbus': unclear what 'serialized GVariant' means for args to 'gdbus call'"), -## the argument to the below xdg-open must be UTF-8 encoded, must not have "..." -## or '...' as its outermost characters (as those should be interpreted by gdbus -## as---unnecessary---quoting), and must not contain backslashes (as those would -## need to be quoted as "\\"); for the first requirement, LO's -## ShellExec::execute (shell/source/unix/exec/shellexec.cxx) encodes the -## argument with osl_getThreadTextEncoding(), which these days hopefully is -## always UTF-8 on Linux (and, hoping that the argument is a valid URI, it -## should not contain any non-ASCII characters); for the latter two -## requirements, hope that the argument is a valid absolute URI, and so should -## not contain any double quotes or backslashes, nor should it contain single -## quotes as its first and last character (where the first character needs to be -## part of the URI scheme): -mkdir "${my_dir?}"/app/files/bin -cat <<\EOF > "${my_dir?}"/app/files/bin/xdg-open -gdbus call --session --dest org.freedesktop.portal.Desktop \ - --object-path /org/freedesktop/portal/desktop \ - --method org.freedesktop.portal.OpenURI.OpenURI -- '' "$1" {} -EOF -chmod +x "${my_dir?}"/app/files/bin/xdg-open ## libreoffice-startcenter.desktop -> org.libreoffice.LibreOffice.desktop, ## combining all libreoffice-*.desktop MimeType= lines: mkdir "${my_dir?}"/app/files/share _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits