Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf009374affcf9dd5d88a992d573d0168972f86b
commit bf009374affcf9dd5d88a992d573d0168972f86b
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Mon Apr 19 22:00:41 2010 +0200
inkscape-0.47-2-i686
- add inkscape-0.47-gcc45.patch
- add inkscape-poppler.patch (the not-gcc45-specific part of the build
fix)
diff --git a/source/xapps-extra/inkscape/FrugalBuild
b/source/xapps-extra/inkscape/FrugalBuild
index 7a90d99..1b40e04 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=inkscape
pkgver=0.47
-pkgrel=1
+pkgrel=2
pkgdesc="A vector illustrator program"
depends=('openssl' 'lcms' 'cairomm' 'libgcc' 'atk' 'gtkmm>=2.10.10-3' 'glibmm'
'freetype2' 'libxcb>=1.3-1' \
'pango>=1.14.3' 'libgc>=7.0' 'glib2' 'gtkspell' 'popt' 'gtk+2>=2.10.7'
'python>=2.6' 'perl' \
@@ -16,7 +16,10 @@ archs=('i686' 'x86_64')
options=('scriptlet')
Finclude sourceforge
url="http://www.inkscape.org/";
-sha1sums=('aa39d5f7306edb21be4987651041bf50c13baf75')
+source=($source inkscape-0.47-gcc45.patch inkscape-poppler.patch)
+sha1sums=('aa39d5f7306edb21be4987651041bf50c13baf75' \
+ '68f66a3c152e1b472f9505dbac354f86a9059ee3' \
+ 'f277f6d3ce54c84e549affd9bfd3983bd1c9609c')
# TODO: java ?!
diff --git a/source/xapps-extra/inkscape/inkscape-0.47-gcc45.patch
b/source/xapps-extra/inkscape/inkscape-0.47-gcc45.patch
new file mode 100644
index 0000000..643b7ff
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-0.47-gcc45.patch
@@ -0,0 +1,83 @@
+http://bugs.gentoo.org/show_bug.cgi?id=305749
+
+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;
diff --git a/source/xapps-extra/inkscape/inkscape-poppler.patch
b/source/xapps-extra/inkscape/inkscape-poppler.patch
new file mode 100644
index 0000000..d2faeae
--- /dev/null
+++ b/source/xapps-extra/inkscape/inkscape-poppler.patch
@@ -0,0 +1,89 @@
+--- inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp~
2009-11-16 18:29:17.000000000 +0100
++++ inkscape-0.47/src/extension/internal/pdfinput/pdf-parser.cpp
2009-12-02 22:41:16.831452938 +0100
+@@ -809,7 +809,7 @@
+ blendingColorSpace = NULL;
+ isolated = knockout = gFalse;
+ if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj5);
++ blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+ }
+ obj5.free();
+ if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1009,9 @@
+ state->setFillPattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0], NULL);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj, NULL);
+ }
+ obj.free();
+ if (colorSpace) {
+@@ -1032,9 +1032,9 @@
+ state->setStrokePattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0], NULL);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj, NULL);
+ }
+ obj.free();
+ if (colorSpace) {
+@@ -1101,7 +1101,7 @@
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+ state->setFillPattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1145,7 +1145,7 @@
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
+ state->setStrokePattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1543,7 +1543,7 @@
+ double *matrix = NULL;
+ GBool savedState = gFalse;
+
+- if (!(shading = res->lookupShading(args[0].getName()))) {
++ if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
+ return;
+ }
+
+@@ -2507,7 +2507,7 @@
+ }
+ }
+ if (!obj1.isNull()) {
+- colorSpace = GfxColorSpace::parse(&obj1);
++ colorSpace = GfxColorSpace::parse(&obj1, NULL);
+ } else if (csMode == streamCSDeviceGray) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else if (csMode == streamCSDeviceRGB) {
+@@ -2592,7 +2592,7 @@
+ obj2.free();
+ }
+ }
+- maskColorSpace = GfxColorSpace::parse(&obj1);
++ maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+ obj1.free();
+ if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ goto err1;
+@@ -2767,7 +2767,7 @@
+ if (obj1.dictLookup(const_cast<char*>("S"),
&obj2)->isName(const_cast<char*>("Transparency"))) {
+ transpGroup = gTrue;
+ if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj3);
++ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+ }
+ obj3.free();
+ if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
