commit: 048d675206858ffb484f2828d5dc602bcbe1df48 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Aug 21 21:50:57 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Aug 24 13:38:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=048d6752
dev-util/kdevelop: Version bump to 5.0.0 Drop USE=cxx Package-Manager: portage-2.2.28 .../kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 ++++++++++++++++++++++ ...velop-5.0.9999.ebuild => kdevelop-5.0.0.ebuild} | 15 +++---- dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 10 ++--- dev-util/kdevelop/kdevelop-9999.ebuild | 10 ++--- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch new file mode 100644 index 0000000..9b15fe9 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch @@ -0,0 +1,47 @@ +From: Milian Wolff <m...@milianw.de> +Date: Mon, 22 Aug 2016 10:47:26 +0000 +Subject: Fix compile +X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa +--- +Fix compile + +BUG: 367659 +--- + + +--- a/languages/cpp/cppduchain/cppducontext.cpp ++++ b/languages/cpp/cppduchain/cppducontext.cpp +@@ -39,7 +39,8 @@ + REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData); + + template<> +-QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const { ++QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, ++ AbstractNavigationWidget::DisplayHints /*hints*/) const { + if( decl == 0 ) { + Path path( url().str() ); + IncludeItem i; +@@ -55,7 +56,8 @@ + } + + template<> +-QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const { ++QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, ++ AbstractNavigationWidget::DisplayHints /*hints*/) const { + if( decl == 0 ) { + if( owner() ) + return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix ); + +--- a/languages/cpp/cppduchain/cppducontext.h ++++ b/languages/cpp/cppduchain/cppducontext.h +@@ -652,7 +652,8 @@ + return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 ); + } + +- virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override; ++ virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, ++ KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override; + + enum { + Identity = BaseContext::Identity + 50 + diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild similarity index 89% copy from dev-util/kdevelop/kdevelop-5.0.9999.ebuild copy to dev-util/kdevelop/kdevelop-5.0.0.ebuild index 19a2cd7..bcafd59 100644 --- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild +++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild @@ -12,8 +12,8 @@ inherit kde5 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" LICENSE="GPL-2 LGPL-2" -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp" -KEYWORDS="" +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" DEPEND=" $(add_frameworks_dep kcmutils) @@ -45,7 +45,7 @@ DEPEND=" $(add_qt_dep qtwidgets) >=dev-util/kdevplatform-${PV}:5 x11-misc/shared-mime-info - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) ) + clang? ( >=sys-devel/clang-3.5.0 ) gdbui? ( $(add_plasma_dep ksysguard) ) okteta? ( $(add_kdeapps_dep okteta) ) plasma? ( @@ -58,7 +58,7 @@ DEPEND=" RDEPEND="${DEPEND} $(add_kdeapps_dep kapptemplate) $(add_kdeapps_dep kio-extras) - cxx? ( >=sys-devel/gdb-7.0[python] ) + >=sys-devel/gdb-7.0[python] ninja? ( dev-util/ninja ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang @@ -70,15 +70,16 @@ RDEPEND="${DEPEND} RESTRICT+=" test" # see bug 366471 -PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-ninja-optional.patch" + "${FILESDIR}/${P}-fix-cpp.patch" +) src_configure() { local mycmakeargs=( -DLEGACY_CPP_SUPPORT=$(usex !clang) -DBUILD_cmake=$(usex cmake) -DBUILD_cmakebuilder=$(usex cmake) - -DBUILD_clang=$(usex cxx) - -DBUILD_cpp=$(usex cxx) $(cmake-utils_use_find_package gdbui KF5SysGuard) -DBUILD_executeplasmoid=$(usex plasma) $(cmake-utils_use_find_package plasma KF5Plasma) diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild index 19a2cd7..b22e6e3 100644 --- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild +++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild @@ -12,8 +12,8 @@ inherit kde5 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" LICENSE="GPL-2 LGPL-2" -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp" -KEYWORDS="" +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" DEPEND=" $(add_frameworks_dep kcmutils) @@ -45,7 +45,7 @@ DEPEND=" $(add_qt_dep qtwidgets) >=dev-util/kdevplatform-${PV}:5 x11-misc/shared-mime-info - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) ) + clang? ( >=sys-devel/clang-3.5.0 ) gdbui? ( $(add_plasma_dep ksysguard) ) okteta? ( $(add_kdeapps_dep okteta) ) plasma? ( @@ -58,7 +58,7 @@ DEPEND=" RDEPEND="${DEPEND} $(add_kdeapps_dep kapptemplate) $(add_kdeapps_dep kio-extras) - cxx? ( >=sys-devel/gdb-7.0[python] ) + >=sys-devel/gdb-7.0[python] ninja? ( dev-util/ninja ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang @@ -77,8 +77,6 @@ src_configure() { -DLEGACY_CPP_SUPPORT=$(usex !clang) -DBUILD_cmake=$(usex cmake) -DBUILD_cmakebuilder=$(usex cmake) - -DBUILD_clang=$(usex cxx) - -DBUILD_cpp=$(usex cxx) $(cmake-utils_use_find_package gdbui KF5SysGuard) -DBUILD_executeplasmoid=$(usex plasma) $(cmake-utils_use_find_package plasma KF5Plasma) diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index b01f1ad..1e171d7 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -11,8 +11,8 @@ inherit kde5 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" LICENSE="GPL-2 LGPL-2" -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp" -KEYWORDS="" +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp" +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" DEPEND=" $(add_frameworks_dep kcmutils) @@ -44,7 +44,7 @@ DEPEND=" $(add_qt_dep qtwidgets) >=dev-util/kdevplatform-${PV}:5 x11-misc/shared-mime-info - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) ) + clang? ( >=sys-devel/clang-3.5.0 ) gdbui? ( $(add_plasma_dep ksysguard) ) okteta? ( $(add_kdeapps_dep okteta) ) plasma? ( @@ -57,7 +57,7 @@ DEPEND=" RDEPEND="${DEPEND} $(add_kdeapps_dep kapptemplate) $(add_kdeapps_dep kio-extras) - cxx? ( >=sys-devel/gdb-7.0[python] ) + >=sys-devel/gdb-7.0[python] ninja? ( dev-util/ninja ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang @@ -76,8 +76,6 @@ src_configure() { -DLEGACY_CPP_SUPPORT=$(usex !clang) -DBUILD_cmake=$(usex cmake) -DBUILD_cmakebuilder=$(usex cmake) - -DBUILD_clang=$(usex cxx) - -DBUILD_cpp=$(usex cxx) $(cmake-utils_use_find_package gdbui KF5SysGuard) -DBUILD_executeplasmoid=$(usex plasma) $(cmake-utils_use_find_package plasma KF5Plasma)
