From 971372f6d34047da1aaed96861de56e4f37d58ae Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 26 Oct 2006 10:21:07 +0000 Subject: dev-cpp/libthrowable: make it build on 64bit system (probably, tests will follow) svn path=/sunrise/; revision=1674 --- dev-cpp/libthrowable/ChangeLog | 6 +++ dev-cpp/libthrowable/Manifest | 24 ++++++--- .../libthrowable-0.9.5-internal.cc-64bit.patch | 60 ++++++++++++++++++++++ .../libthrowable-0.9.5-internal.h-64bit.patch | 11 ++++ dev-cpp/libthrowable/libthrowable-0.9.5.ebuild | 9 ++++ 5 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.cc-64bit.patch create mode 100644 dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.h-64bit.patch (limited to 'dev-cpp/libthrowable') diff --git a/dev-cpp/libthrowable/ChangeLog b/dev-cpp/libthrowable/ChangeLog index bf5ec2fe6..dc14e3f8a 100644 --- a/dev-cpp/libthrowable/ChangeLog +++ b/dev-cpp/libthrowable/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Oct 2006; Christian Faulhammer (opfer) + libthrowable-0.9.5.ebuild, + +files/libthrowable-0.9.5-internal.cc-64bit.patch, + +files/libthrowable-0.9.5-internal.h-64bit.patch: + make it build on 64bit system (probably, tests will follow) + 25 Oct 2006; Christian Faulhammer (opfer) libthrowable-0.9.5.ebuild: keyworded ~ppc, thanks to Chris White for testing it diff --git a/dev-cpp/libthrowable/Manifest b/dev-cpp/libthrowable/Manifest index e2e1161ad..ed1759099 100644 --- a/dev-cpp/libthrowable/Manifest +++ b/dev-cpp/libthrowable/Manifest @@ -1,12 +1,20 @@ +AUX libthrowable-0.9.5-internal.cc-64bit.patch 1946 RMD160 8f72231c94c9f189758cf4498af851ea2ad815ba SHA1 28f2f1d58c9b33953c4d7c01b203de8ae705333a SHA256 b912d918dde5518bf641f52f2e68d48d04a76f895feba3e2889c0fa7a6cee82c +MD5 530f97ada7ea64ae2ab090909c9883fd files/libthrowable-0.9.5-internal.cc-64bit.patch 1946 +RMD160 8f72231c94c9f189758cf4498af851ea2ad815ba files/libthrowable-0.9.5-internal.cc-64bit.patch 1946 +SHA256 b912d918dde5518bf641f52f2e68d48d04a76f895feba3e2889c0fa7a6cee82c files/libthrowable-0.9.5-internal.cc-64bit.patch 1946 +AUX libthrowable-0.9.5-internal.h-64bit.patch 297 RMD160 70b366156e9279350dd290c2a5e595c48597c6fa SHA1 dacdd2b6d21ff9841406414d35957595f75b6fff SHA256 a294835e0e0e8524e42fa7611a2f2872af610fba3c51c619e485da6dbeeee8d5 +MD5 15c5f616e8bfad5faa11c1291fb01df1 files/libthrowable-0.9.5-internal.h-64bit.patch 297 +RMD160 70b366156e9279350dd290c2a5e595c48597c6fa files/libthrowable-0.9.5-internal.h-64bit.patch 297 +SHA256 a294835e0e0e8524e42fa7611a2f2872af610fba3c51c619e485da6dbeeee8d5 files/libthrowable-0.9.5-internal.h-64bit.patch 297 DIST libthrowable-0.9.5.tar.bz2 259609 RMD160 c63f773f6bec1a8b4c292ba14041339c12c96486 SHA1 6079db30e2eec0712d54a5352d554979b3658157 SHA256 6b926fed9bbddd7af562e3c2b10f73e855df5e20e094d371f5d4af089c7c3024 -EBUILD libthrowable-0.9.5.ebuild 1283 RMD160 c8acf2fa6d19ca1bee0a4252808094eec0b84a09 SHA1 8ef7de5859aec481b5a2e091004f55b17dee0c83 SHA256 8853c6b396284dd137140d5743ce88eca51097060d3329eec3ddb3d2a740bb52 -MD5 859f7ad436e4f93e6b4c9ea0b98e82b0 libthrowable-0.9.5.ebuild 1283 -RMD160 c8acf2fa6d19ca1bee0a4252808094eec0b84a09 libthrowable-0.9.5.ebuild 1283 -SHA256 8853c6b396284dd137140d5743ce88eca51097060d3329eec3ddb3d2a740bb52 libthrowable-0.9.5.ebuild 1283 -MISC ChangeLog 972 RMD160 01346bef763ddce982e12d4b12d7386cc5f0ebf4 SHA1 6bc451bb08becc299eddc2f4d8e4648ed9b5f025 SHA256 98abada1aa9c01375d73bc45cf2deb6e0be38e39ae4e28a0f3f700fa229501c2 -MD5 f74fdd7d5cc220f8b7f2560c9a17a59f ChangeLog 972 -RMD160 01346bef763ddce982e12d4b12d7386cc5f0ebf4 ChangeLog 972 -SHA256 98abada1aa9c01375d73bc45cf2deb6e0be38e39ae4e28a0f3f700fa229501c2 ChangeLog 972 +EBUILD libthrowable-0.9.5.ebuild 1484 RMD160 9205f7bcaf31d93e1f181b2cdb188127a5ab949c SHA1 b7fa517dc1d98b585f4d85fdec2c2f62a87542ae SHA256 74c443c4742b454535211f797ba54f0364055869f0542cc15c44f10e1b9de0ce +MD5 af094a24cdb106f827b5f7f87fac54fc libthrowable-0.9.5.ebuild 1484 +RMD160 9205f7bcaf31d93e1f181b2cdb188127a5ab949c libthrowable-0.9.5.ebuild 1484 +SHA256 74c443c4742b454535211f797ba54f0364055869f0542cc15c44f10e1b9de0ce libthrowable-0.9.5.ebuild 1484 +MISC ChangeLog 1237 RMD160 21e4e08905f6d73d08c90bd06d40d725881469b3 SHA1 6a72310f281c29d80eff3443b22b18a2f50db869 SHA256 72addab62900a626fc5094c916a2bc7ee6fe770e7a1ecb0fecd24edd005602ca +MD5 be7e81f62c3f5ba04ff127e92ba3185a ChangeLog 1237 +RMD160 21e4e08905f6d73d08c90bd06d40d725881469b3 ChangeLog 1237 +SHA256 72addab62900a626fc5094c916a2bc7ee6fe770e7a1ecb0fecd24edd005602ca ChangeLog 1237 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 diff --git a/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.cc-64bit.patch b/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.cc-64bit.patch new file mode 100644 index 000000000..7b713a672 --- /dev/null +++ b/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.cc-64bit.patch @@ -0,0 +1,60 @@ +--- libthrowable/internal/internal.cc 2006-10-15 11:48:19.000000000 +0200 ++++ /tmp/internal.cc 2006-10-26 11:57:06.000000000 +0200 +@@ -26,7 +26,7 @@ + string tabsToSpaces(const string& str, unsigned spaces) throw() + { + string ret(str); +- unsigned pos=0; ++ string::size_type pos=0; + while(true) + { + pos = ret.find('\t', pos); +@@ -108,7 +108,7 @@ + if(line.empty()) + return -1; + +- unsigned ret = line.find_first_not_of(' '); ++ string::size_type ret = line.find_first_not_of(' '); + if(ret != string::npos) + return local::unsignedToInt(ret); + return -1; +@@ -121,10 +121,10 @@ + const int iIndent = getIndent(line); + if(iIndent < 0) + return string::npos; +- const unsigned indent = static_cast(iIndent); ++ const string::size_type indent = static_cast(iIndent); + //if possible, break after one of the following characters: + //" .,;" +- unsigned ret = line.find_last_of(" ,;.", pos-1); ++ string::size_type ret = line.find_last_of(" ,;.", pos-1); + if(ret != string::npos && ret > indent) + return ret; + //maybe we can find a break point by looking after these chars: +@@ -187,7 +187,7 @@ + ret += "--" + util::stringify(virtualIndentDiff) + "--spaces-->\n"; + else if(virtualIndentDiff < 0) + ret += "<--" + util::stringify(-virtualIndentDiff) + "-spaces--\n"; +- ret += line.substr(static_cast(virtualIndent)); ++ ret += line.substr(static_cast(virtualIndent)); + lastVirtualIndent = virtualIndent; + } + return ret; +@@ -215,7 +215,7 @@ + string prefix(indent, ' '); + while(true) + { +- unsigned breakAt = getLinebreakPosNear(lines.back(), _width); ++ string::size_type breakAt = getLinebreakPosNear(lines.back(), _width); + if(breakAt == string::npos) + break; + +@@ -240,7 +240,7 @@ + } + } + } +- for(unsigned i=0; i != lines.size(); ++i) ++ for(string::size_type i=0; i != lines.size(); ++i) + { + if(i != 0) + ret += "\n"; diff --git a/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.h-64bit.patch b/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.h-64bit.patch new file mode 100644 index 000000000..f3714a6dd --- /dev/null +++ b/dev-cpp/libthrowable/files/libthrowable-0.9.5-internal.h-64bit.patch @@ -0,0 +1,11 @@ +--- libthrowable/internal/internal.h 2006-10-26 12:03:56.000000000 +0200 ++++ /tmp/internal.h 2006-10-26 11:53:51.000000000 +0200 +@@ -2,6 +2,8 @@ + #define H_LIBTHROWABLE_INTERNAL + #include "libthrowable/os.h" + #include ++#include ++ + namespace libthrowable { + namespace internal { + diff --git a/dev-cpp/libthrowable/libthrowable-0.9.5.ebuild b/dev-cpp/libthrowable/libthrowable-0.9.5.ebuild index baa9a4e6f..6933eb915 100644 --- a/dev-cpp/libthrowable/libthrowable-0.9.5.ebuild +++ b/dev-cpp/libthrowable/libthrowable-0.9.5.ebuild @@ -29,6 +29,15 @@ pkg_setup() { } +src_unpack() { + unpack ${A} + + # make it run on 64bit platforms + cd "${S}/libthrowable/internal/" + epatch "${FILESDIR}/${P}-internal.cc-64bit.patch" + epatch "${FILESDIR}/${P}-internal.h-64bit.patch" + +} src_compile() { econf $(use_enable threads pthreads) \ || die "econf failed" -- cgit v1.2.3-65-gdbad