summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2004-05-30 00:56:56 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2004-05-30 00:56:56 +0000
commit6dd567707302f2da4cbe2b3ed7f55c828ecffdb8 (patch)
tree84aa303e9750bbdac624050d82d31df0b6b408c8 /app-arch
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-6dd567707302f2da4cbe2b3ed7f55c828ecffdb8.tar.gz
gentoo-2-6dd567707302f2da4cbe2b3ed7f55c828ecffdb8.tar.bz2
gentoo-2-6dd567707302f2da4cbe2b3ed7f55c828ecffdb8.zip
Fixed BUG #52347.
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/advancecomp/ChangeLog4
-rw-r--r--app-arch/advancecomp/advancecomp-1.10.ebuild3
-rw-r--r--app-arch/advancecomp/files/advancecomp-1.10-64bit.diff56
3 files changed, 60 insertions, 3 deletions
diff --git a/app-arch/advancecomp/ChangeLog b/app-arch/advancecomp/ChangeLog
index 07ec15c36ec1..77dff22f266d 100644
--- a/app-arch/advancecomp/ChangeLog
+++ b/app-arch/advancecomp/ChangeLog
@@ -1,9 +1,9 @@
# ChangeLog for app-arch/advancecomp
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.7 2004/05/30 00:50:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/ChangeLog,v 1.8 2004/05/30 00:56:56 kugelfang Exp $
30 May 2004; Danny van Dyk <kugelfang@gentoo.org> advancecomp-1.10.ebuild:
- Marked ~amd64.
+ Marked ~amd64, added 64bit patch (String-size problems). Fixed BUG #52347.
*advancecomp-1.10 (24 May 2004)
diff --git a/app-arch/advancecomp/advancecomp-1.10.ebuild b/app-arch/advancecomp/advancecomp-1.10.ebuild
index 079e8610f90c..3f297946d0f3 100644
--- a/app-arch/advancecomp/advancecomp-1.10.ebuild
+++ b/app-arch/advancecomp/advancecomp-1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.2 2004/05/30 00:50:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/advancecomp/advancecomp-1.10.ebuild,v 1.3 2004/05/30 00:56:56 kugelfang Exp $
inherit eutils
@@ -18,6 +18,7 @@ DEPEND="sys-libs/zlib app-arch/bzip2"
src_unpack() {
unpack ${A}
# bzip2 support wont compile, heres a quick patch.
+ epatch ${FILESDIR}/${P}-64bit.diff
cd ${S}; epatch ${FILESDIR}/${P}-bzip2-compile-plz-k-thx.diff
}
diff --git a/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff b/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff
new file mode 100644
index 000000000000..e7e36872991f
--- /dev/null
+++ b/app-arch/advancecomp/files/advancecomp-1.10-64bit.diff
@@ -0,0 +1,56 @@
+--- advancecomp-1.10.orig/utility.cc 2004-04-06 20:02:25.000000000 +0200
++++ advancecomp-1.10/utility.cc 2004-05-29 17:33:00.098153880 +0200
+@@ -416,7 +416,7 @@
+ {
+ ostringstream os;
+
+- unsigned pos = path.rfind('.');
++ string::size_type pos = path.rfind('.');
+
+ if (pos == string::npos)
+ os << path << ".";
+@@ -433,7 +433,7 @@
+ */
+ string file_dir(const string& path) throw ()
+ {
+- unsigned pos = path.rfind('/');
++ string::size_type pos = path.rfind('/');
+ if (pos == string::npos) {
+ return "";
+ } else {
+@@ -446,7 +446,7 @@
+ */
+ string file_name(const string& path) throw ()
+ {
+- unsigned pos = path.rfind('/');
++ string::size_type pos = path.rfind('/');
+ if (pos == string::npos) {
+ return path;
+ } else {
+@@ -459,7 +459,7 @@
+ */
+ string file_basepath(const string& path) throw ()
+ {
+- unsigned dot = path.rfind('.');
++ string::size_type dot = path.rfind('.');
+ if (dot == string::npos)
+ return path;
+ else
+@@ -472,7 +472,7 @@
+ string file_basename(const string& path) throw ()
+ {
+ string name = file_name(path);
+- unsigned dot = name.rfind('.');
++ string::size_type dot = name.rfind('.');
+ if (dot == string::npos)
+ return name;
+ else
+@@ -485,7 +485,7 @@
+ string file_ext(const string& path) throw ()
+ {
+ string name = file_name(path);
+- unsigned dot = name.rfind('.');
++ string::size_type dot = name.rfind('.');
+ if (dot == string::npos)
+ return "";
+ else