[Libreoffice-commits] core.git: sysui/desktop

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 7bc59ed5fd2b0ec128235bb43109f7495c482ec1
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sun Jul 26 19:00:46 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sun Jul 26 19:02:05 2020 +0200

    Revert "tdf#132787: Don't duplicate hicolor icon theme as gnome"
    
    This reverts commit a26a5bb71c32c1cf8c5ad4d2ef79f3ece5065a02.
    
    Reason for revert: apparently compilation with installation sets wasn't tested at all/the change is incomplete and breaks because of missing files.
    
    Change-Id: Ied6973659bd0c25f613d615a4cae699b04ae2a43
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99398
    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"