From 7e5dca9cddc70940dd5cd0a721c19f5184d6a9ce Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Fixes for GCC 4.4. --- inkscape/mingw32-inkscape-20568-gcc44.patch | 147 ++++++++++++++++++++++++++++ inkscape/mingw32-inkscape.spec | 4 + 2 files changed, 151 insertions(+) create mode 100644 inkscape/mingw32-inkscape-20568-gcc44.patch diff --git a/inkscape/mingw32-inkscape-20568-gcc44.patch b/inkscape/mingw32-inkscape-20568-gcc44.patch new file mode 100644 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 + + #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 + + #include + +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 // needed on Solaris 8 + #endif + ++#include ++ + #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 + #include "svgimpl.h" + #include + 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 ++ + #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 + + // 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 + + #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 ++ + #include "gzipstream.h" + #include + #include +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 + #include + + 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 + #include + #include + #include +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 ++ + #include + + 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 ++ + #include + #include + +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 ++ + #include // g_assert() + + #include "event.h" diff --git a/inkscape/mingw32-inkscape.spec b/inkscape/mingw32-inkscape.spec index dfdef2f..31efb18 100644 --- 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 -- 1.8.3.1