diff --git a/inkscape-0.46pre1-gcc43.patch b/inkscape-0.46pre1-gcc43.patch new file mode 100644 index 0000000..54b39fb --- /dev/null +++ b/inkscape-0.46pre1-gcc43.patch @@ -0,0 +1,65 @@ +The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in +unnecessary dependencies which aren't requested by the standard. +This fixes build for gcc-4.3 + +Lubomir Kundrak +https://bugs.launchpad.net/inkscape/+bug/190017 + +diff -urp inkscape-0.45.1+0.46pre1.orig/src/display/nr-filter-slot.cpp inkscape-0.45.1+0.46pre1/src/display/nr-filter-slot.cpp +--- inkscape-0.45.1+0.46pre1.orig/src/display/nr-filter-slot.cpp 2008-01-15 00:24:31.000000000 +0100 ++++ inkscape-0.45.1+0.46pre1/src/display/nr-filter-slot.cpp 2008-02-07 20:53:36.000000000 +0100 +@@ -14,6 +14,7 @@ + */ + + #include ++#include + + #include "display/nr-arena-item.h" + #include "display/nr-filter-types.h" +diff -urp inkscape-0.45.1+0.46pre1.orig/src/live_effects/lpeobject-reference.cpp inkscape-0.45.1+0.46pre1/src/live_effects/lpeobject-reference.cpp +--- inkscape-0.45.1+0.46pre1.orig/src/live_effects/lpeobject-reference.cpp 2008-01-15 00:24:20.000000000 +0100 ++++ inkscape-0.45.1+0.46pre1/src/live_effects/lpeobject-reference.cpp 2008-02-07 20:53:36.000000000 +0100 +@@ -6,6 +6,8 @@ + * Released under GNU GPL, read the file 'COPYING' for more information. + */ + ++#include ++ + #include "enums.h" + #include "live_effects/lpeobject-reference.h" + #include "live_effects/lpeobject.h" +diff -urp inkscape-0.45.1+0.46pre1.orig/src/syseq.h inkscape-0.45.1+0.46pre1/src/syseq.h +--- inkscape-0.45.1+0.46pre1.orig/src/syseq.h 2008-01-15 00:24:28.000000000 +0100 ++++ inkscape-0.45.1+0.46pre1/src/syseq.h 2008-02-07 20:53:36.000000000 +0100 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include "math.h" + + namespace SysEq { +diff -urp inkscape-0.45.1+0.46pre1.orig/src/ui/dialog/filter-effects-dialog.h inkscape-0.45.1+0.46pre1/src/ui/dialog/filter-effects-dialog.h +--- inkscape-0.45.1+0.46pre1.orig/src/ui/dialog/filter-effects-dialog.h 2008-02-01 05:37:40.000000000 +0100 ++++ inkscape-0.45.1+0.46pre1/src/ui/dialog/filter-effects-dialog.h 2008-02-07 20:53:36.000000000 +0100 +@@ -12,6 +12,8 @@ + #ifndef INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H + #define INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H + ++#include ++ + #include + #include + #include +diff -urp inkscape-0.45.1+0.46pre1.orig/src/widgets/ruler.h inkscape-0.45.1+0.46pre1/src/widgets/ruler.h +--- inkscape-0.45.1+0.46pre1.orig/src/widgets/ruler.h 2008-02-01 05:37:36.000000000 +0100 ++++ inkscape-0.45.1+0.46pre1/src/widgets/ruler.h 2008-02-07 20:53:36.000000000 +0100 +@@ -15,7 +15,7 @@ + + #include + #include "sp-metric.h" +-#include ++#include + #include + + diff --git a/inkscape.spec b/inkscape.spec index f9b9107..8efe522 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,6 +1,6 @@ Name: inkscape Version: 0.45.1+0.46pre1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -9,6 +9,7 @@ URL: http://inkscape.sourceforge.net/ Source0: http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2 Patch0: inkscape-16571-cxxinclude.patch Patch1: inkscape-0.45.1-desktop.patch +Patch2: inkscape-0.46pre1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atk-devel @@ -63,6 +64,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. %setup -q %patch0 -p1 -b .cxxinclude %patch1 -p1 -b .desktop +%patch2 -p1 -b .gcc43 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';' find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';' dos2unix share/extensions/*.py @@ -122,6 +124,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Thu Feb 07 2008 Lubomir Kundrak - 0.45.1+0.46pre1-2 +- Build with gcc-4.3 + * Wed Feb 06 2008 Lubomir Kundrak - 0.45.1+0.46pre1-1 - 0.46 prerelease - Minor cosmetic changes to satisfy the QA script