Accepting request 33794 from GNOME:Apps

Copy from GNOME:Apps/inkscape based on submit request 33794 from user dimstar

OBS-URL: https://build.opensuse.org/request/show/33794
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=32

inkscape-gcc45.patch

@@ -0,0 +1,82 @@
+diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
+--- inkscape-0.47-orig/src/eraser-context.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/eraser-context.cpp	2010-02-18 08:46:26.000000000 -0500
+@@ -749,7 +749,7 @@
+                 if ( eraserMode ) {
+                     toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
+                 } else {
+-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                     toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
+                 }
+                 toWorkOn = g_slist_remove( toWorkOn, acid );
+diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
+--- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp	2010-02-18 09:07:54.000000000 -0500
+@@ -161,7 +161,7 @@
+ 	mywriter writer;
+ 	sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
+ 
+-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
++    Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
+ 	g_free(xml_str);
+     return;
+ }
+diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
+--- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/extension/internal/filter/filter.cpp	2010-02-18 09:21:06.000000000 -0500
+@@ -217,7 +217,7 @@
+                 "<menu-tip>%s</menu-tip>\n"
+             "</effect>\n"
+         "</inkscape-extension>\n", name, id, submenu, tip);
+-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
++    Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
+ 	g_free(xml_str);
+     return;
+ }
+diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
+--- inkscape-0.47-orig/src/flood-context.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/flood-context.cpp	2010-02-18 08:48:16.000000000 -0500
+@@ -900,7 +900,7 @@
+     if (is_point_fill) {
+         fill_points.push_back(Geom::Point(event->button.x, event->button.y));
+     } else {
+-        Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++        Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+         fill_points = r->getPoints();
+     }
+ 
+@@ -1206,7 +1206,7 @@
+ 
+     case GDK_BUTTON_RELEASE:
+         if (event->button.button == 1 && !event_context->space_panning) {
+-            Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++            Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+             if (r->is_started()) {
+                 // set "busy" cursor
+                 desktop->setWaitingCursor();
+diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
+--- inkscape-0.47-orig/src/gradient-context.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/gradient-context.cpp	2010-02-18 08:47:33.000000000 -0500
+@@ -641,7 +641,7 @@
+                 if (!event_context->within_tolerance) {
+                     // we've been dragging, either do nothing (grdrag handles that),
+                     // or rubberband-select if we have rubberband
+-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                     if (r->is_started() && !event_context->within_tolerance) {
+                         // this was a rubberband drag
+                         if (r->getMode() == RUBBERBAND_MODE_RECT) {
+diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
+--- inkscape-0.47-orig/src/select-context.cpp	2010-02-18 08:45:58.000000000 -0500
++++ inkscape-0.47/src/select-context.cpp	2010-02-18 08:50:11.000000000 -0500
+@@ -602,7 +602,7 @@
+                     }
+                     sc->item = NULL;
+                 } else {
+-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
+                     if (r->is_started() && !within_tolerance) {
+                         // this was a rubberband drag
+                         GSList *items = NULL;
+

inkscape-non_void.patch

@@ -0,0 +1,13 @@
+Index: inkscape-0.47/src/libgdl/gdl-switcher.c
+===================================================================
+--- inkscape-0.47.orig/src/libgdl/gdl-switcher.c
++++ inkscape-0.47/src/libgdl/gdl-switcher.c
+@@ -521,7 +521,7 @@ gdl_switcher_expose (GtkWidget *widget,
+                                             button, event);
+         }
+     }
+-    GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
++    return GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
+                                   (widget, event), FALSE);
+ }
+ 

inkscape.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar  2 13:20:36 UTC 2010 - dimstar@opensuse.org
+
+- Add inkscape-gcc45.patch to fix build with gcc 4.5. Patch
+  copied from upstream bug tracker, lp#522327.
+- Add inkscape-non_void.patch, cross-ported from gdl upstream,
+  commit 40b8cb7.
+
 -------------------------------------------------------------------
 Wed Dec 16 15:06:57 CET 2009 - vuntz@opensuse.org
 

inkscape.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package inkscape (Version 0.47)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 
 Name:           inkscape
 Version:        0.47
-Release:        2
+Release:        3
 License:        GPLv2 ; LGPLv2.1
 Summary:        Vector Illustration Program
 Url:            http://www.inkscape.org/
@@ -34,6 +34,10 @@ Patch1:         inkscape-packages.patch
 Patch2:         inkscape-poppler-0.12.2.patch
 # PATCH-FIX-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
 Patch18:        inkscape-remove-datetime.patch
+# PATCH-FIX-UPSTREAM inkscape-gcc45.patch lp#522327 dimstar@opensuse.org -- Fix build with gcc 4.5. Patch taken from upstream bug tracker.
+Patch19:        inkscape-gcc45.patch
+# PATCH-FIX-UPSTREAM inkscape-non_void.patch lp#530790 dimstar@opensuse.org -- Fix no-return-in-non-void function.
+Patch20:        inkscape-non_void.patch
 BuildRequires:  boost-devel
 BuildRequires:  docbook-toys
 BuildRequires:  fdupes
@@ -160,6 +164,8 @@ Inkscape is a vector illustration program for the GNOME desktop.
 %patch1 -p1
 %patch2 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"