rpms/inkscape/devel inkscape-20090508svn-crc32.patch, NONE, 1.1 inkscape.spec, 1.73, 1.74

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20146

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-20090508svn-crc32.patch 
Log Message:
* Mon May 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.8.20090508svn
- Fix ODG export


inkscape-20090508svn-crc32.patch:

--- NEW FILE inkscape-20090508svn-crc32.patch ---
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;
 }


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- inkscape.spec	8 May 2009 09:05:28 -0000	1.73
+++ inkscape.spec	18 May 2009 04:22:36 -0000	1.74
@@ -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.sourcefo
 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
 %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/hico
 
 
 %changelog
+* Mon May 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.8.20090508svn
+- Fix ODG export
+
 * Fri May 08 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.7.20090508svn
 - Update to a post-alpha snapshot
 - Upstream applied our GCC 4.4 patch