- Fix ODG export

This commit is contained in:
Lubomir Rintel 2009-05-18 04:22:36 +00:00
parent b4cf082047
commit 6b4194da97
2 changed files with 26 additions and 1 deletions

View File

@ -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;
}

View File

@ -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 <lkundrak@v3.sk> - 0.47-0.8.20090508svn
- Fix ODG export
* Fri May 08 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.7.20090508svn
- Update to a post-alpha snapshot
- Upstream applied our GCC 4.4 patch