VesperOS/desktop-base
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing Debian icons in last upload

Browse Source
This commit is contained in:
Aurélien COUDERC
2019-02-08 15:09:43 +01:00
parent afb02929f8
commit 0b9024cb41
1 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emblems-debian/Makefile
+8 -30
View File
@@ -17,8 +17,8 @@ RESOLUTIONS_LEGACY := 16 22 32 36 48 64 128 256
$(info Legacy Resolutions: '$(RESOLUTIONS_LEGACY)')
# The build: target should depend on all PNGs to generate
$(info $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png)))
build: $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(SVG)-$(RES)x$(RES).png))
$(info $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS_LEGACY),$(SVG)-$(RES)x$(RES).png)))
build: $(foreach SVG,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS_LEGACY),$(SVG)-$(RES)x$(RES).png))
# Dynamically add rules for PNG generation for each resolution, for each emblem file
define SVG_TO_PNG_RULE
@@ -26,7 +26,7 @@ $1-$2x$2.png: $1.svg
rsvg-convert $$< -w $2 -h $2 -o $$@.raw
optipng $$@.raw -out $$@
endef
$(foreach EMBLEM,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS),$(eval $(call SVG_TO_PNG_RULE,$(EMBLEM),$(RES)))))
$(foreach EMBLEM,$(EMBLEMS),$(foreach RES,$(RESOLUTIONS_LEGACY),$(eval $(call SVG_TO_PNG_RULE,$(EMBLEM),$(RES)))))
clean:
rm -f *.png.raw
@@ -40,24 +40,7 @@ install:
install -d $${RES_DIR} ; \
done
install -d $(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems
# Iterate over resolutions.
# For each resolution, install PNG emblems in the emblems folder for their
# resolution.
# TODO remove installing to _legacy early in bullseye cycle
for CURRENT_DIR in $(TARGET_DIR) $(TARGET_DIR_LEGACY) ; do \
install -d $(DESTDIR)/$${CURRENT_DIR} ; \
for RES in $(RESOLUTIONS) ; do \
RES_DIR=$(DESTDIR)/$${CURRENT_DIR}/$${RES}x$${RES} ; \
install -d $${RES_DIR} ; \
for EMBLEM in $(EMBLEMS) ; do \
EMBLEMS_DIR=$${RES_DIR}/emblems ; \
install -d $${EMBLEMS_DIR} ; \
PNG_SOURCE=$${EMBLEM}-$${RES}x$${RES}.png ; \
$(INSTALL_DATA) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \
done ; \
done ; \
done
# TODO remove installing to _legacy early in bullseye cycle
# Install PNG icons for each resolution
for RES in $(RESOLUTIONS) ; do \
EMBLEMS_DIR=$(DESTDIR)/$(TARGET_DIR)/$${RES}x$${RES}/emblems ; \
install -d $${EMBLEMS_DIR} ; \
@@ -66,23 +49,17 @@ install:
$(INSTALL_DATA) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \
done ; \
done
# TODO remove installing to _legacy early in bullseye cycle
for RES in $(RESOLUTIONS_LEGACY) ; do \
EMBLEMS_DIR=$(DESTDIR)/$(TARGET_DIR_LEGACY)/$${RES}x$${RES}/emblems ; \
install -d $${EMBLEMS_DIR} ; \
for EMBLEM in $(EMBLEMS) ; do \
PNG_SOURCE=$${EMBLEM}-$${RES}x$${RES}.png ; \
$(INSTALL_DATA) $${PNG_SOURCE} $${EMBLEMS_DIR}/$${EMBLEM}.png ; \
$(INSTALL_DATA) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
done ; \
done
# Install SVG emblems in the scalable emblems dir.
for CURRENT_SCAL_DIR in $(TARGET_DIR_SCALABLE) $(TARGET_DIR_SCALABLE_LEGACY) ; do \
install -d $(DESTDIR)/$${CURRENT_SCAL_DIR} ; \
for EMBLEM in $(EMBLEMS) ; do \
EMBLEMS_DIR=$(DESTDIR)/$${CURRENT_SCAL_DIR} ; \
install -d $${EMBLEMS_DIR} ; \
$(INSTALL_DATA) $${EMBLEM}.svg $${EMBLEMS_DIR}/ ; \
done ; \
done
# Install SVG emblems in the scalable emblems dir
for EMBLEM in $(EMBLEMS) ; do \
EMBLEMS_DIR=$(DESTDIR)/$(TARGET_DIR_SCALABLE) ; \
install -d $${EMBLEMS_DIR} ; \
@@ -91,6 +68,7 @@ install:
for EMBLEM in $(EMBLEMS) ; do \
EMBLEMS_DIR=$(DESTDIR)/$(TARGET_DIR_SCALABLE_LEGACY) ; \
install -d $${EMBLEMS_DIR} ; \
$(INSTALL_DATA) $${EMBLEM}.svg $${EMBLEMS_DIR}/ ; \
$(INSTALL_DATA) $${EMBLEM}.icon $${EMBLEMS_DIR}/ ; \
done