From 6b4194da97f678db15fddfbe8857d429574421f8 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 18 May 2009 04:22:36 +0000 Subject: [PATCH] - Fix ODG export --- inkscape-20090508svn-crc32.patch | 20 ++++++++++++++++++++ inkscape.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 inkscape-20090508svn-crc32.patch diff --git a/inkscape-20090508svn-crc32.patch b/inkscape-20090508svn-crc32.patch new file mode 100644 index 0000000..41eabbe --- /dev/null +++ b/inkscape-20090508svn-crc32.patch @@ -0,0 +1,20 @@ +CRC-32 for 64-bit systems is calculated incorrectly, +resulting in corrupted ODG exported files. + +https://bugs.launchpad.net/inkscape/+bug/275519 +https://bugzilla.redhat.com/show_bug.cgi?id=499088 + +Lubomir Rintel + +diff -up inkscape/src/dom/util/ziptool.cpp.crc32 inkscape/src/dom/util/ziptool.cpp +--- inkscape/src/dom/util/ziptool.cpp.crc32 2009-05-18 06:12:56.000000000 +0200 ++++ inkscape/src/dom/util/ziptool.cpp 2009-05-18 06:13:31.000000000 +0200 +@@ -158,6 +158,8 @@ void Crc32::reset() + void Crc32::update(unsigned char b) + { + unsigned long c = ~value; ++ ++ c &= 0xffffffff; + c = crc_table[(c ^ b) & 0xff] ^ (c >> 8); + value = ~c; + } diff --git a/inkscape.spec b/inkscape.spec index ee814bf..d31e9e2 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.47 -Release: 0.7.20090508svn%{?dist} +Release: 0.8.20090508svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -14,6 +14,7 @@ URL: http://inkscape.sourceforge.net/ Source0: %{name}.tar.lzma Patch0: inkscape-20090410svn-uniconv.patch +Patch1: inkscape-20090508svn-crc32.patch Patch2: inkscape-20090226svn-oldcairo.patch Patch4: inkscape-20090410svn-formats.patch # BEGIN SVN SNAPSHOT SPECIFIC @@ -134,6 +135,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep %setup -q -n %{name} %patch0 -p1 -b .uniconv +%patch1 -p1 -b .crc32 %patch2 -p0 -b .oldcairo %patch4 -p1 -b .formats # BEGIN SVN SNAPSHOT SPECIFIC @@ -245,6 +247,9 @@ touch --no-create %{_datadir}/icons/hicolor %changelog +* Mon May 18 2009 Lubomir Rintel - 0.47-0.8.20090508svn +- Fix ODG export + * Fri May 08 2009 Lubomir Rintel - 0.47-0.7.20090508svn - Update to a post-alpha snapshot - Upstream applied our GCC 4.4 patch