diff --git a/.github/workflows/build-idzebra.yaml b/.github/workflows/build-idzebra.yaml index a51e2d74..da1ec211 100644 --- a/.github/workflows/build-idzebra.yaml +++ b/.github/workflows/build-idzebra.yaml @@ -19,7 +19,7 @@ jobs: - name: Install required and optional dependencies run: > sudo apt install autoconf automake libtool gcc make bison - tclsh xsltproc docbook docbook-xml docbook-xsl inkscape + tclsh xsltproc docbook docbook-xml docbook-xsl librsvg2-bin libexpat1-dev libbz2-dev tcl-dev zlib1g-dev pkg-config libxslt1-dev libgnutls28-dev libicu-dev - name: Run buildconf for YAZ diff --git a/buildconf.sh b/buildconf.sh index be3d68b3..3f5cf4d2 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -34,8 +34,8 @@ Or just build the Debian packages without configuring dpkg-buildpackage -rfakeroot When building from Git, you need these Debian packages: - autoconf automake libtool gcc tcl8.5 - xsltproc docbook docbook-xml docbook-xsl inkscape + autoconf automake libtool gcc tclsh + xsltproc docbook docbook-xml docbook-xsl librsvg2-bin libxslt1-dev libgnutls-dev libreadline5-dev libexpat1-dev pkg-config libexpat1-dev diff --git a/doc/Makefile.am b/doc/Makefile.am index cabbc05a..de7ca68f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = common -INKSCAPE=inkscape - docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX) XMLMAN = zebraidx.xml zebrasrv.xml idzebra-config.xml idzebra-abs2dom.xml @@ -29,7 +27,7 @@ XMLFILES = \ zebrasrv-virtual.xml \ local.ent -#examples.xml +#examples.xml #quickstart.xml @@ -114,10 +112,10 @@ uninstall-hook: rm -r $(DESTDIR)$(docdir) domfilter.png: domfilter.svg - unset DISPLAY; ${INKSCAPE} --export-png=$@ --export-width=600 $? + rsvg-convert -o $@ -w 600 $? domfilter.eps: domfilter.svg - unset DISPLAY; ${INKSCAPE} --export-eps=$@ $? + rsvg-convert -f eps -o $@ $? doc-clean: rm -f manref.xml *.html *.pdf *.[0-9] domfilter.png domfilter.eps