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 | 20 |
1 files changed, 9 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 85241e2dcbac..811d8eab5a26 100644 --- a/editors/libreoffice/files/patch-bin_distro-install-desktop-integration +++ b/editors/libreoffice/files/patch-bin_distro-install-desktop-integration @@ -1,6 +1,6 @@ ---- bin/distro-install-desktop-integration.orig 2019-01-24 03:35:25.000000000 +0800 -+++ bin/distro-install-desktop-integration 2019-02-03 18:17:18.645630000 +0800 -@@ -98,7 +98,7 @@ +--- bin/distro-install-desktop-integration.orig 2020-11-22 14:05:28 UTC ++++ bin/distro-install-desktop-integration +@@ -98,7 +98,7 @@ cp -a workdir/CustomTarget/sysui/share/libreoffice/* " cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" cd $sysui_temp # we want non-versioned stuff in the distro packages @@ -9,7 +9,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -108,13 +108,13 @@ +@@ -108,11 +108,11 @@ sed -i \ export OFFICE_PREFIX=$LIBDIR export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME @@ -18,14 +18,12 @@ export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export PREFIXDIR=${PREFIXDIR} - export GNOMEDIR=$PREFIXDIR - export GNOME_MIME_THEME=hicolor - export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata + export APPDATA_SOURCE_DIR="${SRCDIR}"/sysui/desktop/appstream-appdata bash ./create_tree.sh ) cd - -@@ -129,7 +129,7 @@ +@@ -127,7 +127,7 @@ fi # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -34,16 +32,16 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -143,7 +143,7 @@ - $PREFIXDIR/share/mime/packages \ - $PREFIXDIR/share/mime-info \ +@@ -139,7 +139,7 @@ cd - + if test -f $DESTDIR/gid_Module_Root_Brand ; then + for dir in $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/icons ; do - find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand + find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand done fi -@@ -171,16 +171,16 @@ +@@ -167,16 +167,16 @@ test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples # you cannot include this link directly into the package # For example, the Novell package mark this symlink as %ghost # and update it in %post and %postun |