[openoffice] branch trunk updated: Fallback icons to Galaxy instead of Industrial

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 97289b2  Fallback icons to Galaxy instead of Industrial
97289b2 is described below

commit 97289b2620590d8b431bcc408f87252db6203818
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Feb 8 16:11:47 2022 +0100

    Fallback icons to Galaxy instead of Industrial
---
 main/packimages/pack/makefile.mk | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/main/packimages/pack/makefile.mk b/main/packimages/pack/makefile.mk
index ca0627b..860e4b8 100644
--- a/main/packimages/pack/makefile.mk
+++ b/main/packimages/pack/makefile.mk
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,24 +7,25 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 
+
 PRJ=..
 PRJNAME=packimages
 TARGET=packimages
 
-.INCLUDE:  settings.mk
+.INCLUDE: settings.mk
 # point to an existing directory as default that poses no threat
 # to a "find" that looks for "*.png"
 RSCCUSTOMIMG*=$(PRJ)
@@ -41,10 +42,10 @@ VERBOSESWITCH=
 
 IMAGES := $(COMMONBIN)$/images.zip
 SORTED_LIST=$(RES)$/img$/sorted.lst
-# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
+# Custom sets, at 24x24 & 16x16 fall-back to Galaxy preferentially
 CUSTOM_IMAGE_SETS=hicontrast industrial classic
 CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
+CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/default_images$/
 
 CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
 
@@ -79,14 +80,14 @@ $(MISC)$/hicontrast.flag .PHONY :
 # unpack the classic icon set
 $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
 .IF "$(GUI)"=="OS2"
-    cd $(MISC) && tar zxf $(CLASSIC_TARBALL) && $(TOUCH) $(@:f)
+	cd $(MISC) && tar zxf $(CLASSIC_TARBALL) && $(TOUCH) $(@:f)
 .ELSE
-    cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
+	cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
 .ENDIF
 .IF "$(GUI)"=="UNX"
 	chmod -R g+w $(MISC)$/classic
 .ENDIF
-    @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
+	@$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
 
 # dependencies
 images_hicontrast : $(MISC)$/hicontrast.flag $(RES)$/img$/commandimagelist.ilst