replace inkscape by rsvg (#bz 1833047)

This commit is contained in:
Michael J Gruber 2021-02-18 12:24:27 +01:00
parent 4e5e2bc361
commit 3a70e6dc85
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,33 @@
From ed7d6c2fa6e7848295893d455789ecb3e692b49f Mon Sep 17 00:00:00 2001
Message-Id: <ed7d6c2fa6e7848295893d455789ecb3e692b49f.1613646685.git.github@grubix.eu>
From: Michael J Gruber <github@grubix.eu>
Date: Thu, 18 Feb 2021 12:09:29 +0100
Subject: [PATCH] replace inkscape by rsvg
Inkscape broke headless commandline usage and appears not be fixing it,
see: https://gitlab.com/inkscape/inkscape/-/issues/1342
Switch to rsvg as recommended by upstream, see:
https://sourceforge.net/p/dblatex/mailman/message/37005820/
Signed-off-by: Michael J Gruber <github@grubix.eu>
---
lib/dbtexmf/core/imagedata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/dbtexmf/core/imagedata.py b/lib/dbtexmf/core/imagedata.py
index 32b7746..7c13e79 100644
--- a/lib/dbtexmf/core/imagedata.py
+++ b/lib/dbtexmf/core/imagedata.py
@@ -181,7 +181,7 @@ class FigConverter(ImageConverter):
class SvgConverter(ImageConverter):
def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
+ self.add_command(["rsvg-convert", "-a", "-f", "%(dst)s", "-o", "%(output)s",
"%(input)s"])
--
2.30.1.672.g8d3081386a

View File

@ -1,6 +1,6 @@
Name: dblatex Name: dblatex
Version: 0.3.12 Version: 0.3.12
Release: 1%{?dist} Release: 2%{?dist}
Summary: DocBook to LaTeX/ConTeXt Publishing Summary: DocBook to LaTeX/ConTeXt Publishing
BuildArch: noarch BuildArch: noarch
# Most of package is GPLv2+, except: # Most of package is GPLv2+, except:
@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}3-%{version}.tar.bz2
Source1: COPYING-docbook-xsl Source1: COPYING-docbook-xsl
Patch0: dblatex-0.3.11-disable-debian.patch Patch0: dblatex-0.3.11-disable-debian.patch
Patch1: dblatex-0.3.11-which-shutil.patch Patch1: dblatex-0.3.11-which-shutil.patch
Patch2: dblatex-0.3.11-replace-inkscape-by-rsvg.patch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
@ -63,7 +64,7 @@ Requires: libxslt docbook-dtds
Recommends: ImageMagick Recommends: ImageMagick
Recommends: texlive-epstopdf-bin Recommends: texlive-epstopdf-bin
Recommends: transfig Recommends: transfig
Recommends: inkscape Recommends: librsvg2-tools
%description %description
dblatex is a program that transforms your SGML/XMLDocBook dblatex is a program that transforms your SGML/XMLDocBook
@ -81,6 +82,7 @@ Authors:
%setup -q -n %{name}3-%{version} %setup -q -n %{name}3-%{version}
%patch0 -p1 -b .disable-debian %patch0 -p1 -b .disable-debian
%patch1 -p1 -b .which-shutil %patch1 -p1 -b .which-shutil
%patch2 -p1 -b .rsvg
rm -rf lib/contrib rm -rf lib/contrib
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
@ -134,6 +136,9 @@ cp -p %{SOURCE1} COPYING-docbook-xsl
%postun -p /usr/bin/texhash %postun -p /usr/bin/texhash
%changelog %changelog
* Thu Feb 18 2021 Michael J Gruber <mjg@fedoraproject.org> - 0.3.12-2
- replace inkscape by rsvg (#bz 1833047)
* Thu Feb 18 2021 Michael J Gruber <mjg@fedoraproject.org> - 0.3.12-1 * Thu Feb 18 2021 Michael J Gruber <mjg@fedoraproject.org> - 0.3.12-1
- rebase to 0.3.12 - rebase to 0.3.12
- follow yet another package/tree renaming - follow yet another package/tree renaming