jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_gui: Fix build with Inkscape 1.0

Browse source 
Inkscape 1.0 revamped their CLI flags, breaking the icon build.

https://wiki.inkscape.org/wiki/index.php?title=Using_the_Command_Line#Background

Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar 2020-05-07 00:29:53 +02:00 committed by Jouni Malinen
parent 3e1a130107
commit 0388992905
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wpa_supplicant/wpa_gui-qt4/icons/Makefile
View file

@ -5,14 +5,28 @@ SIZES := 16x16 22x22 32x32 48x48 64x64 128x128
ICONS := $(addsuffix .png, $(foreach name, $(NAMES), $(foreach size, $(SIZES), $(size)/$(name))))
ICONS += $(addsuffix .xpm, $(NAMES))
ifeq (1, $(shell which inkscape; echo $$?))
$(error "No inkscape in PATH, it is required for exporting icons.")
else
ifeq (0, $(shell inkscape --without-gui 2>&1 > /dev/null; echo $$?))
# Inkscape < 1.0
INKSCAPE_GUI_FLAG := --without-gui
INKSCAPE_OUTPUT_FLAG := --export-png
else
# Inkscape >= 1.0
INKSCAPE_GUI_FLAG :=
INKSCAPE_OUTPUT_FLAG := --export-filename
endif
endif
all: $(ICONS)
%.png:
mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/
inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \
inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) $(INKSCAPE_GUI_FLAG) \
--export-width=$(word 1, $(subst x, , $(@))) \
--export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \
--export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
$(INKSCAPE_OUTPUT_FLAG)=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
%.xpm:
mkdir -p pixmaps/