Added gcc4.3 compatibility patch (fixes bug #219424).

Package-Manager: portage-2.1.5_rc6

4 files changed, 57 insertions, 5 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index c4d440eb50a9..9f53502783c7 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/qcad
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.25 2008/02/29 20:42:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.26 2008/04/27 12:54:27 markusle Exp $
+
+  27 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qcad-2.0.4.0-gcc43.patch, qcad-2.0.4.0-r5.ebuild:
+  Added gcc4.3 compatibility patch (fixes bug #219424). Thanks much to Peter
+  Alfredsen <peter.alfredsen@gmail.com>.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> ChangeLog:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/sci-misc/qcad/Manifest b/sci-misc/qcad/Manifest
index 83f23bc29068..07611ad19229 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -1,12 +1,13 @@
 AUX manual.patch-r1 841 RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 SHA1 f4ed3f70bd0cea6b32a82f9802c0884973940216 SHA256 f456451c59dea998a3b261874ca8c530c9f9e76629ba2fc4b88c0ee05c4b721a
 AUX qcad-2.0.4.0-1.src-gentoo.patch 2177 RMD160 b695c75f1c5269c320244185e3dd4d9b37867aac SHA1 2a495e2213e35e65dad7994329d3038df24d76f4 SHA256 de8383b1492659e924231005fde4db5e4bfb605c7fd25dcf73a89554945e4cdc
 AUX qcad-2.0.4.0-1.src-intptr.patch 1174 RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 SHA1 596dd7b7cd37646dbcf248c9726d0260dedcff86 SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1
+AUX qcad-2.0.4.0-gcc43.patch 1847 RMD160 a15ef3fd2d8df6ee1c598b73aa581b736b32e3ee SHA1 2c94b9f743d945582da725d1344c66dadc317eaa SHA256 f0add6f710264383e09788ac299f9fb967cd0ff110b96d4829ee51e7a6e277cf
 DIST qcad-2.0.4.0-1.src.tar.gz 3169984 RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 SHA1 50c2d022b1f48649e90df11fc71f5b2d4d63f4a0 SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe
 DIST qcad-manual-200404.tar.bz2 1648761 RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f SHA1 e907beb23b3bac2b3cb6ff7f23616454806251c0 SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6
 EBUILD qcad-2.0.4.0-r1.ebuild 2676 RMD160 9e8dca79e5ccd9c8af5cb0073d4cba46810ab6c5 SHA1 c53006c2a46103a4a176b427465557c043a49cf9 SHA256 e0105d05dd7896f00b01625ea93cc3305d26a19af015b34ac7fb9de6a999365a
 EBUILD qcad-2.0.4.0-r2.ebuild 2726 RMD160 994220ed3e842bb217b1fddc8a48878307852084 SHA1 9f4abd6850b8ff6e412cecac47514a0fffcc267a SHA256 fc31214766bfeeba5ecb955844dedc4ef30791b953f7786e041880effc3a20d6
 EBUILD qcad-2.0.4.0-r3.ebuild 2658 RMD160 5301a3855099e5de36f2835faf70ae458737bc37 SHA1 6c0bc0369f48a09b775011b6ddc6085ad692ac97 SHA256 32333c158c7ec82638c2b973da2452685612d880ce10301061ab42eaccd731b4
 EBUILD qcad-2.0.4.0-r4.ebuild 2773 RMD160 399fe081650a1791110b9f8df5707e7f1c4da6ae SHA1 1a87323d2d611802aa294eeaf3d0642bfd80a25b SHA256 5e627325970f4711968c59dc3dd934ae03a6fee58b5fba4c45036492acc38722
-EBUILD qcad-2.0.4.0-r5.ebuild 2797 RMD160 33a782c82600ba04cfa869faf32554e698b4ae6d SHA1 961ba8485be46ad3146999440a744e96db30c0bd SHA256 e87bed2ed11a845e5af8817dd96393783d0ebf4e3a1f91d358058f025203a6ee
-MISC ChangeLog 8251 RMD160 fabd80d5ff8ad79f8b49611e097dbaa2797fe91b SHA1 91d4a027339a339e49004f2167393c340ad93ef9 SHA256 d7896ac439af6813d68c044b1d190c425e26a574311e6f6e639b563dcde3e39b
+EBUILD qcad-2.0.4.0-r5.ebuild 2839 RMD160 f928de90806b8c243168f1b217915555831f49dd SHA1 f44f62c4afce87cc85bbdd7c02af4885db044507 SHA256 533279d08296b8b46c4a7598ee251f54db3813cfc2a7270dbfe93245e0eca4c9
+MISC ChangeLog 8485 RMD160 f5345e7271742da50074d98803f0bd2eaef7809d SHA1 c26255e7916ce0383bcbd2c758364501c21095f9 SHA256 d65c387ac609c405ea7babf8f14f3ef3178b23def1fc821c7915b577b2e205f0
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/qcad/files/qcad-2.0.4.0-gcc43.patch b/sci-misc/qcad/files/qcad-2.0.4.0-gcc43.patch
new file mode 100644
index 000000000000..bc68e81c715b
--- /dev/null
+++ b/sci-misc/qcad/files/qcad-2.0.4.0-gcc43.patch
@@ -0,0 +1,45 @@
+diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
+--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp	2004-09-14 16:13:01.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp	2008-04-27 08:35:47.000000000 -0400
+@@ -30,6 +30,7 @@
+ #endif // _MSC_VER > 1000
+ 
+ #include <stdio.h>
++#include <cstring>
+ 
+ #include "dl_writer_ascii.h"
+ #include "dl_exception.h"
+diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
+--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h	2004-09-14 16:13:01.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h	2008-04-27 08:35:48.000000000 -0400
+@@ -34,6 +34,7 @@
+ 
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ #include "dl_attributes.h"
+ 
+diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
+--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp	2004-09-14 16:13:03.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-04-27 08:35:48.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "rs_snapper.h"
+ #include "rs_point.h"
+ 
++#include <cstdlib>
+ 
+ RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
+                                    RS_GraphicView& graphicView)
+diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
+--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h	2004-09-14 16:13:02.000000000 -0400
++++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h	2008-04-27 08:35:48.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include "rs_line.h"
+ #include "rs_arc.h"
+ 
+-
++#include <cstdlib>
+ 
+ /**
+  * Class for getting information about entities. This includes
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
index d84dc8881599..b86d63c18e83 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.3 2008/02/29 20:42:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.4 2008/04/27 12:54:27 markusle Exp $
 
 inherit kde-functions eutils
 
@@ -37,6 +37,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
 	epatch "${FILESDIR}"/manual.patch-r1
 	epatch "${FILESDIR}"/${MY_P}-intptr.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 	cd "${S}"/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"