From 7a2531cd1d07d7d5d6fe623f6fdb36146a73f035 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 24 Jun 2024 03:22:39 +0200 Subject: [PATCH 1/2] ui/Makefile.mk: use mogrify to create anklang.png and favicon.ico Signed-off-by: Tim Janik --- ui/Makefile.mk | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ui/Makefile.mk b/ui/Makefile.mk index da1d1ac5..c46059d6 100644 --- a/ui/Makefile.mk +++ b/ui/Makefile.mk @@ -277,15 +277,19 @@ $>/ui/markdown-it.mjs: node_modules/.npm.done | $>/ui/ && rm -f $@.js $>/.ui-build-stamp: $>/ui/markdown-it.mjs +# == $>/ui/anklang.png == +$>/ui/anklang.png: ui/assets/favicon.svg ui/Makefile.mk | $>/ui/ + $(QGEN) + $Q mkdir -p $>/ui-tmpanklpng/ + $Q mogrify -density 600 -background transparent -resize 128x128 -format png -path $>/ui-tmpanklpng/ $< + $Q mv $>/ui-tmpanklpng/favicon.png $@.tmp && rm -r $>/ui-tmpanklpng/ && mv $@.tmp $@ +$>/.ui-build-stamp: $>/ui/anklang.png + # == $>/ui/favicon.ico == -$>/ui/favicon.ico: ui/assets/favicon.svg node_modules/.npm.done ui/Makefile.mk | $>/ui/ +$>/ui/favicon.ico: $>/ui/anklang.png $(QGEN) - $Q mkdir -p $>/ui/tmp-icongen/ - $Q node_modules/.bin/icon-gen -i $< -o $>/ui/tmp-icongen/ --favicon --favicon-png-sizes 128 --favicon-ico-sizes 128 # -r - $Q cd $>/ui/tmp-icongen/ && mv favicon-128.png ../anklang.png && mv favicon.ico ../favicon.ico.tmp - $Q rm -r $>/ui/tmp-icongen/ && mv $@.tmp $@ -$>/ui/anklang.png: $>/ui/favicon.ico -$>/.ui-build-stamp: $>/ui/favicon.ico $>/ui/anklang.png + $Q ln -s $(/.ui-build-stamp: $>/ui/favicon.ico # == eslint == x11test.js ::= $(wildcard x11test/*.*js) From bda875f4d60f06a11d1a94a0ab48a06ce5cf80a4 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 24 Jun 2024 03:23:03 +0200 Subject: [PATCH 2/2] package.json: remove icon-gen Signed-off-by: Tim Janik --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index ec4a6f14..e1b17af4 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "eslint-plugin-vue": "^9.25.0", "fork-awesome": "^1.2.0", "globals": "^15.3.0", - "icon-gen": "^4.0.0", "jsdoc": "^4.0.3", "jsdoc-api": "^8.0.0", "jsdoc-tsimport-plugin": "^1.0.5",