Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[inkscape] patch for gcc 4.4 / glibc 2.10.1 - bug #270720

  • Loading branch information...
commit c3c25de2fbb25369d73a18143909c1af89183622 1 parent 735107e
@wired authored
View
15 media-gfx/inkscape/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for media-gfx/inkscape
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*inkscape-0.46-r5 (25 May 2009)
+
+ 25 May 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
+ +inkscape-0.46-r5.ebuild, +files/inkscape-0.46-bug-174720-0.patch,
+ +files/inkscape-0.46-bug-174720-1.patch,
+ +files/inkscape-0.46-bug-214171.patch, +files/inkscape-0.46-gcc43.patch,
+ +files/inkscape-0.46-gcc44-glibc-2.10.patch,
+ +files/inkscape-0.46-gcc44_p2.patch, +files/inkscape-0.46-gcc44.patch,
+ +files/inkscape-0.46-poppler-0.8.3.patch:
+ patch for gcc 4.4 / glibc 2.10.1 - bug #270720
+
View
11 media-gfx/inkscape/Manifest
@@ -0,0 +1,11 @@
+AUX inkscape-0.46-bug-174720-0.patch 908 RMD160 ea73954482813cac9644d7dbe99c2f27d1ed9722 SHA1 354f42f93974519391492cda599887dbf89f24ea SHA256 0c42debc80f1cbc254a49f3a737bbadaa8a975d81a850b2448bd1267500ee66e
+AUX inkscape-0.46-bug-174720-1.patch 862 RMD160 c356fe9abfcc79575dcfe58b13240a7ad3939a00 SHA1 b6d3e2f821f0dc877ccb1ff3c5f751406daff767 SHA256 e038344cdb69176eaba5ff5f67e5eea5690608bd69e5b5e4e47b491d55a82394
+AUX inkscape-0.46-bug-214171.patch 952 RMD160 a946a3c2c191fe981c7756ffb9344c8da11f5291 SHA1 c7e492fcbebc8a417e61eb56f8bc70fe2e78eab5 SHA256 e4d74045d8e30289d6d7095461dbe3df083fd4fbc664f1944763bb6e71170226
+AUX inkscape-0.46-gcc43.patch 287 RMD160 68f9810c6dd7da96d7b1f73c76dab97ae3da7f25 SHA1 499d102c60122e6680b49a941f72b422b3d6d395 SHA256 dba42470e243e02e396b3bb148115ce80bf1f5a74df26a4911ebd9dcfa8dc221
+AUX inkscape-0.46-gcc44-glibc-2.10.patch 4633 RMD160 cfbffb8a3c24446d7c6315328cd6082c706f23d1 SHA1 f3f045c33308695b1096396d13522641e035719a SHA256 ea8661d312b5e89f91184ee69df8dc83a2e035e7c76dcb89376f7e133ed6825b
+AUX inkscape-0.46-gcc44.patch 6201 RMD160 692cd77ea2a25902f606a6dd033b355fc4ed08eb SHA1 927bd2e39d829e61ac990fc72a2fb2de3952c3ec SHA256 d43974b3f930d2201dcd0b16b26adebf755897673b27cb08096b3a0cee9c525d
+AUX inkscape-0.46-gcc44_p2.patch 1296 RMD160 3c3125bb92856e4f939328849dfef222a3a660ae SHA1 c20cb7caee6f9e27dac77ec3d0fea595e6ffec1c SHA256 35b8f651267431fc8b47bceb9edc6d0e9d9d985d752c40e3593f08e888b3da2e
+AUX inkscape-0.46-poppler-0.8.3.patch 1571 RMD160 7f1ac72f9a9790f0b8df3b3c00da48896a884fba SHA1 16ee2bb1e56d260c3e0b30f8bcaee8a2b0963412 SHA256 ed4109b09c05da48c040923056eaf406b44ca0cf515e7b3396495182280fe24c
+DIST inkscape-0.46.tar.gz 18615326 RMD160 449e07fa4caa71f20025774353d19cad674631ac SHA1 b7c53c6d2bc0de4ff24d4a6bee86359ff11bef27 SHA256 91861e0d72228116d31e07192f77fe9e0968d4ed06499829b2d66e641496993a
+EBUILD inkscape-0.46-r5.ebuild 2443 RMD160 bf351b842571ed1b925e903faf600a231ba07cf7 SHA1 39b0209888a36abc3071a91de93c94d3907d53ff SHA256 733ce6b0f7ec529ec6e44c9c076ad1e6fb2f6a900456b00bfdbd26eb4fd802b2
+MISC ChangeLog 618 RMD160 07e220ddfb5d591e1b0e1beda432a159e14ed964 SHA1 0132a550748e71aab6d561c61c2f52232017ae4f SHA256 f75509a3bdf123f8a1e0378b722c7df053bf4aad939ff45439200126cc478ec6
View
22 media-gfx/inkscape/files/inkscape-0.46-bug-174720-0.patch
@@ -0,0 +1,22 @@
+diff -pur inkscape-0.46.orig/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.orig/src/style.cpp 2008-03-11 05:19:45.000000000 +0100
++++ inkscape-0.46/src/style.cpp 2008-03-28 12:35:52.000000000 +0100
+@@ -2125,7 +2125,9 @@ static void
+ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
+ {
+ if ((paint->set && paint->currentcolor) || parent->currentcolor) {
++ bool isset = paint->set;
+ paint->clear();
++ paint->set = isset;
+ paint->currentcolor = TRUE;
+ paint->setColor(style->color.value.color);
+ return;
+@@ -3001,6 +3003,7 @@ sp_style_read_icolor(SPIPaint *paint, gc
+ guint32 const rgb0 = sp_svg_read_color(str, 0xff);
+ if (rgb0 != 0xff) {
+ paint->setColor(rgb0);
++ paint->set = TRUE;
+ paint->inherit = FALSE;
+ }
+ }
+Only in inkscape-0.46/src: style.cpp~
View
21 media-gfx/inkscape/files/inkscape-0.46-bug-174720-1.patch
@@ -0,0 +1,21 @@
+diff -pur --exclude='*~' inkscape-0.46.p1/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.p1/src/style.cpp 2008-04-08 09:23:25.000000000 +0200
++++ inkscape-0.46/src/style.cpp 2008-04-08 12:30:35.000000000 +0200
+@@ -3614,7 +3614,7 @@ sp_style_write_ipaint(gchar *b, gint con
+ css << "currentColor";
+ }
+
+- if ( paint->colorSet ) {
++ if ( paint->colorSet && !paint->currentcolor ) {
+ if ( !css.str().empty() ) {
+ css << " ";
+ }
+@@ -3623,7 +3623,7 @@ sp_style_write_ipaint(gchar *b, gint con
+ css << color_buf;
+ }
+
+- if (paint->value.color.icc) {
++ if (paint->value.color.icc && !paint->currentcolor) {
+ if ( !css.str().empty() ) {
+ css << " ";
+ }
View
21 media-gfx/inkscape/files/inkscape-0.46-bug-214171.patch
@@ -0,0 +1,21 @@
+diff -pur --exclude='*~' inkscape-0.46.p2/src/style.cpp inkscape-0.46/src/style.cpp
+--- inkscape-0.46.p2/src/style.cpp 2008-04-08 22:46:34.000000000 +0200
++++ inkscape-0.46/src/style.cpp 2008-04-08 23:29:29.000000000 +0200
+@@ -1582,7 +1582,7 @@ sp_style_merge_paint_prop_from_dying_par
+ * I haven't given this much attention. See comments below about
+ * currentColor, colorProfile, and relative URIs.
+ */
+- if (!child.set || child.inherit || child.currentcolor) {
++ if (!child.set || child.inherit) {
+ sp_style_merge_ipaint(style, &child, &parent);
+ child.set = parent.set;
+ child.inherit = parent.inherit;
+@@ -2142,6 +2142,8 @@ sp_style_merge_ipaint(SPStyle *style, SP
+ }
+ } else if ( parent->isColor() ) {
+ paint->setColor( parent->value.color );
++ } else if ( parent->isNoneSet() ) {
++ paint->noneSet = TRUE;
+ } else if ( parent->isNone() ) {
+ //
+ } else {
View
11 media-gfx/inkscape/files/inkscape-0.46-gcc43.patch
@@ -0,0 +1,11 @@
+diff -aur src.old/dom/dom.h src/dom/dom.h
+--- src.old/dom/dom.h 2008-03-29 16:56:05.000000000 +0100
++++ src/dom/dom.h 2008-03-29 17:14:30.000000000 +0100
+@@ -30,6 +30,7 @@
+ */
+
+ #include <vector>
++#include <cstring>
+
+ //# include this before the #ifdefs below
+ #include "domconfig.h"
View
176 media-gfx/inkscape/files/inkscape-0.46-gcc44-glibc-2.10.patch
@@ -0,0 +1,176 @@
+diff -ru src/dialogs/export.cpp src/dialogs/export.cpp
+--- src/dialogs/export.cpp 2009-05-25 02:21:18.067302917 +0300
++++ src/dialogs/export.cpp 2009-05-25 02:21:17.804059091 +0300
+@@ -20,6 +20,9 @@
+ # include "config.h"
+ #endif
+
++// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
++#include <png.h>
++
+ #include <gtk/gtk.h>
+ #include <gtkmm/box.h>
+ #include <gtkmm/buttonbox.h>
+@@ -60,7 +63,6 @@
+ #include "io/sys.h"
+
+ #include "helper/png-write.h"
+-#include <png.h>
+
+
+ #define SP_EXPORT_MIN_SIZE 1.0
+@@ -1041,9 +1043,7 @@
+ static gchar *
+ filename_add_extension (const gchar *filename, const gchar *extension)
+ {
+- gchar *dot;
+-
+- dot = strrchr (filename, '.');
++ const gchar *dot = strrchr (filename, '.');
+ if ( !dot )
+ return g_strconcat (filename, ".", extension, NULL);
+ {
+diff -ru src/document.cpp src/document.cpp
+--- src/document.cpp 2009-05-25 02:21:18.052299751 +0300
++++ src/document.cpp 2009-05-25 02:21:17.797058619 +0300
+@@ -746,7 +746,7 @@
+ }
+
+ if ( NULL != document_language ) {
+- gchar *pos = strchr(document_language, '_');
++ const char *pos = strchr(document_language, '_');
+ if ( NULL != pos ) {
+ return Glib::ustring(document_language, pos - document_language);
+ }
+diff -ru src/dom/io/domstream.cpp src/dom/io/domstream.cpp
+--- src/dom/io/domstream.cpp 2009-05-25 02:21:18.011048623 +0300
++++ src/dom/io/domstream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -34,6 +34,7 @@
+ *
+ */
+
++#include <cstdio>
+ #include <math.h>
+ #include <stdarg.h>
+
+diff -ru src/dom/io/gzipstream.cpp src/dom/io/gzipstream.cpp
+--- src/dom/io/gzipstream.cpp 2009-05-25 02:21:18.012048750 +0300
++++ src/dom/io/gzipstream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -29,6 +29,8 @@
+
+ #include "gzipstream.h"
+
++#include <cstdio>
++
+ #include "dom/util/ziptool.h"
+
+
+diff -ru src/dom/io/socket.cpp src/dom/io/socket.cpp
+--- src/dom/io/socket.cpp 2009-05-25 02:21:18.011048623 +0300
++++ src/dom/io/socket.cpp 2009-05-25 02:21:17.754336705 +0300
+@@ -35,6 +35,7 @@
+ #include <sys/filio.h> // needed on Solaris 8
+ #endif
+
++#include <cstdio>
+ #include "socket.h"
+ #include "dom/util/thread.h"
+
+diff -ru src/dom/io/uristream.cpp src/dom/io/uristream.cpp
+--- src/dom/io/uristream.cpp 2009-05-25 02:21:18.012048750 +0300
++++ src/dom/io/uristream.cpp 2009-05-25 02:21:17.755301212 +0300
+@@ -41,6 +41,7 @@
+
+
+ #include "uristream.h"
++#include <cstdio>
+
+
+
+diff -ru src/dom/lsimpl.cpp src/dom/lsimpl.cpp
+--- src/dom/lsimpl.cpp 2009-05-25 02:21:18.014048586 +0300
++++ src/dom/lsimpl.cpp 2009-05-25 02:21:17.760050211 +0300
+@@ -33,6 +33,7 @@
+ #include "lsimpl.h"
+
+ #include <stdarg.h>
++#include <cstdio>
+
+ namespace org
+ {
+diff -ru src/dom/svg/svgparser.cpp src/dom/svg/svgparser.cpp
+--- src/dom/svg/svgparser.cpp 2009-05-25 02:21:18.014048586 +0300
++++ src/dom/svg/svgparser.cpp 2009-05-25 02:21:17.759333709 +0300
+@@ -32,6 +32,7 @@
+ #include "dom/cssparser.h"
+ #include "dom/charclass.h"
+
++#include <cstdio>
+ #include <stdarg.h>
+
+ #define SVG_NAMESPACE "http://www.w3.org/2000/svg"
+diff -ru src/main.cpp src/main.cpp
+--- src/main.cpp 2009-05-25 02:21:18.069308689 +0300
++++ src/main.cpp 2009-05-25 02:21:17.810107556 +0300
+@@ -28,6 +28,9 @@
+ #endif
+ #include "path-prefix.h"
+
++// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
++#include <png.h>
++
+ #include <gtk/gtkmessagedialog.h>
+
+ #ifdef HAVE_IEEEFP_H
+@@ -111,7 +114,6 @@
+
+ #include "main-cmdlineact.h"
+
+-#include <png.h>
+ #include <errno.h>
+
+ enum {
+diff -ru src/prefix.cpp src/prefix.cpp
+--- src/prefix.cpp 2009-05-25 02:21:18.037083918 +0300
++++ src/prefix.cpp 2009-05-25 02:21:17.787058605 +0300
+@@ -355,7 +355,8 @@
+ char *
+ br_extract_dir (const char *path)
+ {
+- char *end, *result;
++ const char *end;
++ char *result;
+
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+@@ -390,7 +391,8 @@
+ char *
+ br_extract_prefix (const char *path)
+ {
+- char *end, *tmp, *result;
++ const char *end;
++ char *tmp, *result;
+
+ br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
+
+diff -ru src/sp-image.cpp src/sp-image.cpp
+--- src/sp-image.cpp 2009-05-25 02:21:18.023053851 +0300
++++ src/sp-image.cpp 2009-05-25 02:21:17.777050418 +0300
+@@ -17,6 +17,9 @@
+ # include "config.h"
+ #endif
+
++// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
++#include <png.h>
++
+ #include <cstring>
+ #include <string>
+ #include <libnr/nr-matrix-fns.h>
+@@ -41,7 +44,6 @@
+ #include "libnr/nr-matrix-fns.h"
+
+ #include "io/sys.h"
+-#include <png.h>
+ #if ENABLE_LCMS
+ #include "color-profile-fns.h"
+ #include "color-profile.h"
View
188 media-gfx/inkscape/files/inkscape-0.46-gcc44.patch
@@ -0,0 +1,188 @@
+diff -Naur inkscape-0.46-orig/src/2geom/sbasis-math.cpp inkscape-0.46/src/2geom/sbasis-math.cpp
+--- inkscape-0.46-orig/src/2geom/sbasis-math.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/sbasis-math.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -38,11 +38,11 @@
+ //#define ZERO 1e-3
+
+
+-namespace Geom {
++#include <math.h>
++#include <cstdio>
+
++namespace Geom {
+
+-#include <stdio.h>
+-#include <math.h>
+
+ //-|x|-----------------------------------------------------------------------
+ Piecewise<SBasis> abs(SBasis const &f){
+diff -Naur inkscape-0.46-orig/src/2geom/svg-path-parser.h inkscape-0.46/src/2geom/svg-path-parser.h
+--- inkscape-0.46-orig/src/2geom/svg-path-parser.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/2geom/svg-path-parser.h 2009-04-05 18:21:30.000000000 -0400
+@@ -32,6 +32,7 @@
+ #ifndef SEEN_SVG_PATH_PARSER_H
+ #define SEEN_SVG_PATH_PARSER_H
+
++#include <cstdio>
+ #include <vector>
+ #include <iterator>
+ #include <stdexcept>
+diff -Naur inkscape-0.46-orig/src/dom/domimpl.cpp inkscape-0.46/src/dom/domimpl.cpp
+--- inkscape-0.46-orig/src/dom/domimpl.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/domimpl.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -30,6 +30,8 @@
+
+ #include "domimpl.h"
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/domstream.h inkscape-0.46/src/dom/io/domstream.h
+--- inkscape-0.46-orig/src/dom/io/domstream.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/domstream.h 2009-04-05 18:21:30.000000000 -0400
+@@ -33,6 +33,8 @@
+
+ #include <dom/dom.h>
+
++#include <cstdio>
++
+ namespace org
+ {
+ namespace w3c
+diff -Naur inkscape-0.46-orig/src/dom/io/socket.h inkscape-0.46/src/dom/io/socket.h
+--- inkscape-0.46-orig/src/dom/io/socket.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/socket.h 2009-04-05 18:34:14.000000000 -0400
+@@ -29,6 +29,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include <cstdio>
+ #include "dom/dom.h"
+
+ #ifdef HAVE_SSL
+diff -Naur inkscape-0.46-orig/src/dom/io/stringstream.h inkscape-0.46/src/dom/io/stringstream.h
+--- inkscape-0.46-orig/src/dom/io/stringstream.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/io/stringstream.h 2009-04-05 18:22:50.000000000 -0400
+@@ -29,7 +29,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+-
++#include <cstdio>
+ #include "domstream.h"
+
+
+diff -Naur inkscape-0.46-orig/src/dom/svg/svgtypes.h inkscape-0.46/src/dom/svg/svgtypes.h
+--- inkscape-0.46-orig/src/dom/svg/svgtypes.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/svg/svgtypes.h 2009-04-05 18:21:30.000000000 -0400
+@@ -47,6 +47,7 @@
+ #include "dom/smil.h"
+
+
++#include <cstdio>
+ #include <math.h>
+
+
+diff -Naur inkscape-0.46-orig/src/dom/xpathtoken.h inkscape-0.46/src/dom/xpathtoken.h
+--- inkscape-0.46-orig/src/dom/xpathtoken.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/dom/xpathtoken.h 2009-04-05 18:21:30.000000000 -0400
+@@ -35,6 +35,7 @@
+
+ #include <math.h>
+
++#include <cstdio>
+ #include <vector>
+
+ namespace org
+diff -Naur inkscape-0.46-orig/src/io/inkscapestream.h inkscape-0.46/src/io/inkscapestream.h
+--- inkscape-0.46-orig/src/io/inkscapestream.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/io/inkscapestream.h 2009-04-05 18:21:30.000000000 -0400
+@@ -12,6 +12,7 @@
+ */
+
+
++#include <cstdio>
+ #include <glibmm.h>
+
+ namespace Inkscape
+diff -Naur inkscape-0.46-orig/src/io/sys.cpp inkscape-0.46/src/io/sys.cpp
+--- inkscape-0.46-orig/src/io/sys.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/io/sys.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -22,6 +22,8 @@
+ #include <glibmm/ustring.h>
+ #include <gtk/gtkmessagedialog.h>
+
++#include <cstdio>
++
+ #include "prefs-utils.h"
+ #include "sys.h"
+
+diff -Naur inkscape-0.46-orig/src/libavoid/vertices.h inkscape-0.46/src/libavoid/vertices.h
+--- inkscape-0.46-orig/src/libavoid/vertices.h 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libavoid/vertices.h 2009-04-05 18:21:30.000000000 -0400
+@@ -23,6 +23,7 @@
+ #ifndef AVOID_VERTICES_H
+ #define AVOID_VERTICES_H
+
++#include <cstdio>
+ #include <list>
+ #include <set>
+ #include <map>
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp inkscape-0.46/src/libnr/nr-matrix-fns.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix-fns.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libnr/nr-matrix-fns.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -1,5 +1,7 @@
+ #include <libnr/nr-matrix-fns.h>
+
++#include <cstdio>
++
+ namespace NR {
+
+ Matrix elliptic_quadratic_form(Matrix const &m) {
+diff -Naur inkscape-0.46-orig/src/libnr/nr-matrix.cpp inkscape-0.46/src/libnr/nr-matrix.cpp
+--- inkscape-0.46-orig/src/libnr/nr-matrix.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/libnr/nr-matrix.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -11,6 +11,7 @@
+ * This code is in public domain
+ */
+
++#include <cstdio>
+ #include <cstdlib>
+ #include "nr-matrix.h"
+
+diff -Naur inkscape-0.46-orig/src/streams-handles.cpp inkscape-0.46/src/streams-handles.cpp
+--- inkscape-0.46-orig/src/streams-handles.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/streams-handles.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -12,6 +12,7 @@
+ #include "streams-handles.h"
+ #include "uri.h"
+
++#include <cstdio>
+ #include <iostream>
+
+ namespace Inkscape {
+diff -Naur inkscape-0.46-orig/src/streams-zlib.cpp inkscape-0.46/src/streams-zlib.cpp
+--- inkscape-0.46-orig/src/streams-zlib.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/streams-zlib.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -9,6 +9,7 @@
+ * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
+ */
+
++#include <cstdio>
+ #include <cstring>
+ #include <string>
+ #include <string.h>
+diff -Naur inkscape-0.46-orig/src/xml/event.cpp inkscape-0.46/src/xml/event.cpp
+--- inkscape-0.46-orig/src/xml/event.cpp 2009-04-05 16:47:42.000000000 -0400
++++ inkscape-0.46/src/xml/event.cpp 2009-04-05 18:21:30.000000000 -0400
+@@ -14,6 +14,7 @@
+ */
+
+ #include <glib.h> // g_assert()
++#include <cstdio>
+
+ #include "event.h"
+ #include "event-fns.h"
+
View
29 media-gfx/inkscape/files/inkscape-0.46-gcc44_p2.patch
@@ -0,0 +1,29 @@
+One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
+--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100
++++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-03-02 17:05:57.000000000 +0100
+@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
+ char *search = (char *) g_strndup(xlink, 30);
+ if (strstr(search, "base64") != (char*)NULL) {
+ // 7 = strlen("base64") + strlen(",")
+- char* pureBase64 = strstr(xlink, "base64") + 7;
++ const char* pureBase64 = strstr(xlink, "base64") + 7;
+ Magick::Blob blob;
+ blob.base64(pureBase64);
+ image->read(blob);
+diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
+--- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000 +0100
++++ inkscape/src/libnr/nr-object.cpp 2009-03-02 17:06:58.000000000 +0100
+@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
+ );
+ memset(object, 0xf0, c->isize);
+
+- object->klass = c;
+ c->cpp_ctor(object);
++ object->klass = c;
+ nr_class_tree_object_invoke_init (c, object);
+
+ return object;
View
42 media-gfx/inkscape/files/inkscape-0.46-poppler-0.8.3.patch
@@ -0,0 +1,42 @@
+diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
+--- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:26:20.000000000 +0200
++++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp 2008-06-05 00:51:47.000000000 +0200
+@@ -2194,11 +2194,11 @@
+ void PdfParser::doShowText(GooString *s) {
+ GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+ CharCode code;
+- Unicode u[8];
++ Unicode *u = NULL;
+ double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
+ double originX, originY, tOriginX, tOriginY;
+ double oldCTM[6], newCTM[6];
+ double *mat;
+ Object charProc;
+@@ -2242,11 +2242,11 @@
+ oldParser = parser;
+ p = s->getCString();
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++ &u, &uLen,
+ &dx, &dy, &originX, &originY);
+ dx = dx * state->getFontSize() + state->getCharSpace();
+ if (n == 1 && *p == ' ') {
+ dx += state->getWordSpace();
+ }
+@@ -2291,11 +2291,11 @@
+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+ p = s->getCString();
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+- u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
++ &u, &uLen,
+ &dx, &dy, &originX, &originY);
+
+ if (wMode) {
+ dx *= state->getFontSize();
+ dy = dy * state->getFontSize() + state->getCharSpace();
View
88 media-gfx/inkscape/inkscape-0.46-r5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.46-r5.ebuild,v 1.13 2009/05/08 02:01:53 loki_val Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="A SVG based generic vector-drawing program"
+HOMEPAGE="http://www.inkscape.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+IUSE="dia doc gnome inkjar jabber lcms mmx perl postscript spell wmf"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=virtual/poppler-glib-0.8.3[cairo]
+ dev-cpp/glibmm
+ >=dev-cpp/gtkmm-2.10.0
+ >=dev-libs/boehm-gc-6.4
+ dev-libs/boost
+ >=dev-libs/glib-2.6.5
+ >=dev-libs/libsigc++-2.0.12
+ >=dev-libs/libxml2-2.6.20
+ >=dev-libs/libxslt-1.0.15
+ dev-libs/popt
+ dev-python/lxml
+ dev-python/pyxml
+ media-gfx/imagemagick
+ media-libs/fontconfig
+ >=media-libs/freetype-2
+ media-libs/libpng
+ x11-libs/libXft
+ >=x11-libs/gtk+-2.10.7
+ >=x11-libs/pango-1.4.0
+ gnome? ( >=gnome-base/gnome-vfs-2.0 )
+ lcms? ( >=media-libs/lcms-1.14 )
+ perl? (
+ dev-perl/XML-Parser
+ dev-perl/XML-XQL
+ )
+ spell? ( app-text/gtkspell )"
+
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-python/numpy
+ dia? ( app-office/dia )
+ postscript? ( >=media-gfx/pstoedit-3.44[plotutils] media-gfx/skencil )
+ wmf? ( media-libs/libwmf )"
+
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ dev-util/pkgconfig
+ x11-libs/libX11
+ >=dev-util/intltool-0.29"
+
+pkg_setup() {
+ G2CONF="${G2CONF} --with-xft"
+ G2CONF="${G2CONF} $(use_with spell gtkspell)"
+ G2CONF="${G2CONF} $(use_enable jabber inkboard)"
+ G2CONF="${G2CONF} $(use_enable mmx)"
+ G2CONF="${G2CONF} $(use_with inkjar)"
+ G2CONF="${G2CONF} $(use_with gnome gnome-vfs)"
+ G2CONF="${G2CONF} $(use_enable lcms)"
+ G2CONF="${G2CONF} $(use_with perl)"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+ epatch "${FILESDIR}"/${P}-gcc44_p2.patch
+ epatch "${FILESDIR}"/${P}-gcc44-glibc-2.10.patch
+ epatch "${FILESDIR}"/${P}-poppler-0.8.3.patch
+ epatch "${FILESDIR}"/${P}-bug-174720-0.patch
+ epatch "${FILESDIR}"/${P}-bug-174720-1.patch
+ epatch "${FILESDIR}"/${P}-bug-214171.patch
+
+ gnome2_src_prepare
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
Please sign in to comment.
Something went wrong with that request. Please try again.