rpms/inkscape/F-11 inkscape-20090508svn-crc32.patch, NONE, 1.1 inkscape.spec, 1.71, 1.72 sources, 1.18, 1.19

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23570

Modified Files:
	inkscape.spec sources 
Added Files:
	inkscape-20090508svn-crc32.patch 
Log Message:
Merge from devel

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/F-11/inkscape.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- inkscape.spec	10 Apr 2009 13:34:27 -0000	1.71
+++ inkscape.spec	18 May 2009 04:32:32 -0000	1.72
@@ -1,20 +1,20 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.6.20090410svn%{?dist}
+Release:        0.8.20090508svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r21114 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@21114 inkscape
+# svn export -r21302 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@21302 inkscape
 # tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma
 # Chuck the SVN snapshot specific blocks when bumping to a release:
 # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' <inkscape.spec
 Source0:        %{name}.tar.lzma
 
 Patch0:         inkscape-20090410svn-uniconv.patch
-Patch1:         inkscape-20090410svn-gcc44.patch
+Patch1:         inkscape-20090508svn-crc32.patch
 Patch2:         inkscape-20090226svn-oldcairo.patch
 Patch4:         inkscape-20090410svn-formats.patch
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -135,7 +135,7 @@ graphics in W3C standard Scalable Vector
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .uniconv
-%patch1 -p1 -b .gcc44
+%patch1 -p1 -b .crc32
 %patch2 -p0 -b .oldcairo
 %patch4 -p1 -b .formats
 # BEGIN SVN SNAPSHOT SPECIFIC
@@ -226,7 +226,7 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/inkscape/templates
 %{_datadir}/inkscape/ui
 %{_datadir}/applications/fedora-inkscape.desktop
-%{_datadir}/icons/hicolor/scalable/apps/inkscape.svg
+%{_datadir}/icons/hicolor/*/apps/inkscape.*
 %{_datadir}/pixmaps/inkscape.png
 %{_mandir}/man1/inkscape.1*
 %{_mandir}/man1/inkview.1*
@@ -247,6 +247,13 @@ 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
+
 * Fri Apr 10 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.6.20090410svn
 - Update to newer snapshot
 - Fix doc/incview reversed subpackage content


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	10 Apr 2009 13:34:27 -0000	1.18
+++ sources	18 May 2009 04:32:32 -0000	1.19
@@ -1 +1 @@
-b2f839c29e8ad5c3eab82c2540c6e12d  inkscape.tar.lzma
+991de554ac8fe33136b983b13b6899db  inkscape.tar.lzma