wok-next diff inkscape/stuff/inkscape-0.47-gcc45.patch @ rev 16694

xorg-kbproto: typo in depends
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri May 23 11:56:36 2014 +0300 (2014-05-23)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/inkscape/stuff/inkscape-0.47-gcc45.patch	Fri May 23 11:56:36 2014 +0300
     1.3 @@ -0,0 +1,81 @@
     1.4 +diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
     1.5 +--- inkscape-0.47-orig/src/eraser-context.cpp	2010-02-18 08:45:58.000000000 -0500
     1.6 ++++ inkscape-0.47/src/eraser-context.cpp	2010-02-18 08:46:26.000000000 -0500
     1.7 +@@ -749,7 +749,7 @@
     1.8 +                 if ( eraserMode ) {
     1.9 +                     toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
    1.10 +                 } else {
    1.11 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.12 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.13 +                     toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
    1.14 +                 }
    1.15 +                 toWorkOn = g_slist_remove( toWorkOn, acid );
    1.16 +diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
    1.17 +--- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp	2010-02-18 08:45:58.000000000 -0500
    1.18 ++++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp	2010-02-18 09:07:54.000000000 -0500
    1.19 +@@ -161,7 +161,7 @@
    1.20 + 	mywriter writer;
    1.21 + 	sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
    1.22 + 
    1.23 +-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
    1.24 ++    Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
    1.25 + 	g_free(xml_str);
    1.26 +     return;
    1.27 + }
    1.28 +diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
    1.29 +--- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp	2010-02-18 08:45:58.000000000 -0500
    1.30 ++++ inkscape-0.47/src/extension/internal/filter/filter.cpp	2010-02-18 09:21:06.000000000 -0500
    1.31 +@@ -217,7 +217,7 @@
    1.32 +                 "<menu-tip>%s</menu-tip>\n"
    1.33 +             "</effect>\n"
    1.34 +         "</inkscape-extension>\n", name, id, submenu, tip);
    1.35 +-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
    1.36 ++    Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
    1.37 + 	g_free(xml_str);
    1.38 +     return;
    1.39 + }
    1.40 +diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
    1.41 +--- inkscape-0.47-orig/src/flood-context.cpp	2010-02-18 08:45:58.000000000 -0500
    1.42 ++++ inkscape-0.47/src/flood-context.cpp	2010-02-18 08:48:16.000000000 -0500
    1.43 +@@ -900,7 +900,7 @@
    1.44 +     if (is_point_fill) {
    1.45 +         fill_points.push_back(Geom::Point(event->button.x, event->button.y));
    1.46 +     } else {
    1.47 +-        Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.48 ++        Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.49 +         fill_points = r->getPoints();
    1.50 +     }
    1.51 + 
    1.52 +@@ -1206,7 +1206,7 @@
    1.53 + 
    1.54 +     case GDK_BUTTON_RELEASE:
    1.55 +         if (event->button.button == 1 && !event_context->space_panning) {
    1.56 +-            Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.57 ++            Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.58 +             if (r->is_started()) {
    1.59 +                 // set "busy" cursor
    1.60 +                 desktop->setWaitingCursor();
    1.61 +diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
    1.62 +--- inkscape-0.47-orig/src/gradient-context.cpp	2010-02-18 08:45:58.000000000 -0500
    1.63 ++++ inkscape-0.47/src/gradient-context.cpp	2010-02-18 08:47:33.000000000 -0500
    1.64 +@@ -641,7 +641,7 @@
    1.65 +                 if (!event_context->within_tolerance) {
    1.66 +                     // we've been dragging, either do nothing (grdrag handles that),
    1.67 +                     // or rubberband-select if we have rubberband
    1.68 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.69 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.70 +                     if (r->is_started() && !event_context->within_tolerance) {
    1.71 +                         // this was a rubberband drag
    1.72 +                         if (r->getMode() == RUBBERBAND_MODE_RECT) {
    1.73 +diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
    1.74 +--- inkscape-0.47-orig/src/select-context.cpp	2010-02-18 08:45:58.000000000 -0500
    1.75 ++++ inkscape-0.47/src/select-context.cpp	2010-02-18 08:50:11.000000000 -0500
    1.76 +@@ -602,7 +602,7 @@
    1.77 +                     }
    1.78 +                     sc->item = NULL;
    1.79 +                 } else {
    1.80 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.81 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    1.82 +                     if (r->is_started() && !within_tolerance) {
    1.83 +                         // this was a rubberband drag
    1.84 +                         GSList *items = NULL;