SliTaz Repositories

     1.1 --- a/inkscape/receipt	Thu Jul 22 23:03:19 2010 +0200
     1.2 +++ b/inkscape/receipt	Thu Jul 22 23:54:43 2010 +0200
     1.3 @@ -21,6 +21,11 @@
     1.4  	cd $src
     1.5  	sed -i -e '\|^packaging/autopackage/default\.apspec$|d' configure.ac
     1.6  #	InkBoard is now disabled by default, --enable-inkboard now exists
     1.7 +
     1.8 +	# Fix build with gcc45
     1.9 +	# http://launchpadlibrarian.net/39366738/inkscape-0.47-gcc45.patch
    1.10 +	patch -p1 < ../stuff/inkscape-0.47-gcc45.patch || exit 1
    1.11 +	
    1.12  	./configure \
    1.13  		--prefix=/usr \
    1.14  		--mandir=/usr/share/man \

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/inkscape/stuff/inkscape-0.47-gcc45.patch	Thu Jul 22 23:54:43 2010 +0200
     2.3 @@ -0,0 +1,81 @@
     2.4 +diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp
     2.5 +--- inkscape-0.47-orig/src/eraser-context.cpp	2010-02-18 08:45:58.000000000 -0500
     2.6 ++++ inkscape-0.47/src/eraser-context.cpp	2010-02-18 08:46:26.000000000 -0500
     2.7 +@@ -749,7 +749,7 @@
     2.8 +                 if ( eraserMode ) {
     2.9 +                     toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds);
    2.10 +                 } else {
    2.11 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.12 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.13 +                     toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints());
    2.14 +                 }
    2.15 +                 toWorkOn = g_slist_remove( toWorkOn, acid );
    2.16 +diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp
    2.17 +--- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp	2010-02-18 08:45:58.000000000 -0500
    2.18 ++++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp	2010-02-18 09:07:54.000000000 -0500
    2.19 +@@ -161,7 +161,7 @@
    2.20 + 	mywriter writer;
    2.21 + 	sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0);
    2.22 + 
    2.23 +-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str())));
    2.24 ++    Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str())));
    2.25 + 	g_free(xml_str);
    2.26 +     return;
    2.27 + }
    2.28 +diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp
    2.29 +--- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp	2010-02-18 08:45:58.000000000 -0500
    2.30 ++++ inkscape-0.47/src/extension/internal/filter/filter.cpp	2010-02-18 09:21:06.000000000 -0500
    2.31 +@@ -217,7 +217,7 @@
    2.32 +                 "<menu-tip>%s</menu-tip>\n"
    2.33 +             "</effect>\n"
    2.34 +         "</inkscape-extension>\n", name, id, submenu, tip);
    2.35 +-    Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter));
    2.36 ++    Inkscape::Extension::build_from_mem(xml_str, new Filter(filter));
    2.37 + 	g_free(xml_str);
    2.38 +     return;
    2.39 + }
    2.40 +diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp
    2.41 +--- inkscape-0.47-orig/src/flood-context.cpp	2010-02-18 08:45:58.000000000 -0500
    2.42 ++++ inkscape-0.47/src/flood-context.cpp	2010-02-18 08:48:16.000000000 -0500
    2.43 +@@ -900,7 +900,7 @@
    2.44 +     if (is_point_fill) {
    2.45 +         fill_points.push_back(Geom::Point(event->button.x, event->button.y));
    2.46 +     } else {
    2.47 +-        Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.48 ++        Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.49 +         fill_points = r->getPoints();
    2.50 +     }
    2.51 + 
    2.52 +@@ -1206,7 +1206,7 @@
    2.53 + 
    2.54 +     case GDK_BUTTON_RELEASE:
    2.55 +         if (event->button.button == 1 && !event_context->space_panning) {
    2.56 +-            Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.57 ++            Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.58 +             if (r->is_started()) {
    2.59 +                 // set "busy" cursor
    2.60 +                 desktop->setWaitingCursor();
    2.61 +diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp
    2.62 +--- inkscape-0.47-orig/src/gradient-context.cpp	2010-02-18 08:45:58.000000000 -0500
    2.63 ++++ inkscape-0.47/src/gradient-context.cpp	2010-02-18 08:47:33.000000000 -0500
    2.64 +@@ -641,7 +641,7 @@
    2.65 +                 if (!event_context->within_tolerance) {
    2.66 +                     // we've been dragging, either do nothing (grdrag handles that),
    2.67 +                     // or rubberband-select if we have rubberband
    2.68 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.69 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.70 +                     if (r->is_started() && !event_context->within_tolerance) {
    2.71 +                         // this was a rubberband drag
    2.72 +                         if (r->getMode() == RUBBERBAND_MODE_RECT) {
    2.73 +diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp
    2.74 +--- inkscape-0.47-orig/src/select-context.cpp	2010-02-18 08:45:58.000000000 -0500
    2.75 ++++ inkscape-0.47/src/select-context.cpp	2010-02-18 08:50:11.000000000 -0500
    2.76 +@@ -602,7 +602,7 @@
    2.77 +                     }
    2.78 +                     sc->item = NULL;
    2.79 +                 } else {
    2.80 +-                    Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.81 ++                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
    2.82 +                     if (r->is_started() && !within_tolerance) {
    2.83 +                         // this was a rubberband drag
    2.84 +                         GSList *items = NULL;