From 850f389c097d3410bbca980d52504e8359d399f87a4e35d4b033a1bfeae6680f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 7 May 2008 21:06:31 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=16

---
 inkscape-warnings.patch | 64 +++++++++++++++++++++++++++++++++++------
 inkscape.changes        |  5 ++++
 inkscape.spec           |  4 ++-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/inkscape-warnings.patch b/inkscape-warnings.patch
index 318a0d0..447a49a 100644
--- a/inkscape-warnings.patch
+++ b/inkscape-warnings.patch
@@ -1,6 +1,42 @@
+=== modified file 'src/2geom/convex-cover.cpp'
+--- src/2geom/convex-cover.cpp	2008-05-07 15:41:04 +0000
++++ src/2geom/convex-cover.cpp	2008-05-07 16:42:51 +0000
+@@ -264,7 +264,8 @@
+ */
+ bool
+ ConvexHull::no_colinear_points() const {
+-
++  // Urgh
++    return false;
+ }
+ 
+ bool
+@@ -350,6 +351,7 @@
+     // al and bl now point to the top of the first pair of edges that overlap in y value
+     double sweep_y = std::min(a.boundary[al][Y],
+                               b.boundary[bl][Y]);
++    return ret;
+ }
+ 
+ /*** ConvexHull intersection(ConvexHull a, ConvexHull b);
+
+=== modified file 'src/2geom/poly-laguerre-solve.cpp'
+--- src/2geom/poly-laguerre-solve.cpp	2008-05-07 15:41:04 +0000
++++ src/2geom/poly-laguerre-solve.cpp	2008-05-07 16:44:43 +0000
+@@ -133,6 +133,9 @@
+ laguerre_real_interval(Poly const & ply,
+                        const double lo, const double hi,
+                        const double tol) {
++    std::vector<double> retval;
++
++    return retval;
+ }
+ 
+ /*
+
 === modified file 'src/display/nr-filter-specularlighting.cpp'
---- src/display/nr-filter-specularlighting.cpp	2008-03-28 20:56:04 +0000
-+++ src/display/nr-filter-specularlighting.cpp	2008-03-28 20:58:43 +0000
+--- src/display/nr-filter-specularlighting.cpp	2008-05-07 15:41:04 +0000
++++ src/display/nr-filter-specularlighting.cpp	2008-05-07 15:41:27 +0000
 @@ -108,8 +108,9 @@
                  data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
                  data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
@@ -35,8 +71,8 @@
              delete sl;
 
 === modified file 'src/extension/internal/pov-out.cpp'
---- src/extension/internal/pov-out.cpp	2008-03-28 20:56:04 +0000
-+++ src/extension/internal/pov-out.cpp	2008-03-28 20:58:43 +0000
+--- src/extension/internal/pov-out.cpp	2008-05-07 15:41:04 +0000
++++ src/extension/internal/pov-out.cpp	2008-05-07 15:41:27 +0000
 @@ -133,9 +133,9 @@
  void PovOutput::vec2(double a, double b)
  {
@@ -89,8 +125,8 @@
  
 
 === modified file 'src/libgdl/gdl-dock-placeholder.c'
---- src/libgdl/gdl-dock-placeholder.c	2008-03-28 20:56:04 +0000
-+++ src/libgdl/gdl-dock-placeholder.c	2008-03-28 21:19:25 +0000
+--- src/libgdl/gdl-dock-placeholder.c	2008-05-07 15:41:04 +0000
++++ src/libgdl/gdl-dock-placeholder.c	2008-05-07 15:41:27 +0000
 @@ -491,7 +491,7 @@
          GdlDockObject *toplevel;
          
@@ -102,8 +138,8 @@
          
 
 === modified file 'src/libgdl/gdl-stock.c'
---- src/libgdl/gdl-stock.c	2008-03-28 20:56:04 +0000
-+++ src/libgdl/gdl-stock.c	2008-03-28 20:58:43 +0000
+--- src/libgdl/gdl-stock.c	2008-05-07 15:41:04 +0000
++++ src/libgdl/gdl-stock.c	2008-05-07 15:41:27 +0000
 @@ -60,7 +60,7 @@
  	
  	pixbuf = gdk_pixbuf_new_from_inline (data_size, icon_data, FALSE, &err);
@@ -114,3 +150,15 @@
  	    err = NULL;
  	    g_object_unref (source);
 
+=== modified file 'src/libgdl/gdl-switcher.c'
+--- src/libgdl/gdl-switcher.c	2008-05-07 15:41:04 +0000
++++ src/libgdl/gdl-switcher.c	2008-05-07 16:45:53 +0000
+@@ -524,6 +524,7 @@
+     }
+     GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
+                                   (widget, event), FALSE);
++    return 0;
+ }
+ 
+ static void
+
diff --git a/inkscape.changes b/inkscape.changes
index 1b9f2f7..ae75417 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  7 19:10:42 CEST 2008 - maw@suse.de
+
+- Respin inkscape-warnings.patch.
+
 -------------------------------------------------------------------
 Thu Apr  3 19:42:45 CEST 2008 - maw@suse.de
 
diff --git a/inkscape.spec b/inkscape.spec
index 8c705ec..b28bea1 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -19,7 +19,7 @@ Requires:       cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit
 AutoReqProv:    on
 Summary:        Inkscape Vector Illustration Program
 Version:        0.46
-Release:        5
+Release:        17
 Provides:       sodipodi
 Obsoletes:      sodipodi
 PreReq:         /bin/rm /bin/ln /bin/sh /usr/bin/perl
@@ -185,6 +185,8 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Wed May 07 2008 maw@suse.de
+- Respin inkscape-warnings.patch.
 * Thu Apr 03 2008 maw@suse.de
 - Buildrequire libpoppler-glib-devel, thereby enabling pdf import support
   (bnc#376752).