Closing #57342

5 files changed, 43 insertions, 5 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index 3ef194770a07..1237d287428a 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.56 2004/07/11 00:00:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.57 2004/07/19 10:25:05 aliz Exp $
+
+  19 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> kdevelop-3.1_beta1.ebuild,
+  files/kdevelop-3.1_beta1-amd64.patch,
+  files/kdevelop-3.1_beta1-bdb-fPIC.patch:
+  Added patches to allow compilation on amd64, closing #57342.
 
 *kdevelop-3.1_beta1 (11 Jul 2004)
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index f340b37c083b..b7ad0f7c9bc3 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,9 +1,9 @@
 MD5 709a93a23b48ae8642e018c3fe0e3c6e kdevelop-3.0.3.ebuild 2571
-MD5 b1a5ae84aedc7ccb3d4d5187708843cb kdevelop-3.1_beta1.ebuild 2620
+MD5 fc02b2cb5450d2868208e2d089737639 kdevelop-3.1_beta1.ebuild 2760
 MD5 ca4cd8dcf6038690faaaf0ceae77b037 kdevelop-2.1.5.ebuild 2017
 MD5 633569991aa6d245da9b60b07d0675f3 kdevelop-3.0.2.ebuild 2737
 MD5 ae9c43865b0d9416fa7de9d4dbad904f kdevelop-3.0.4.ebuild 2571
-MD5 5c65444bf920c37ee4732a9e3e7d1a3c ChangeLog 9364
+MD5 99910f6359d6fef77a4ef1b69c6bdc21 ChangeLog 9585
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 17cff845bf7c28d763e6d0bd623e77a9 kdevelop-3.0.1.ebuild 2735
 MD5 5844083f843db38cd01fa7a77d677e51 files/digest-kdevelop-2.1.5 245
@@ -12,5 +12,7 @@ MD5 604a067d2e76f926fd56e24c460ef27d files/digest-kdevelop-3.0.2 68
 MD5 238d39477c9fbb1dde85fa8d08ac6d61 files/digest-kdevelop-3.0.3 68
 MD5 6a803afe94792dfe48514e5559f2c1cb files/digest-kdevelop-3.0.4 68
 MD5 5508874c2fcaa48c79c78529b07aced2 files/kdevelop-2.1.5-gentoo.diff 4536
+MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
 MD5 407f921376345700330ef24365977615 files/digest-kdevelop-3.1_beta1 69
+MD5 cc4b9f6b20b6cc4df138d35e13cc49ad files/kdevelop-3.1_beta1-amd64.patch 414
 MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248
diff --git a/dev-util/kdevelop/files/kdevelop-3.1_beta1-amd64.patch b/dev-util/kdevelop/files/kdevelop-3.1_beta1-amd64.patch
new file mode 100644
index 000000000000..1225e852d829
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.1_beta1-amd64.patch
@@ -0,0 +1,11 @@
+--- languages/cpp/cppsupportpart.cpp.old	2004-07-17 12:21:02.527612328 +1000
++++ languages/cpp/cppsupportpart.cpp	2004-07-17 12:21:48.989549040 +1000
+@@ -512,7 +512,7 @@
+            else
+                candidate = m_activeFileName;
+ 	       
+-		size_t curLine = 0, curCol = 0;
++		unsigned int curLine = 0, curCol = 0;
+ 		if (m_activeViewCursor != 0)
+ 			m_activeViewCursor->cursorPosition(&curLine, &curCol);
+ 		
diff --git a/dev-util/kdevelop/files/kdevelop-3.1_beta1-bdb-fPIC.patch b/dev-util/kdevelop/files/kdevelop-3.1_beta1-bdb-fPIC.patch
new file mode 100644
index 000000000000..dea890ee1dfb
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.1_beta1-bdb-fPIC.patch
@@ -0,0 +1,11 @@
+--- bdb/dist/Makefile.in	2004-07-19 00:45:10.373028787 +0000
++++ bdb/dist/Makefile.in	2004-07-19 00:45:19.130886556 +0000
+@@ -7,7 +7,7 @@
+ # C, C++
+ ##################################################
+ CPPFLAGS=	-I$(builddir) -I$(srcdir)/include @CPPFLAGS@
+-CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
++CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@ -fPIC
+ CXXFLAGS=	-c $(CPPFLAGS) @CXXFLAGS@
+ 
+ CC=		@MAKEFILE_CC@
diff --git a/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild b/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild
index d3876069ce94..0c8c372ff7e0 100644
--- a/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild,v 1.1 2004/07/11 00:00:12 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1_beta1.ebuild,v 1.2 2004/07/19 10:25:05 aliz Exp $
 
-inherit python kde
+inherit python kde eutils
 
 MY_P=${PN}-3.0.91
 S=${WORKDIR}/${MY_P}
@@ -26,6 +26,15 @@ need-kde 3.2
 
 myconf="$myconf --with-kdelibsdoxy-dir=${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs"
 
+src_unpack() {
+	kde_src_unpack
+
+	use amd64 && ( 
+		epatch ${FILESDIR}/${P}-amd64.patch
+		epatch ${FILESDIR}/${P}-bdb-fPIC.patch
+	)
+}
+
 src_compile() {
 	python_version
 	use java && myconf="$myconf --enable-javasupport --with-java=`java-config --jdk-home`" || myconf="$myconf --disable-javasupport"