gcc41 fix for inkscape

(Portage version: 2.0.53_rc7)

3 files changed, 103 insertions, 2 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 72aa4c405bd8..447d03dff690 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.42 2005/11/27 19:53:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.43 2005/11/28 19:13:39 hanno Exp $
+
+  28 Nov 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/inkscape-0.43-gcc41.patch, inkscape-0.43.ebuild:
+  Fix for gcc 4.1.
 
   27 Nov 2005; Joseph Jezak <josejx@gentoo.org> inkscape-0.43.ebuild:
   Marked ppc stable for bug #109993.
diff --git a/media-gfx/inkscape/files/inkscape-0.43-gcc41.patch b/media-gfx/inkscape/files/inkscape-0.43-gcc41.patch
new file mode 100644
index 000000000000..e11de06b645c
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.43-gcc41.patch
@@ -0,0 +1,94 @@
+--- src/dialogs/tiledialog.h
++++ src/dialogs/tiledialog.h
+@@ -58,7 +58,7 @@
+     /**
+      * Respond to selection change
+      */
+-    void TileDialog::updateSelection();
++    void updateSelection();
+ 
+ 
+     /**
+--- src/extension/internal/ps.h
++++ src/extension/internal/ps.h
+@@ -36,10 +36,10 @@
+ 
+ 	void print_bpath (SVGOStringStream &os, const NArtBpath *bp);
+ 
+-	void PrintPS::print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
+-	void PrintPS::print_stroke_style (SVGOStringStream &os, const SPStyle *style);
++	void print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
++	void print_stroke_style (SVGOStringStream &os, const SPStyle *style);
+ 
+-	const char* PrintPS::PSFontName (const SPStyle *style);
++	const char* PSFontName (const SPStyle *style);
+ 
+ 	unsigned int print_image (FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs,
+ 				       const NRMatrix *transform);
+--- src/jabber_whiteboard/pedroxmpp.cpp
++++ src/jabber_whiteboard/pedroxmpp.cpp
+@@ -614,7 +614,7 @@
+     static void hash(unsigned char *dataIn,
+                      unsigned long len, unsigned char *digest);
+ 
+-    static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len);
++    static DOMString hashHex(unsigned char *dataIn, unsigned long len);
+ 
+     /**
+      *  Initialize the context (also zeroizes contents)
+--- src/jabber_whiteboard/pedroxmpp.h
++++ src/jabber_whiteboard/pedroxmpp.h
+@@ -746,7 +746,7 @@
+      *
+      */
+     virtual std::vector<XmppUser>
+-          XmppClient::groupChatGetUserList(const DOMString &groupJid);
++          groupChatGetUserList(const DOMString &groupJid);
+ 
+     /**
+      *
+--- src/libavoid/connector.h
++++ src/libavoid/connector.h
+@@ -59,7 +59,7 @@
+         bool isInitialised(void);
+         void unInitialise(void);
+         void setCallback(void (*cb)(void *), void *ptr);
+-        void ConnRef::handleInvalid(void);
++        void handleInvalid(void);
+         int generatePath(Point p0, Point p1);
+         void makePathInvalid(void);
+         
+--- src/livarot/Path.h
++++ src/livarot/Path.h
+@@ -198,7 +198,7 @@
+   cut_position*    CurvilignToPosition(int nbCv,double* cvAbs,int &nbCut);
+   cut_position    PointToCurvilignPosition(NR::Point const &pos) const;
+   //Should this take a cut_position as a param?
+-  double           Path::PositionToLength(int piece, double t);
++  double           PositionToLength(int piece, double t);
+   
+   // caution: not tested on quadratic b-splines, most certainly buggy
+   void             ConvertPositionsToMoveTo(int nbPos,cut_position* poss);
+--- src/ui/dialog/aboutbox.h
++++ src/ui/dialog/aboutbox.h
+@@ -28,7 +28,7 @@
+ class AboutBoxChild: public Gtk::Dialog
+ {
+ public:
+-    AboutBoxChild::AboutBoxChild(Gtk::Window& parent, gchar * title)
++    AboutBoxChild(Gtk::Window& parent, gchar * title)
+         : Gtk::Dialog(title,parent) {};
+ protected:
+     virtual void         on_response(int response_id);
+
+--- src/ui/dialog/align-and-distribute.cpp
++++ src/ui/dialog/align-and-distribute.cpp
+@@ -955,7 +955,7 @@
+         break;
+ 
+     } // end of switch statement
+-    return NULL;
++    return (std::list<SPItem *>::iterator)NULL;
+ }
+ 
+ AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {
diff --git a/media-gfx/inkscape/inkscape-0.43.ebuild b/media-gfx/inkscape/inkscape-0.43.ebuild
index a3da550170e0..7d261fd8e43b 100644
--- a/media-gfx/inkscape/inkscape-0.43.ebuild
+++ b/media-gfx/inkscape/inkscape-0.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.43.ebuild,v 1.6 2005/11/27 19:53:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.43.ebuild,v 1.7 2005/11/28 19:13:39 hanno Exp $
 
 inherit gnome2 eutils
 
@@ -59,6 +59,9 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
+
+	epatch ${FILESDIR}/inkscape-0.43-gcc41.patch
+
 	autoconf || die
 	libtoolize --copy --force || die
 }