diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-03-04 16:31:45 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-03-04 16:31:45 +0100 |
| commit | 590e24d4593be6be94e810b2f4bdc293bb1c7717 (patch) | |
| tree | a4bf03af3ad610c5abef6bf5234691f8b7e1c24e | |
| parent | 2ea2f10ec082a0dd9e05e07c87e71c8d6a191b55 (diff) | |
regenerated piece-packimages.diff to apply with all patch versions
some patch versions do not like if the context is not 3 lines
| -rw-r--r-- | patches/dev300/piece-packimages.diff | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff index 2026bd0c5..383a5ba2d 100644 --- a/patches/dev300/piece-packimages.diff +++ b/patches/dev300/piece-packimages.diff @@ -1,6 +1,6 @@ ---- packimages/pack/makefile.mk -+++ packimages/pack/makefile.mk -@@ -38,18 +38,19 @@ +--- packimages/pack/makefile.mk.old 2010-11-11 16:35:27.000000000 +0100 ++++ packimages/pack/makefile.mk 2011-02-18 19:17:04.000000000 +0100 +@@ -34,18 +34,19 @@ TARGET=packimages RSCCUSTOMIMG*=$(PRJ) .INCLUDE: target.mk @@ -25,15 +25,16 @@ ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip -@@ -62,13 +63,13 @@ - @@-$(MKDIR) $(RES)$/img +@@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst + $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) + @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) -- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) +- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) + $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) - $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ + $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst -- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ +- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ images_% : $(RES)$/img$/commandimagelist.ilst @@ -42,11 +43,11 @@ # make sure to have one to keep packing happy $(COMMONBIN)$/images_brand.zip: -@@ -80,7 +81,7 @@ +@@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip: # generate the HiContrast icon set $(MISC)$/hicontrast.flag .PHONY : -- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ +- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ + $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ # unpack the Crystal icon set |