1 |
commit: cae4c2337cff0a927842a57f1b6bee520fd87a9c |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 31 14:29:29 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 31 14:30:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cae4c233 |
7 |
|
8 |
dev-util/kdevelop: moved to main tree |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
.../kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 ---------- |
13 |
dev-util/kdevelop/kdevelop-5.0.0.ebuild | 99 ---------------------- |
14 |
2 files changed, 146 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index 9b15fe9..0000000 |
19 |
--- a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch |
20 |
+++ /dev/null |
21 |
@@ -1,47 +0,0 @@ |
22 |
-From: Milian Wolff <mail@×××××××.de> |
23 |
-Date: Mon, 22 Aug 2016 10:47:26 +0000 |
24 |
-Subject: Fix compile |
25 |
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa |
26 |
---- |
27 |
-Fix compile |
28 |
- |
29 |
-BUG: 367659 |
30 |
---- |
31 |
- |
32 |
- |
33 |
---- a/languages/cpp/cppduchain/cppducontext.cpp |
34 |
-+++ b/languages/cpp/cppduchain/cppducontext.cpp |
35 |
-@@ -39,7 +39,8 @@ |
36 |
- REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData); |
37 |
- |
38 |
- template<> |
39 |
--QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const { |
40 |
-+QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, |
41 |
-+ AbstractNavigationWidget::DisplayHints /*hints*/) const { |
42 |
- if( decl == 0 ) { |
43 |
- Path path( url().str() ); |
44 |
- IncludeItem i; |
45 |
-@@ -55,7 +56,8 @@ |
46 |
- } |
47 |
- |
48 |
- template<> |
49 |
--QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const { |
50 |
-+QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, |
51 |
-+ AbstractNavigationWidget::DisplayHints /*hints*/) const { |
52 |
- if( decl == 0 ) { |
53 |
- if( owner() ) |
54 |
- return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix ); |
55 |
- |
56 |
---- a/languages/cpp/cppduchain/cppducontext.h |
57 |
-+++ b/languages/cpp/cppduchain/cppducontext.h |
58 |
-@@ -652,7 +652,8 @@ |
59 |
- return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 ); |
60 |
- } |
61 |
- |
62 |
-- virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override; |
63 |
-+ virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix, |
64 |
-+ KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override; |
65 |
- |
66 |
- enum { |
67 |
- Identity = BaseContext::Identity + 50 |
68 |
- |
69 |
|
70 |
diff --git a/dev-util/kdevelop/kdevelop-5.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild |
71 |
deleted file mode 100644 |
72 |
index c533824..0000000 |
73 |
--- a/dev-util/kdevelop/kdevelop-5.0.0.ebuild |
74 |
+++ /dev/null |
75 |
@@ -1,99 +0,0 @@ |
76 |
-# Copyright 1999-2016 Gentoo Foundation |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
-# $Id$ |
79 |
- |
80 |
-EAPI=6 |
81 |
- |
82 |
-EGIT_BRANCH="5.0" |
83 |
-KDE_HANDBOOK="forceoptional" |
84 |
-KDE_TEST="forceoptional-recursive" |
85 |
-VIRTUALX_REQUIRED="test" |
86 |
-inherit kde5 |
87 |
- |
88 |
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more" |
89 |
-LICENSE="GPL-2 LGPL-2" |
90 |
-IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp" |
91 |
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" |
92 |
- |
93 |
-COMMON_DEPEND=" |
94 |
- $(add_frameworks_dep kcmutils) |
95 |
- $(add_frameworks_dep kcompletion) |
96 |
- $(add_frameworks_dep kconfig) |
97 |
- $(add_frameworks_dep kconfigwidgets) |
98 |
- $(add_frameworks_dep kcoreaddons) |
99 |
- $(add_frameworks_dep kcrash) |
100 |
- $(add_frameworks_dep kdeclarative) |
101 |
- $(add_frameworks_dep ki18n) |
102 |
- $(add_frameworks_dep kiconthemes) |
103 |
- $(add_frameworks_dep kio) |
104 |
- $(add_frameworks_dep kitemmodels) |
105 |
- $(add_frameworks_dep kitemviews) |
106 |
- $(add_frameworks_dep kjobwidgets) |
107 |
- $(add_frameworks_dep knewstuff) |
108 |
- $(add_frameworks_dep knotifyconfig) |
109 |
- $(add_frameworks_dep kparts) |
110 |
- $(add_frameworks_dep kservice) |
111 |
- $(add_frameworks_dep ktexteditor) |
112 |
- $(add_frameworks_dep kwidgetsaddons) |
113 |
- $(add_frameworks_dep kwindowsystem) |
114 |
- $(add_frameworks_dep kxmlgui) |
115 |
- $(add_frameworks_dep threadweaver) |
116 |
- $(add_qt_dep qtdbus) |
117 |
- $(add_qt_dep qtdeclarative) |
118 |
- $(add_qt_dep qtgui) |
119 |
- $(add_qt_dep qtnetwork) |
120 |
- $(add_qt_dep qtwebkit) |
121 |
- $(add_qt_dep qtwidgets) |
122 |
- $(add_qt_dep qtxml) |
123 |
- >=dev-util/kdevplatform-${PV}:5 |
124 |
- x11-misc/shared-mime-info |
125 |
- cxx? ( >=sys-devel/clang-3.5.0 ) |
126 |
- gdbui? ( $(add_plasma_dep libksysguard) ) |
127 |
- okteta? ( $(add_kdeapps_dep okteta) ) |
128 |
- plasma? ( |
129 |
- $(add_frameworks_dep krunner) |
130 |
- $(add_frameworks_dep plasma) |
131 |
- ) |
132 |
- qmake? ( dev-util/kdevelop-pg-qt:5 ) |
133 |
- qthelp? ( $(add_qt_dep qthelp) ) |
134 |
-" |
135 |
-DEPEND="${COMMON_DEPEND} |
136 |
- $(add_qt_dep qtconcurrent) |
137 |
-" |
138 |
-RDEPEND="${COMMON_DEPEND} |
139 |
- $(add_kdeapps_dep kapptemplate) |
140 |
- $(add_kdeapps_dep kio-extras) |
141 |
- >=sys-devel/gdb-7.0[python] |
142 |
- ninja? ( dev-util/ninja ) |
143 |
- !dev-util/kdevelop:4 |
144 |
- !dev-util/kdevelop-clang |
145 |
- !dev-util/kdevelop-qmake |
146 |
- !dev-util/kdevelop-qmljs |
147 |
- !<kde-apps/kapptemplate-16.04.0 |
148 |
-" |
149 |
- |
150 |
-RESTRICT+=" test" |
151 |
-# see bug 366471 |
152 |
- |
153 |
-PATCHES=( |
154 |
- "${FILESDIR}/${PN}-ninja-optional.patch" |
155 |
- "${FILESDIR}/${P}-fix-cpp.patch" |
156 |
-) |
157 |
- |
158 |
-src_configure() { |
159 |
- local mycmakeargs=( |
160 |
- -DLEGACY_CPP_SUPPORT=$(usex !cxx) |
161 |
- -DBUILD_cpp=OFF |
162 |
- -DBUILD_cmake=$(usex cmake) |
163 |
- -DBUILD_cmakebuilder=$(usex cmake) |
164 |
- $(cmake-utils_use_find_package gdbui KF5SysGuard) |
165 |
- -DBUILD_executeplasmoid=$(usex plasma) |
166 |
- $(cmake-utils_use_find_package plasma KF5Plasma) |
167 |
- -DBUILD_ninjabuilder=$(usex ninja) |
168 |
- $(cmake-utils_use_find_package okteta OktetaKastenControllers) |
169 |
- $(cmake-utils_use_find_package qmake KDevelop-PG-Qt) |
170 |
- -DBUILD_qthelp=$(usex qthelp) |
171 |
- ) |
172 |
- |
173 |
- kde5_src_configure |
174 |
-} |