diff options
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | mk/icon.mk | 4 |
2 files changed, 19 insertions, 2 deletions
@@ -366,6 +366,23 @@ echo "LIB_DHCPCD= $x" >>$CONFIG_MK # what we actually need. echo "LDADD+= -Wl,--as-needed" >>$CONFIG_MK +# If building icons (we need this to make the distfile) then we need to +# convert the SVG icons to PNG. +# We use cairosvg for this, but the binary name is based on python version +printf "Finding cairosvg ... " +for _CAIROSVG in cairosvg cairosvg-py3 cairosvg3.9 cairosvg3.8; do + CAIROSVG=$(_which "$_CAIROSVG") + if [ -x "$CAIROSVG" ]; then + break + fi +done +if [ -x "$CAIROSVG" ]; then + echo "$CAIROSVG" + echo "CAIROSVG= $CAIROSVG" >>$CONFIG_MK +else + echo "not found!" +fi + _NOTIFY="$NOTIFY" _WITH_GTK="$WITH_GTK" if [ "$WITH_GTK" = yes -o -z "$WITH_GTK" ]; then @@ -4,7 +4,7 @@ SIZEDIR?= ${SIZE}x${SIZE} ICONDIR?= ${PREFIX}/share/dhcpcd/icons IDIR= ${ICONDIR}/hicolor/${SIZEDIR}/${CATEGORY} -RSVG_CONVERT?= rsvg-convert +CAIROSVG?= cairosvg ICONS+= ${SRCS:.svg=.png} CLEANFILES+= ${SRCS:.svg=.png} @@ -14,7 +14,7 @@ CLEANFILES+= ${SRCS:.svg=.png} all: ${ICONS} .svg.png: - ${RSVG_CONVERT} -h ${SIZE} -w ${SIZE} $< >$@ + ${CAIROSVG} -f png -H ${SIZE} -W ${SIZE} $< >$@ _iconinstall: ${ICONS} ${INSTALL} -d ${DESTDIR}${IDIR} |