[gentoo-commits] proj/kde:master commit in: dev-util/kdevplatform/, dev-util/kdevplatform/files/

[Vladimir Smirnov]

commit:     fa05496dfe3a8689055ae0563c4f62588a504aac
Author:     Vladimir Smirnov <civil.over <AT> gmail <DOT> com>
AuthorDate: Thu Mar 31 08:10:36 2011 +0000
Commit:     Vladimir Smirnov <civil.over <AT> gmail <DOT> com>
CommitDate: Thu Mar 31 08:10:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fa05496d

kdevelop-1.2.0: Fix FTBFS with gcc 4.6. See bug 361421.

---
 .../files/kdevplatform-1.2.0-gcc46.patch           |   24 +++++++
 dev-util/kdevplatform/kdevplatform-1.2.0.ebuild    |   67 ++++++++++++++++++++
 2 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
new file mode 100644
index 0000000..4c789a3
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-1.2.0-gcc46.patch
@@ -0,0 +1,24 @@
+diff -ur kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h
+--- kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h	2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h	2011-01-29 02:54:27.000000000 +0100
+@@ -236,7 +236,7 @@
+ 
+     QString m_name;
+     int m_version;
+-    mutable ItemRepositoryRegistry& m_registry;
++    ItemRepositoryRegistry& m_registry;
+     AbstractRepositoryManager* (*m_shareMutex)();
+ };
+ 
+diff -ur kdevplatform-1.2.0/language/util/basicsetrepository.h kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h
+--- kdevplatform-1.2.0/language/util/basicsetrepository.h	2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h	2011-01-29 02:53:21.000000000 +0100
+@@ -129,7 +129,7 @@
+   SetNodeData data;
+   
+   uint m_hash;
+-  mutable SetDataRepository& repository;
++  SetDataRepository& repository;
+   mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
+   mutable bool m_created;
+ };

diff --git a/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
new file mode 100644
index 0000000..0c09f03
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.2.0.ebuild,v 1.3 2011/02/27 14:40:39 dilfridge Exp $
+
+EAPI=3
+
+# Bug 276208
+RESTRICT="test"
+
+KDE_LINGUAS="ca ca@valencia da de en_GB es et fi gl it nds nl pt pt_BR sl sv th uk zh_CN zh_TW"
+
+KMNAME="kdevelop"
+KDE_MINIMAL="4.6"
+inherit kde4-base
+
+DESCRIPTION="KDE development support libraries and apps"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Moved to playground for now
+# bazaar kompare mercurial
+LICENSE="GPL-2 LGPL-2"
+IUSE="cvs debug git reviewboard subversion"
+
+# Moved to playground for now
+# bazaar? ( dev-vcs/bzr )
+# kompare? ( >=kde-base/kompare-${KDE_MINIMAL} )
+# mercurial? ( dev-vcs/mercurial )
+# block - some plugins moved to kdevplatform from kdevelop
+DEPEND="
+	dev-libs/boost
+	reviewboard? ( dev-libs/qjson )
+	subversion? ( >=dev-vcs/subversion-1.3 )
+"
+RDEPEND="${DEPEND}
+	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
+	!dev-util/kdevelop-git
+	$(add_kdebase_dep konsole)
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+"
+
+PATCHES="${FILESDIR}/${P}-gcc46.patch"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# FindKDevPlatform.cmake is installed by kdelibs
+	sed -i \
+		-e '/cmakeFiles/s/^/#DONOTINSTALL/' \
+		cmake/modules/CMakeLists.txt || die
+}
+
+# Moved to playground for now
+# $(cmake-utils_use_build bazaar)
+# $(cmake-utils_use_with kompare)
+# $(cmake-utils_use_build mercurial)
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_build git)
+		$(cmake-utils_use_with reviewboard QJSON)
+		$(cmake-utils_use_build subversion)
+		$(cmake-utils_use_with subversion SubversionLibrary)
+	)
+
+	kde4-base_src_configure
+}