Fixes for GCC 4.4.

diff --git a/inkscape/mingw32-inkscape-20568-gcc44.patch b/inkscape/mingw32-inkscape-20568-gcc44.patch
new file mode 100644 (file)
index 0000000..ae4d67a
--- /dev/null
+++ b/inkscape/mingw32-inkscape-20568-gcc44.patch
@@ -0,0 +1,147 @@
+diff -ur inkscape-20568/src/dom/domimpl.cpp inkscape-20568.mingw/src/dom/domimpl.cpp
+--- inkscape-20568/src/dom/domimpl.cpp 2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/domimpl.cpp   2009-02-21 15:52:19.000000000 +0000
+@@ -27,6 +27,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstdio>
+ 
+ #include "domimpl.h"
+ 
+diff -ur inkscape-20568/src/dom/io/domstream.h inkscape-20568.mingw/src/dom/io/domstream.h
+--- inkscape-20568/src/dom/io/domstream.h      2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/io/domstream.h        2009-02-21 15:45:37.000000000 +0000
+@@ -29,7 +29,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-
++#include <cstdio>
+ 
+ #include <dom/dom.h>
+ 
+diff -ur inkscape-20568/src/dom/io/socket.cpp inkscape-20568.mingw/src/dom/io/socket.cpp
+--- inkscape-20568/src/dom/io/socket.cpp       2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/io/socket.cpp 2009-02-21 16:04:43.000000000 +0000
+@@ -35,6 +35,8 @@
+ #include <sys/filio.h>   // needed on Solaris 8
+ #endif
+ 
++#include <cstdio>
++
+ #include "socket.h"
+ #include "dom/util/thread.h"
+ 
+diff -ur inkscape-20568/src/dom/svgimpl.cpp inkscape-20568.mingw/src/dom/svgimpl.cpp
+--- inkscape-20568/src/dom/svgimpl.cpp 2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/svgimpl.cpp   2009-02-21 15:53:40.000000000 +0000
+@@ -27,6 +27,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstdio>
+ #include "svgimpl.h"
+ #include <cstring>
+ using std::strcmp;
+diff -ur inkscape-20568/src/dom/svgreader.cpp inkscape-20568.mingw/src/dom/svgreader.cpp
+--- inkscape-20568/src/dom/svgreader.cpp       2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/svgreader.cpp 2009-02-21 15:53:27.000000000 +0000
+@@ -33,6 +33,8 @@
+  */
+ 
+ 
++#include <cstdio>
++
+ #include "svgreader.h"
+ #include "dom/cssreader.h"
+ #include "dom/ucd.h"
+diff -ur inkscape-20568/src/dom/svgtypes.h inkscape-20568.mingw/src/dom/svgtypes.h
+--- inkscape-20568/src/dom/svgtypes.h  2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/svgtypes.h    2009-02-21 15:53:13.000000000 +0000
+@@ -40,6 +40,7 @@
+  *          
+  */
+ 
++#include <cstdio>
+ 
+ // For access to DOM2 core
+ #include "dom/dom.h"
+diff -ur inkscape-20568/src/dom/xpathtoken.h inkscape-20568.mingw/src/dom/xpathtoken.h
+--- inkscape-20568/src/dom/xpathtoken.h        2009-01-25 12:21:13.000000000 +0000
++++ inkscape-20568.mingw/src/dom/xpathtoken.h  2009-02-21 15:55:15.000000000 +0000
+@@ -30,6 +30,7 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstdio>
+ 
+ #include "dom.h"
+ 
+diff -ur inkscape-20568/src/io/gzipstream.cpp inkscape-20568.mingw/src/io/gzipstream.cpp
+--- inkscape-20568/src/io/gzipstream.cpp       2009-01-25 12:21:07.000000000 +0000
++++ inkscape-20568.mingw/src/io/gzipstream.cpp 2009-02-21 16:07:44.000000000 +0000
+@@ -13,6 +13,8 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <cstdio>
++
+ #include "gzipstream.h"
+ #include <cstring>
+ #include <string>
+diff -ur inkscape-20568/src/io/inkscapestream.h inkscape-20568.mingw/src/io/inkscapestream.h
+--- inkscape-20568/src/io/inkscapestream.h     2009-01-25 12:21:07.000000000 +0000
++++ inkscape-20568.mingw/src/io/inkscapestream.h       2009-02-21 16:07:27.000000000 +0000
+@@ -12,6 +12,7 @@
+  */
+ 
+ 
++#include <cstdio>
+ #include <glibmm.h>
+ 
+ namespace Inkscape
+diff -ur inkscape-20568/src/libavoid/vertices.h inkscape-20568.mingw/src/libavoid/vertices.h
+--- inkscape-20568/src/libavoid/vertices.h     2009-01-25 12:21:12.000000000 +0000
++++ inkscape-20568.mingw/src/libavoid/vertices.h       2009-02-21 15:14:23.000000000 +0000
+@@ -23,6 +23,7 @@
+ #ifndef AVOID_VERTICES_H
+ #define AVOID_VERTICES_H
+ 
++#include <cstdio>
+ #include <list>
+ #include <set>
+ #include <map>
+diff -ur inkscape-20568/src/libnr/nr-matrix-fns.cpp inkscape-20568.mingw/src/libnr/nr-matrix-fns.cpp
+--- inkscape-20568/src/libnr/nr-matrix-fns.cpp 2009-01-25 12:21:11.000000000 +0000
++++ inkscape-20568.mingw/src/libnr/nr-matrix-fns.cpp   2009-02-21 15:50:31.000000000 +0000
+@@ -1,3 +1,5 @@
++#include <cstdio>
++
+ #include <libnr/nr-matrix-fns.h>
+ 
+ namespace NR {
+diff -ur inkscape-20568/src/registrytool.cpp inkscape-20568.mingw/src/registrytool.cpp
+--- inkscape-20568/src/registrytool.cpp        2009-01-25 12:21:08.000000000 +0000
++++ inkscape-20568.mingw/src/registrytool.cpp  2009-02-21 16:08:04.000000000 +0000
+@@ -25,6 +25,8 @@
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstdio>
++
+ #include <windows.h>
+ #include <string>
+ 
+diff -ur inkscape-20568/src/xml/event.cpp inkscape-20568.mingw/src/xml/event.cpp
+--- inkscape-20568/src/xml/event.cpp   2009-01-25 12:21:21.000000000 +0000
++++ inkscape-20568.mingw/src/xml/event.cpp     2009-02-21 16:06:09.000000000 +0000
+@@ -13,6 +13,8 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <cstdio>
++
+ #include <glib.h> // g_assert()
+ 
+ #include "event.h"

diff --git a/inkscape/mingw32-inkscape.spec b/inkscape/mingw32-inkscape.spec
index dfdef2f..31efb18 100644 (file)
--- a/inkscape/mingw32-inkscape.spec
+++ b/inkscape/mingw32-inkscape.spec
@@ -32,6 +32,9 @@ Patch1:         mingw32-inkscape-20081027-paths.patch
 # supported getting the outline of unhinted fonts.
 Patch2:         mingw32-inkscape-20081027-unhinted-fonts-for-wine.patch
 
+# Fixes for gcc 4.4
+Patch3:         mingw32-inkscape-20568-gcc44.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 40
@@ -76,6 +79,7 @@ community-oriented development.
 #%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 ./autogen.sh