diff options
Diffstat (limited to 'editors/libreoffice/files/patch-bin__distro-install-desktop-integration')
| -rw-r--r-- | editors/libreoffice/files/patch-bin__distro-install-desktop-integration | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration index 3023e34ce5f3..9d2f21886c02 100644 --- a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration +++ b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration @@ -1,5 +1,5 @@ ---- bin/distro-install-desktop-integration.orig 2014-04-30 15:49:45.000000000 -0400 -+++ bin/distro-install-desktop-integration 2014-06-13 13:33:37.000000000 -0400 +--- bin/distro-install-desktop-integration.orig 2014-09-16 16:10:41.000000000 -0400 ++++ bin/distro-install-desktop-integration 2014-10-08 17:00:29.000000000 -0400 @@ -94,13 +94,13 @@ } @@ -16,7 +16,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -111,11 +111,13 @@ +@@ -111,9 +111,11 @@ export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons @@ -26,12 +26,9 @@ export GNOMEDIR=$PREFIXDIR + export PREFIXDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor -- /bin/bash ./create_tree.sh -+ bash ./create_tree.sh + bash ./create_tree.sh ) - cd - - rm -rf $sysui_temp -@@ -131,7 +133,7 @@ +@@ -129,7 +131,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -40,7 +37,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -146,7 +148,7 @@ +@@ -144,7 +146,7 @@ $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do @@ -49,7 +46,7 @@ done fi -@@ -178,12 +180,12 @@ +@@ -176,12 +178,12 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion @@ -59,7 +56,7 @@ +mkdir -p $DESTDIR$PREFIXDIR/etc/bash_completion.d +./bin/generate-bash-completion bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh +test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand - if test "$WITH_COMPAT_OOWRAPPERS" = "YES" ; then + if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then - ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR/etc/bash_completion.d/ooffice.sh - test -f $DESTDIR/gid_Module_Root_Brand && echo "/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand + ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in $DESTDIR$PREFIXDIR/etc/bash_completion.d/ooffice.sh |