rpms/inkscape/devel inkscape-0.46pre1-gcc43.patch, NONE, 1.1 inkscape.spec, 1.42, 1.43

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29831/devel

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46pre1-gcc43.patch 
Log Message:
GCC 4.3 build fixes

inkscape-0.46pre1-gcc43.patch:

--- NEW FILE inkscape-0.46pre1-gcc43.patch ---
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 <lkundrak at redhat.com>
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 <assert.h>
+#include <cstring>
 
 #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 <cstring>
+
 #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 <iostream>
 #include <iomanip>
 #include <vector>
+#include <algorithm>
 #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 <memory>
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
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 <gtk/gtkruler.h>
 #include "sp-metric.h"
-#include <iostream.h>
+#include <iostream>
 #include <glib.h>
 
 


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- inkscape.spec	6 Feb 2008 12:02:12 -0000	1.42
+++ inkscape.spec	7 Feb 2008 20:27:39 -0000	1.43
@@ -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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Thu Feb 07 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-2
+- Build with gcc-4.3
+
 * Wed Feb 06 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.45.1+0.46pre1-1
 - 0.46 prerelease
 - Minor cosmetic changes to satisfy the QA script