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

[Christian Lohmaier (via logerrit)]

 sysui/desktop/share/create_tree.sh |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 56068a50e35c4700ff8215648ea12934bb7d53ba
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sun Jul 26 19:03:14 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sun Jul 26 19:03:52 2020 +0200

    Revert "tdf#132787: Don't duplicate hicolor icon theme as gnome"
    
    This reverts commit 61959578de5e9a1c536517bcccc1da0fe6c7159c.
    
    Reason for revert: pushing a breaking build to master branch is one thing, adding it to a release branch where UI freeze is active is a different story
    
    Change-Id: Ie4c781ae877070f113817c728e3b54f26af5ffc2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99399
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 28467357dee1..36dc4ff7a0e6 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -32,6 +32,16 @@ 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"