summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-06-23 12:32:28 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-06-23 14:30:40 +0000
commit41d1bd782ccb888fdfe2566ad7513bdaccba689d (patch)
treecc5a21109d38a16e3b08b7fdb8f14853fdbabf35
parent9a809eedf7327f925cd6be56545b8ed300ef28f4 (diff)
tdf#90790: Don't take galaxy as a reference icon set, it may be incomplete.
Some icons in galaxy are available only via a fallback, while the other themes can implement these icons directly; but they did not end up in the images_*.zip. Change-Id: Ifc937ebec7a1e38828672e65706150f50abe8703 Reviewed-on: https://gerrit.libreoffice.org/16426 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--postprocess/CustomTarget_images.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index aba5afc591e1..de2c21d1f3dd 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -55,8 +55,9 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/commandimagelist.ilst :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
- find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
- sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
+ find $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \
+ grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | sort | uniq | \
+ sed "s#^#%MODULE%#" | \
LC_ALL=C sort > $@.tmp && \
$(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.tmp $@ \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))