diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 4681199580..8cc2fb11a0 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -47,6 +47,10 @@ February 7th, 2015 + + [ken] - Update to inkscape-0.91. Fixes + #6107. + [ken] - Patch cairo to prevent crashes with certain files. diff --git a/packages.ent b/packages.ent index dac99edbbc..f9d1659242 100644 --- a/packages.ent +++ b/packages.ent @@ -600,7 +600,7 @@ - + diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml index 9935416ce2..c92c64b358 100644 --- a/xsoft/other/inkscape.xml +++ b/xsoft/other/inkscape.xml @@ -3,13 +3,13 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ %general-entities; - - + + - - - - + + + + ]> @@ -75,8 +75,9 @@ - Required patch: - + Optional patch: + + for full test coverage. @@ -88,30 +89,46 @@ , , , - and - + + (or and + gnome docking library + for the experimental gtk+-3 build), + and + Recommended + or Optional , + , , , + + libcdr, + libvisio, libwpg, + NumPy + (for the testsuite and at runtime for some extensions) and - + python-lxml + (for the testsuite, and at runtime for some of the extensions) Optional Runtime Dependencies (for some of the Inkscape extensions) XML::XQL - and python-lxml @@ -135,19 +152,14 @@ commands: -patch -Np1 -i ../inkscape-&inkscape-version;-poppler-1.patch && -autoreconf -vi && - -sed -ri "s:.*(unsigned GC_version).*:\1 = GC_get_version()\;:" configure && +patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch && ./configure --prefix=/usr && make - Now, as the root user: