Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-misc
diff options
context:
space:
mode:
authorJon Hood <squinky86@gentoo.org>2006-06-24 06:28:51 +0000
committerJon Hood <squinky86@gentoo.org>2006-06-24 06:28:51 +0000
commit7ff13d321bf0ec419447b6a81f97ec886c1f97ef (patch)
treefffebe3c0b9fff18c7138794f95b3ec69b436eb8 /sci-misc
parentLet portage strip binaries #137574 by Tristan Heaven. (diff)
downloadhistorical-7ff13d321bf0ec419447b6a81f97ec886c1f97ef.tar.gz
historical-7ff13d321bf0ec419447b6a81f97ec886c1f97ef.tar.bz2
historical-7ff13d321bf0ec419447b6a81f97ec886c1f97ef.zip
amd64 compilation patch, #134866
Package-Manager: portage-2.1.1_pre1-r1
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/qcad/ChangeLog7
-rw-r--r--sci-misc/qcad/Manifest45
-rw-r--r--sci-misc/qcad/files/digest-qcad-2.0.4.0-r14
-rw-r--r--sci-misc/qcad/files/digest-qcad-2.0.4.0-r24
-rw-r--r--sci-misc/qcad/files/digest-qcad-2.0.4.0-r34
-rw-r--r--sci-misc/qcad/files/qcad-2.0.4.0-1.src-intptr.patch24
-rw-r--r--sci-misc/qcad/qcad-2.0.4.0-r3.ebuild3
7 files changed, 83 insertions, 8 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/Manifest b/sci-misc/qcad/Manifest
index d2705a45e033..f61719a03949 100644
--- a/sci-misc/qcad/Manifest
+++ b/sci-misc/qcad/Manifest
@@ -1,10 +1,43 @@
-MD5 ded76dc2d82333c85007ecf496d4f3d2 ChangeLog 6644
-MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r1 143
-MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r2 143
-MD5 4d37f63dec6f0a0937438c9308f232a7 files/digest-qcad-2.0.4.0-r3 143
+AUX manual.patch-r1 841 RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 SHA1 f4ed3f70bd0cea6b32a82f9802c0884973940216 SHA256 f456451c59dea998a3b261874ca8c530c9f9e76629ba2fc4b88c0ee05c4b721a
MD5 c79cda60b6383bbd7cd5c59e5975444e files/manual.patch-r1 841
+RMD160 d40cc6f3ae74af87ae051586c3f0bb8715c5dbe7 files/manual.patch-r1 841
+SHA256 f456451c59dea998a3b261874ca8c530c9f9e76629ba2fc4b88c0ee05c4b721a files/manual.patch-r1 841
+AUX qcad-2.0.4.0-1.src-gentoo.patch 2177 RMD160 b695c75f1c5269c320244185e3dd4d9b37867aac SHA1 2a495e2213e35e65dad7994329d3038df24d76f4 SHA256 de8383b1492659e924231005fde4db5e4bfb605c7fd25dcf73a89554945e4cdc
MD5 03a389a58ed129eda4567585a4094a33 files/qcad-2.0.4.0-1.src-gentoo.patch 2177
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+RMD160 b695c75f1c5269c320244185e3dd4d9b37867aac files/qcad-2.0.4.0-1.src-gentoo.patch 2177
+SHA256 de8383b1492659e924231005fde4db5e4bfb605c7fd25dcf73a89554945e4cdc files/qcad-2.0.4.0-1.src-gentoo.patch 2177
+AUX qcad-2.0.4.0-1.src-intptr.patch 1174 RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 SHA1 596dd7b7cd37646dbcf248c9726d0260dedcff86 SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1
+MD5 92f900fe1fd3a8f841232b587b49c7da files/qcad-2.0.4.0-1.src-intptr.patch 1174
+RMD160 131cd2473686ef51326d73f7b2bcddc5b99eedb3 files/qcad-2.0.4.0-1.src-intptr.patch 1174
+SHA256 0b7c0ee65e369aa46e9b0652b5f83fd1961c38f1fee10e9bf86cc1daa19cb7f1 files/qcad-2.0.4.0-1.src-intptr.patch 1174
+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 2653 RMD160 54bfcc9ae706bb7df47dbe15065cb4b3ef45cd35 SHA1 cb98a32b2ba6fdaa595648f7356b90e73ba07836 SHA256 dacaefda5d8d558f33e2fd722c13e9e6189d51a36c5a807d6eb48fb3e5d5dc70
MD5 153726eb90066d26218441f810bd5c12 qcad-2.0.4.0-r1.ebuild 2653
+RMD160 54bfcc9ae706bb7df47dbe15065cb4b3ef45cd35 qcad-2.0.4.0-r1.ebuild 2653
+SHA256 dacaefda5d8d558f33e2fd722c13e9e6189d51a36c5a807d6eb48fb3e5d5dc70 qcad-2.0.4.0-r1.ebuild 2653
+EBUILD qcad-2.0.4.0-r2.ebuild 2697 RMD160 920679ef1919946ab9ce00ebfbfb1085fa9504b4 SHA1 a3322f1d55ca10b8a66b475c1cf5d9217ec7f94a SHA256 1b17f509c2c9ba83513129550b0c6996cac2ec9979ebd8ddf1c75f145acad1e6
MD5 909354e6713c6ca98f4b94c97233eb4f qcad-2.0.4.0-r2.ebuild 2697
-MD5 deb28c26b323012e328da8a43a1cd911 qcad-2.0.4.0-r3.ebuild 2587
+RMD160 920679ef1919946ab9ce00ebfbfb1085fa9504b4 qcad-2.0.4.0-r2.ebuild 2697
+SHA256 1b17f509c2c9ba83513129550b0c6996cac2ec9979ebd8ddf1c75f145acad1e6 qcad-2.0.4.0-r2.ebuild 2697
+EBUILD qcad-2.0.4.0-r3.ebuild 2630 RMD160 ea8bd38b69e90c77bf603f598ffc99a2d56f6ba7 SHA1 9b42a4e7c729fafcbaa7e632245dddb1b9da4cf8 SHA256 5a487e5eb786d36f886ae4cb30d5c4e41e2b301509bd4da4885ca976ad8bf5d8
+MD5 7e5141b252c538051325946ea9c5d1bf qcad-2.0.4.0-r3.ebuild 2630
+RMD160 ea8bd38b69e90c77bf603f598ffc99a2d56f6ba7 qcad-2.0.4.0-r3.ebuild 2630
+SHA256 5a487e5eb786d36f886ae4cb30d5c4e41e2b301509bd4da4885ca976ad8bf5d8 qcad-2.0.4.0-r3.ebuild 2630
+MISC ChangeLog 6893 RMD160 154dfea18a432cb036afaf1af58cd8f302ad79b9 SHA1 903b2a00f5e6dc4d83058f59a9912790c4ccbf86 SHA256 710daf91efef0de486b41dc9c33b2599b20e03572928ecb0d1a3bc2d36787368
+MD5 4deb239452fe408b8a22cbc7c64d3cc2 ChangeLog 6893
+RMD160 154dfea18a432cb036afaf1af58cd8f302ad79b9 ChangeLog 6893
+SHA256 710daf91efef0de486b41dc9c33b2599b20e03572928ecb0d1a3bc2d36787368 ChangeLog 6893
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r1 521
+RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r1 521
+SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r1 521
+MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r2 521
+RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r2 521
+SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r2 521
+MD5 16c722269ece6b7d9f2556c498249056 files/digest-qcad-2.0.4.0-r3 521
+RMD160 b23a2b66f326a13c88176f1f80e732b4a46c44f7 files/digest-qcad-2.0.4.0-r3 521
+SHA256 e97d80ff9962624287a04e74747c8d1ef78dbe6fb1af5e6807767deee8cb85f3 files/digest-qcad-2.0.4.0-r3 521
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"