fix:build:Fix usage of inkscape 1.0 commandline usage

navit-gps · Sep 6, 2020 · 427fd1b · 427fd1b
1 parent 6e25607
commit 427fd1b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt
@@ -30,7 +30,7 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE)
 		else()
 			set(SCALE_ARGS)
 		endif()
-		set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT})
+		set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${IMAGE_OUTPUT} ${IMAGE_INPUT})
 	else()
 		message(FATAL_ERROR "no svg2png converter defined here.")
 	endif()

diff --git a/navit/icons/navit_svg2png b/navit/icons/navit_svg2png
@@ -19,7 +19,7 @@ svgtopng()
 		$svgtopng --width=$1 --height=$2 --output $4 $3
 		;;
 	*inkscape)
-		$svgtopng --without-gui --export-width=$1 --export-height=$2 --export-png=$BUILDDIR/$4 $3
+		$svgtopng --export-width=$1 --export-height=$2 --export-type=png --export-filename=$4 $3
 		;;
 	*convert)
 		$svgtopng -alpha on -background none $3 -resize $1x$2 $4

diff --git a/navit/textures/CMakeLists.txt b/navit/textures/CMakeLists.txt
@@ -30,7 +30,7 @@ macro(convert_to_png TEXTURE_INPUT TEXTURE_OUTPUT SCALE)
 		else()
 			set(SCALE_ARGS)
 		endif()
-		set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${TEXTURE_OUTPUT} ${SCALE_ARGS} ${TEXTURE_INPUT})
+		set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${TEXTURE_OUTPUT} ${TEXTURE_INPUT})
 	else()
 		message(FATAL_ERROR "no svg2png converter defined here.")
 	endif()