[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sysui/desktop

Chris Mayo (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 24 12:46:39 UTC 2020


 sysui/desktop/share/create_tree.sh |   10 ----------
 1 file changed, 10 deletions(-)

New commits:
commit 61959578de5e9a1c536517bcccc1da0fe6c7159c
Author:     Chris Mayo <aklhfex at gmail.com>
AuthorDate: Fri May 8 10:35:51 2020 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jul 24 14:46:06 2020 +0200

    tdf#132787: Don't duplicate hicolor icon theme as gnome
    
    GNOME will use the hicolor theme.
    
    Change-Id: I3a163fd9b43457063167701c2964a457aac85cb6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93712
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    (cherry picked from commit a26a5bb71c32c1cf8c5ad4d2ef79f3ece5065a02)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99307

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 36dc4ff7a0e6..28467357dee1 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -32,16 +32,6 @@ if [ "${KDEMAINDIR}" ]; then
 fi
 
 if [ "${GNOMEDIR}" ]; then
-  for i in `cd "${ICON_SOURCE_DIR}/hicolor"; find ??x?? ???x??? scalable -name "*.png" -o -name "*.svg"`
-  do
-    targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname ${i}`
-    mkdir -p "${targetdir}"
-    destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename ${i}`
-    cp "${ICON_SOURCE_DIR}/hicolor/${i}" "${destfile}"
-    chmod 0644 "${destfile}"
-  done
-  unset targetdir destfile
-
   mkdir -p "${DESTDIR}/${GNOMEDIR}/share/mime-info"
   cp openoffice.mime "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime"
   cp openoffice.keys "${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys"


More information about the Libreoffice-commits mailing list