diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-07-19 10:25:05 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-07-19 10:25:05 +0000 |
| commit | 17dbedc86c4fa02f73f39a8f4d9f9b63245f3dcf (patch) | |
| tree | 106960e5ef617c67678942341f28ea90d5e1911c /dev-util | |
| parent | Moving all versions over to use the proper libGL.la file which will resolve t... (diff) | |
| download | gentoo-2-17dbedc86c4fa02f73f39a8f4d9f9b63245f3dcf.tar.gz gentoo-2-17dbedc86c4fa02f73f39a8f4d9f9b63245f3dcf.tar.bz2 gentoo-2-17dbedc86c4fa02f73f39a8f4d9f9b63245f3dcf.zip | |
Closing #57342
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kdevelop/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.1_beta1-amd64.patch | 11 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-3.1_beta1-bdb-fPIC.patch | 11 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-3.1_beta1.ebuild | 13 |
4 files changed, 39 insertions, 3 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/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" |