diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 992f696e67..3f5b324b88 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,10 @@ December 3rd, 2019 + + [ken] - Adjust inkscape to build with poppler-0.83.0. Fixes + #12858. + [ken] - Update to firefox-68.3.0esr (security fix). Fixes #12856. diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml index 069f0883a6..263bd06010 100644 --- a/xsoft/other/inkscape.xml +++ b/xsoft/other/inkscape.xml @@ -79,8 +79,8 @@ Required patch: - Required patch: - + Required patch: + Inkscape Dependencies @@ -158,7 +158,13 @@ Next, fix Inkscape to be able to build with poppler-0.82.0 and higher: -patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_82_0_fixes-1.patch +sed -e 's|Unicode \*u|Unicode const *u|g' -i src/extension/internal/pdfinput/* + + + Now fix Inkscape to build with poppler-0.83.0: + + +patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch Ensure that the libraries from can be used: