Fix package to work on AMD64. Closes bug #100453.

(Portage version: 2.0.51.22-r2)

4 files changed, 43 insertions, 7 deletions

diff --git a/x11-misc/qterm/ChangeLog b/x11-misc/qterm/ChangeLog
index 028bd17acd85..eb75480d91f3 100644
--- a/x11-misc/qterm/ChangeLog
+++ b/x11-misc/qterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/qterm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.11 2005/07/07 05:19:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.12 2005/08/22 17:21:39 metalgod Exp $
+
+  22 Aug 2005; Luis Medinas <metalgod@gentoo.org> +files/qstring.patch,
+  qterm-0.4.0_pre2.ebuild:
+  Fix package to work on AMD64. Closes bug #100453.
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> qterm-0.3.8.ebuild:
   Fix qt dep
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 227d9b52e99c..f73fcf7113a5 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,6 +1,7 @@
-MD5 513f79a785fe13d7b774a51b202b3559 qterm-0.3.8.ebuild 853
 MD5 2636d116cf643a6d0893e63c400cbb9b ChangeLog 1797
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 9224fcd5a17c064e40532e0d721ce46d qterm-0.4.0_pre2.ebuild 828
-MD5 b3833df45734522f0f5464160201f4e6 files/digest-qterm-0.4.0_pre2 67
+MD5 513f79a785fe13d7b774a51b202b3559 qterm-0.3.8.ebuild 853
+MD5 ce6ee253483a26c6ac213180c4a28abc qterm-0.4.0_pre2.ebuild 803
 MD5 a745822f07baaf5f7d4a5b55eb659077 files/digest-qterm-0.3.8 63
+MD5 7066e1a7b5cfd1ac1093a53a7dfd177d files/qstring.patch 767
+MD5 b3833df45734522f0f5464160201f4e6 files/digest-qterm-0.4.0_pre2 67
diff --git a/x11-misc/qterm/files/qstring.patch b/x11-misc/qterm/files/qstring.patch
new file mode 100644
index 000000000000..956b392a2c50
--- /dev/null
+++ b/x11-misc/qterm/files/qstring.patch
@@ -0,0 +1,29 @@
+--- qtermiplocation.cpp.bak	2005-07-27 18:24:46.000000000 +0800
++++ qtermiplocation.cpp	2005-07-27 18:25:09.000000000 +0800
+@@ -79,13 +79,13 @@
+ 	if( fseek( fp, (long)offset, SEEK_SET ) ==-1 )
+ 	{
+ 		qDebug( " readLineFrom error 1 " );
+-		ret_str = QCString(NULL);
++		ret_str = QCString(0);
+ 		return -1;
+ 	}
+ 	if( fgets( (char *) str, 512, fp ) == NULL )
+ 	{
+ 		qDebug( " readLineFrom error 2 " );
+-		ret_str = QCString(NULL);
++		ret_str = QCString(0);
+ 		return -1;
+ 	}
+ 	ret_str = str;
+--- qtermtextline.cpp.bak	2005-07-27 18:22:23.000000000 +0800
++++ qtermtextline.cpp	2005-07-27 18:23:00.000000000 +0800
+@@ -235,7 +235,7 @@
+ 
+ 	
+ 	if(index>=m_length)
+-		return NULL;
++		return QCString(0);
+ 		
+ 	printf("index=%d len=%d m_length=%d\n", index, len, m_length);
+ 	
diff --git a/x11-misc/qterm/qterm-0.4.0_pre2.ebuild b/x11-misc/qterm/qterm-0.4.0_pre2.ebuild
index bdba03d85c35..a8533c934451 100644
--- a/x11-misc/qterm/qterm-0.4.0_pre2.ebuild
+++ b/x11-misc/qterm/qterm-0.4.0_pre2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.4.0_pre2.ebuild,v 1.2 2005/02/19 09:22:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.4.0_pre2.ebuild,v 1.3 2005/08/22 17:21:39 metalgod Exp $
 
-inherit kde-functions
+inherit kde-functions eutils
 
 need-qt 3
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qterm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qterm/${P/_/}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl"
 DEPEND=">=media-sound/esound-0.2.22
 	dev-lang/python
@@ -21,6 +21,8 @@ S=${WORKDIR}/${P/_/}
 
 src_compile() {
 
+	cd ${S}/qterm && epatch ${FILESDIR}/qstring.patch
+	cd ${S}
 	# yeah, it's --disable-ssh to disable ssl
 	econf `use_enable ssl ssh` || die "configure failed"
 	emake || die "emake failed"