amd64 compilation patch, #134866

(Portage version: 2.1.1_pre1-r1)

6 files changed, 44 insertions, 2 deletions

diff --git a/sci-misc/qcad/ChangeLog b/sci-misc/qcad/ChangeLog
index db21b94c1560..87fbb3c0b2dd 100644
--- a/sci-misc/qcad/ChangeLog
+++ b/sci-misc/qcad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/qcad
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.14 2006/03/18 17:06:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.15 2006/06/24 06:28:51 squinky86 Exp $
+
+  24 Jun 2006; Jon Hood <squinky86@gentoo.org>
+  +files/qcad-2.0.4.0-1.src-intptr.patch, qcad-2.0.4.0-r3.ebuild:
+  Add amd64 patch for incompatible integer sizes. Thanks to myself and CAS,
+  Inc. <http://www.cas-inc.com/> for the patch, #134866.
 
   18 Mar 2006; Markus Rothe <corsair@gentoo.org> qcad-2.0.4.0-r3.ebuild:
   Added ~ppc64; bug #126533
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r1 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r1
index e83bcbbf94dc..53c49b93e844 100644
--- a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r1
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r1
@@ -1,2 +1,6 @@
 MD5 d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz 3169984
+RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 qcad-2.0.4.0-1.src.tar.gz 3169984
+SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe qcad-2.0.4.0-1.src.tar.gz 3169984
 MD5 a8cd3682b9405c0de6d5bd77d50da0f2 qcad-manual-200404.tar.bz2 1648761
+RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f qcad-manual-200404.tar.bz2 1648761
+SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6 qcad-manual-200404.tar.bz2 1648761
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r2 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r2
index e83bcbbf94dc..53c49b93e844 100644
--- a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r2
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r2
@@ -1,2 +1,6 @@
 MD5 d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz 3169984
+RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 qcad-2.0.4.0-1.src.tar.gz 3169984
+SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe qcad-2.0.4.0-1.src.tar.gz 3169984
 MD5 a8cd3682b9405c0de6d5bd77d50da0f2 qcad-manual-200404.tar.bz2 1648761
+RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f qcad-manual-200404.tar.bz2 1648761
+SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6 qcad-manual-200404.tar.bz2 1648761
diff --git a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3 b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3
index e83bcbbf94dc..53c49b93e844 100644
--- a/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3
+++ b/sci-misc/qcad/files/digest-qcad-2.0.4.0-r3
@@ -1,2 +1,6 @@
 MD5 d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz 3169984
+RMD160 8fca24b30e89734f12b02a3b131d364a73c590e7 qcad-2.0.4.0-1.src.tar.gz 3169984
+SHA256 08c243f790ed1e13d1f7b060e37baad10e7005bf518b746e5a6a190324eeffbe qcad-2.0.4.0-1.src.tar.gz 3169984
 MD5 a8cd3682b9405c0de6d5bd77d50da0f2 qcad-manual-200404.tar.bz2 1648761
+RMD160 600e82d5b17502b3d3e1f86f8e267c3e71b8f41f qcad-manual-200404.tar.bz2 1648761
+SHA256 ee93845b06100e3d43e839b8880e196203810bcc7786a3a91196a07df84e67c6 qcad-manual-200404.tar.bz2 1648761
diff --git a/sci-misc/qcad/files/qcad-2.0.4.0-1.src-intptr.patch b/sci-misc/qcad/files/qcad-2.0.4.0-1.src-intptr.patch
new file mode 100644
index 000000000000..6d8b6acca5b5
--- /dev/null
+++ b/sci-misc/qcad/files/qcad-2.0.4.0-1.src-intptr.patch
@@ -0,0 +1,24 @@
+diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
+--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
+@@ -849,7 +849,7 @@
+         os << " layer: NULL ";
+     } else {
+         os << " layer: " << e.layer->getName().latin1() << " ";
+-        os << " layer address: " << (int)(e.layer) << " ";
++        os << " layer address: " << (intptr_t)(e.layer) << " ";
+     }
+ 
+     os << e.pen << "\n";
+diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
+--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
++++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
+@@ -57,7 +57,7 @@
+     os << " name: " << l.getName().latin1()
+     << " pen: " << l.getPen()
+ 	<< " frozen: " << (int)l.isFrozen()
+-	<< " address: " << (int)(&l)
++	<< " address: " << (intptr_t)(&l)
+     << std::endl;
+     return os;
+ }
diff --git a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
index 214382f66314..1371c6e79404 100644
--- a/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
+++ b/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.2 2006/03/18 17:06:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.3 2006/06/24 06:28:51 squinky86 Exp $
 
 inherit kde-functions eutils
 
@@ -36,6 +36,7 @@ src_unpack() {
 	done
 	epatch ${FILESDIR}/${MY_P}-gentoo.patch
 	epatch ${FILESDIR}/manual.patch-r1
+	epatch ${FILESDIR}/${MY_P}-intptr.patch
 	cd ${S}/scripts
 	sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \
 		die "unable to add MAKEOPTS"