From 0dffe162d408118213a0ad7b818250c71b800018439764fe4867be2652e13d1b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 12 Jan 2008 01:20:15 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=10

---
 inkscape-0.45.1-gcc43.patch | 88 +++++++++++++++++++++++++++++++++++++
 inkscape.changes            |  5 +++
 inkscape.spec               |  7 ++-
 3 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/inkscape-0.45.1-gcc43.patch b/inkscape-0.45.1-gcc43.patch
index 4497b55..431cd65 100644
--- a/inkscape-0.45.1-gcc43.patch
+++ b/inkscape-0.45.1-gcc43.patch
@@ -1626,3 +1626,91 @@ diff -Naur inkscape-0.45.1/src/xml/simple-node.cpp inkscape-0.45.1-mp/src/xml/si
  #include <glib/gstrfuncs.h>
  #include "xml/simple-node.h"
  #include "xml/node-event-vector.h"
+Index: src/remove-last.h
+===================================================================
+--- inkscape-0.45.1/src/remove-last.h	(Revision 14522)
++++ inkscape-0.45.1/src/remove-last.h	(Revision 14523)
+@@ -1,6 +1,7 @@
+ #ifndef __REMOVE_LAST_H__
+ #define __REMOVE_LAST_H__
+ 
++#include <algorithm>
+ #include <vector>
+ #include <glib.h>
+ 
+Index: src/libnrtype/Layout-TNG.h
+===================================================================
+--- inkscape-0.45.1/src/libnrtype/Layout-TNG.h	(Revision 14522)
++++ inkscape-0.45.1/src/libnrtype/Layout-TNG.h	(Revision 14523)
+@@ -17,6 +17,7 @@
+ #include "libnr/nr-rotate-ops.h"
+ #include <glibmm/ustring.h>
+ #include <pango/pango-break.h>
++#include <algorithm>
+ #include <vector>
+ 
+ #ifdef HAVE_CAIRO_PDF
+Index: src/composite-undo-stack-observer.cpp
+===================================================================
+--- inkscape-0.45.1/src/composite-undo-stack-observer.cpp	(Revision 14522)
++++ inkscape-0.45.1/src/composite-undo-stack-observer.cpp	(Revision 14523)
+@@ -11,6 +11,7 @@
+  * Released under GNU GPL, read the file 'COPYING' for more information
+  */
+ 
++#include <algorithm>
+ 
+ #include "composite-undo-stack-observer.h"
+ #include "xml/event.h"
+Index: src/svg/itos.cpp
+===================================================================
+--- inkscape-0.45.1/src/svg/itos.cpp	(Revision 14522)
++++ inkscape-0.45.1/src/svg/itos.cpp	(Revision 14523)
+@@ -14,6 +14,7 @@
+ /////////////////////////////////////////////////////////////////////////
+ 
+ // Standard include files
++#include <algorithm>
+ #include <string>		// for string
+ 
+ using namespace std;
+Index: src/debug/demangle.cpp
+===================================================================
+--- inkscape-0.45.1/src/debug/demangle.cpp	(Revision 14522)
++++ inkscape-0.45.1/src/debug/demangle.cpp	(Revision 14523)
+@@ -40,8 +40,8 @@
+ }
+ 
+ struct string_less_than {
+-    bool operator()(char const *a, char const *b) {
++    bool operator()(char const *a, char const *b) const {
+         return ( strcmp(a, b) < 0 );
+     }
+ };
+
+Index: sp-item-update-cns.cpp
+===================================================================
+--- inkscape-0.45.1/src/sp-item-update-cns.cpp	(Revision 14522)
++++ inkscape-0.45.1/src/sp-item-update-cns.cpp	(Revision 14523)
+@@ -3,6 +3,7 @@
+ #include "sp-guide-constraint.h"
+ #include <sp-guide.h>
+ #include <sp-item.h>
++#include <algorithm>
+ using std::find;
+ using std::vector;
+ 
+Index: makepath.cpp
+===================================================================
+--- inkscape-0.45.1/src/libavoid/makepath.cpp	(Revision 14522)
++++ inkscape-0.45.1/src/libavoid/makepath.cpp	(Revision 14523)
+@@ -31,7 +31,9 @@
+ #include "libavoid/connector.h"
+ #include "libavoid/graph.h"
+ #include "libavoid/router.h"
++#include <algorithm>
+ #include <vector>
++#include <limits.h>
+ #include <math.h>
+ 
+ namespace Avoid {
diff --git a/inkscape.changes b/inkscape.changes
index 02ab83a..b33a337 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 11 10:41:20 CET 2008 - coolo@suse.de
+
+- take more gcc43 patches from SVN
+
 -------------------------------------------------------------------
 Sat Nov 10 11:50:12 CET 2007 - mauro@suse.de
 
diff --git a/inkscape.spec b/inkscape.spec
index e89d5f8..f65a80a 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package inkscape (Version 0.45.1)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -18,7 +18,7 @@ Requires:       cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit
 AutoReqProv:    on
 Summary:        Inkscape Vector Illustration Program
 Version:        0.45.1
-Release:        106
+Release:        119
 Provides:       sodipodi
 Obsoletes:      sodipodi
 PreReq:         /bin/rm /bin/ln /bin/sh /usr/bin/perl
@@ -177,7 +177,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_mandir}/fr/man1
 
 %files lang -f %{name}.lang
+
 %changelog
+* Fri Jan 11 2008 - coolo@suse.de
+- take more gcc43 patches from SVN
 * Sat Nov 10 2007 - mauro@suse.de
 - Added inkscape-0.45.1-gcc43.patch
   + Fixes issues with gcc 4.3.