build: Fix build with inkscape 1.0beta

jnsh · Feb 1, 2020 · d7bac2e · d7bac2e
1 parent 762228f
commit d7bac2e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/common/gtk-2.0/Makefile.am b/common/gtk-2.0/Makefile.am
@@ -35,7 +35,11 @@ $(light): $(srcdir)/light/assets.svg | light/assets
 $(dark): $(srcdir)/dark/assets.svg | dark/assets
 
 $(light) $(dark):
+if INKSCAPE_1_0_OR_NEWER
+	$(INKSCAPE) --export-id-only --export-file="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+else !INKSCAPE_1_0_OR_NEWER
 	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+endif
 	$(OPTIPNG) -o7 --quiet "$@"
 
 menubar-toolbar/%-dark.png: dark/assets/%.png | menubar-toolbar

diff --git a/common/gtk-3.0/common.am b/common/gtk-3.0/common.am
@@ -14,11 +14,19 @@ clean:
 	rm -rf assets/ light/ dark/ darker/ lighter/
 
 $(normal): $(srcdir)/assets.svg | assets
+if INKSCAPE_1_0_OR_NEWER
+	$(INKSCAPE) --export-id-only --export-file="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+else !INKSCAPE_1_0_OR_NEWER
 	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+endif
 	$(OPTIPNG) -o7 --quiet "$@"
 
 $(hidpi): $(srcdir)/assets.svg | assets
+if INKSCAPE_1_0_OR_NEWER
+	$(INKSCAPE) --export-id-only --export-file="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+else !INKSCAPE_1_0_OR_NEWER
 	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+endif
 	$(OPTIPNG) -o7 --quiet "$@"
 
 .PHONY: normal hidpi clean

diff --git a/common/xfwm4/Makefile.am b/common/xfwm4/Makefile.am
@@ -17,7 +17,11 @@ $(light): $(srcdir)/light/assets.svg | light/assets
 $(dark): $(srcdir)/dark/assets.svg | dark/assets
 
 $(light) $(dark):
+if INKSCAPE_1_0_OR_NEWER
+	$(INKSCAPE) --export-id-only --export-file="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+else !INKSCAPE_1_0_OR_NEWER
 	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+endif
 	$(OPTIPNG) -o7 --quiet "$@"
 
 .PHONY: light dark clean

diff --git a/configure.ac b/configure.ac
@@ -47,6 +47,10 @@ AS_IF([test "x$ENABLE_CINNAMON" != xno], [ARC_CINNAMON])
 AS_IF([test "x$ENABLE_GTK2" != xno -o "x$ENABLE_GTK3" != xno -o "x$ENABLE_XFWM" != xno], [
     AC_PATH_PROG([INKSCAPE], [inkscape])
     AS_IF([test "x$ac_cv_path_INKSCAPE" = x], [AC_MSG_ERROR([inkscape not found])])
+    AS_IF([test "x$ac_cv_path_INKSCAPE" != x],
+        [INKSCAPE_VERSMJR=`inkscape --version 2> /dev/null | cut -d' ' -f2 | cut -d'.' -f1`]
+        AM_CONDITIONAL([INKSCAPE_1_0_OR_NEWER], [test "x$INKSCAPE_VERSMJR" = x1])
+    )
     AC_PATH_PROG([OPTIPNG], [optipng])
     AS_IF([test "x$ac_cv_path_OPTIPNG" = x], [AC_MSG_ERROR([optipng not found])])
 ])