build: replace inkscape with rsvg-convert

Do not require having the graphical application inkscape and all its
dependencies installed, just to convert svgs to pdfs. This is still the
default in dblatex, even though converting on the command-line with
inkscape is deprecated. Use the lightweight rsvg-convert instead.

Merge at the same time as the docker-playground patch.

Depends: docker-playground I012c61eb777e6dc267dd4a52500da98c01ac1438
Change-Id: I0d132f8f6fd73fbe14b5bfa10a8659acaddf38f7

build/Makefile.asciidoc.inc

@@ -46,7 +46,12 @@ ASCIIDOC_OPTS := \
 	-a srcdir='$(ABS_SRCDIR)' \
 	-a commondir='$(COMMONDIR)' \
 	$(NULL)
-DBLATEX_OPTS := -s $(ASCIIDOCSTYLE) -P draft.mode=yes -P draft.watermark=0
+DBLATEX_OPTS := \
+	--config $(OSMO_GSM_MANUALS_DIR)/build/dblatex_config.xml \
+	-s $(ASCIIDOCSTYLE) \
+	-P draft.mode=yes \
+	-P draft.watermark=0 \
+	$(NULL)
 
 ifeq (,$(BUILD_RELEASE))
 	REVNUMBER := DRAFT $(GIT_VERSION)

build/Makefile.docbook.inc

@@ -50,6 +50,11 @@ endif
 	export REVNUMBER="$(REVNUMBER)" && \
 	export TEMPFILE="$(INC_DIR)/_temp_$(notdir $<)" && \
 	$(OSMO_GSM_MANUALS_DIR)/build/docbook-set-revhistory.py "$<" && \
-	dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \
-		$(dblatex_quiet) -P draft.mode=no -o $@ "$$TEMPFILE" && \
+	dblatex \
+		--config $(OSMO_GSM_MANUALS_DIR)/build/dblatex_config.xml \
+		--xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \
+		$(dblatex_quiet) \
+		-P draft.mode=no \
+		-o $@ \
+		"$$TEMPFILE" && \
 	rm $$TEMPFILE

build/dblatex_config.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!--
+  ====================================================================
+  Replace inkscape by rsvg-convert to convert SVG graphics
+  https://sourceforge.net/p/dblatex/mailman/message/37005820/
+  ====================================================================
+-->
+<config xmlns="http://dblatex.sourceforge.net/config">
+  <imagedata>
+    <converter src="svg" dst="*" docformat="pdf">
+      <command>
+         rsvg-convert -a -f %(dst)s -o %(output)s %(input)s
+      </command>
+    </converter>
+  </imagedata>
+</config>

check-depends.sh

@@ -15,6 +15,6 @@ check_dep_bin asciidoc asciidoc
 check_dep_bin dblatex dblatex
 check_dep_bin packetdiag3 python3-nwdiag
 check_dep_bin dot graphviz
-check_dep_bin inkscape inkscape
+check_dep_bin rsvg-convert librsvg2-bin
 
 echo "All dependencies installed!"

debian/control

@@ -12,7 +12,7 @@ Build-Depends: autotools-dev,
                dblatex,
                docbook5-xml,
                graphviz,
-               inkscape,
+               librsvg2-bin,
                libxml2-utils,
                mscgen,
                python3-nwdiag,
@@ -28,7 +28,7 @@ Depends: ${misc:Depends},
          dblatex,
          docbook5-xml,
          graphviz,
-         inkscape,
+         librsvg2-bin,
          libxml2-utils,
          mscgen,
          python3-nwdiag,