Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/
Date: Wed, 24 Aug 2016 13:38:41
Message-Id: 1472045904.048d675206858ffb484f2828d5dc602bcbe1df48.kensington@gentoo
1 commit: 048d675206858ffb484f2828d5dc602bcbe1df48
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 21 21:50:57 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 24 13:38:24 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=048d6752
7
8 dev-util/kdevelop: Version bump to 5.0.0
9
10 Drop USE=cxx
11
12 Package-Manager: portage-2.2.28
13
14 .../kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 ++++++++++++++++++++++
15 ...velop-5.0.9999.ebuild => kdevelop-5.0.0.ebuild} | 15 +++----
16 dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 10 ++---
17 dev-util/kdevelop/kdevelop-9999.ebuild | 10 ++---
18 4 files changed, 63 insertions(+), 19 deletions(-)
19
20 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
21 new file mode 100644
22 index 0000000..9b15fe9
23 --- /dev/null
24 +++ b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
25 @@ -0,0 +1,47 @@
26 +From: Milian Wolff <mail@×××××××.de>
27 +Date: Mon, 22 Aug 2016 10:47:26 +0000
28 +Subject: Fix compile
29 +X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa
30 +---
31 +Fix compile
32 +
33 +BUG: 367659
34 +---
35 +
36 +
37 +--- a/languages/cpp/cppduchain/cppducontext.cpp
38 ++++ b/languages/cpp/cppduchain/cppducontext.cpp
39 +@@ -39,7 +39,8 @@
40 + REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData);
41 +
42 + template<>
43 +-QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const {
44 ++QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
45 ++ AbstractNavigationWidget::DisplayHints /*hints*/) const {
46 + if( decl == 0 ) {
47 + Path path( url().str() );
48 + IncludeItem i;
49 +@@ -55,7 +56,8 @@
50 + }
51 +
52 + template<>
53 +-QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const {
54 ++QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
55 ++ AbstractNavigationWidget::DisplayHints /*hints*/) const {
56 + if( decl == 0 ) {
57 + if( owner() )
58 + return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix );
59 +
60 +--- a/languages/cpp/cppduchain/cppducontext.h
61 ++++ b/languages/cpp/cppduchain/cppducontext.h
62 +@@ -652,7 +652,8 @@
63 + return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 );
64 + }
65 +
66 +- virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override;
67 ++ virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
68 ++ KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override;
69 +
70 + enum {
71 + Identity = BaseContext::Identity + 50
72 +
73
74 diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
75 similarity index 89%
76 copy from dev-util/kdevelop/kdevelop-5.0.9999.ebuild
77 copy to dev-util/kdevelop/kdevelop-5.0.0.ebuild
78 index 19a2cd7..bcafd59 100644
79 --- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
80 +++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
81 @@ -12,8 +12,8 @@ inherit kde5
82
83 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
84 LICENSE="GPL-2 LGPL-2"
85 -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
86 -KEYWORDS=""
87 +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
88 +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
89
90 DEPEND="
91 $(add_frameworks_dep kcmutils)
92 @@ -45,7 +45,7 @@ DEPEND="
93 $(add_qt_dep qtwidgets)
94 >=dev-util/kdevplatform-${PV}:5
95 x11-misc/shared-mime-info
96 - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
97 + clang? ( >=sys-devel/clang-3.5.0 )
98 gdbui? ( $(add_plasma_dep ksysguard) )
99 okteta? ( $(add_kdeapps_dep okteta) )
100 plasma? (
101 @@ -58,7 +58,7 @@ DEPEND="
102 RDEPEND="${DEPEND}
103 $(add_kdeapps_dep kapptemplate)
104 $(add_kdeapps_dep kio-extras)
105 - cxx? ( >=sys-devel/gdb-7.0[python] )
106 + >=sys-devel/gdb-7.0[python]
107 ninja? ( dev-util/ninja )
108 !dev-util/kdevelop:4
109 !dev-util/kdevelop-clang
110 @@ -70,15 +70,16 @@ RDEPEND="${DEPEND}
111 RESTRICT+=" test"
112 # see bug 366471
113
114 -PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
115 +PATCHES=(
116 + "${FILESDIR}/${PN}-ninja-optional.patch"
117 + "${FILESDIR}/${P}-fix-cpp.patch"
118 +)
119
120 src_configure() {
121 local mycmakeargs=(
122 -DLEGACY_CPP_SUPPORT=$(usex !clang)
123 -DBUILD_cmake=$(usex cmake)
124 -DBUILD_cmakebuilder=$(usex cmake)
125 - -DBUILD_clang=$(usex cxx)
126 - -DBUILD_cpp=$(usex cxx)
127 $(cmake-utils_use_find_package gdbui KF5SysGuard)
128 -DBUILD_executeplasmoid=$(usex plasma)
129 $(cmake-utils_use_find_package plasma KF5Plasma)
130
131 diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
132 index 19a2cd7..b22e6e3 100644
133 --- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
134 +++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
135 @@ -12,8 +12,8 @@ inherit kde5
136
137 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
138 LICENSE="GPL-2 LGPL-2"
139 -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
140 -KEYWORDS=""
141 +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
142 +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
143
144 DEPEND="
145 $(add_frameworks_dep kcmutils)
146 @@ -45,7 +45,7 @@ DEPEND="
147 $(add_qt_dep qtwidgets)
148 >=dev-util/kdevplatform-${PV}:5
149 x11-misc/shared-mime-info
150 - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
151 + clang? ( >=sys-devel/clang-3.5.0 )
152 gdbui? ( $(add_plasma_dep ksysguard) )
153 okteta? ( $(add_kdeapps_dep okteta) )
154 plasma? (
155 @@ -58,7 +58,7 @@ DEPEND="
156 RDEPEND="${DEPEND}
157 $(add_kdeapps_dep kapptemplate)
158 $(add_kdeapps_dep kio-extras)
159 - cxx? ( >=sys-devel/gdb-7.0[python] )
160 + >=sys-devel/gdb-7.0[python]
161 ninja? ( dev-util/ninja )
162 !dev-util/kdevelop:4
163 !dev-util/kdevelop-clang
164 @@ -77,8 +77,6 @@ src_configure() {
165 -DLEGACY_CPP_SUPPORT=$(usex !clang)
166 -DBUILD_cmake=$(usex cmake)
167 -DBUILD_cmakebuilder=$(usex cmake)
168 - -DBUILD_clang=$(usex cxx)
169 - -DBUILD_cpp=$(usex cxx)
170 $(cmake-utils_use_find_package gdbui KF5SysGuard)
171 -DBUILD_executeplasmoid=$(usex plasma)
172 $(cmake-utils_use_find_package plasma KF5Plasma)
173
174 diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
175 index b01f1ad..1e171d7 100644
176 --- a/dev-util/kdevelop/kdevelop-9999.ebuild
177 +++ b/dev-util/kdevelop/kdevelop-9999.ebuild
178 @@ -11,8 +11,8 @@ inherit kde5
179
180 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
181 LICENSE="GPL-2 LGPL-2"
182 -IUSE="+clang +cmake +cxx +gdbui +ninja okteta +plasma +qmake qthelp"
183 -KEYWORDS=""
184 +IUSE="+clang +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
185 +[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
186
187 DEPEND="
188 $(add_frameworks_dep kcmutils)
189 @@ -44,7 +44,7 @@ DEPEND="
190 $(add_qt_dep qtwidgets)
191 >=dev-util/kdevplatform-${PV}:5
192 x11-misc/shared-mime-info
193 - cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
194 + clang? ( >=sys-devel/clang-3.5.0 )
195 gdbui? ( $(add_plasma_dep ksysguard) )
196 okteta? ( $(add_kdeapps_dep okteta) )
197 plasma? (
198 @@ -57,7 +57,7 @@ DEPEND="
199 RDEPEND="${DEPEND}
200 $(add_kdeapps_dep kapptemplate)
201 $(add_kdeapps_dep kio-extras)
202 - cxx? ( >=sys-devel/gdb-7.0[python] )
203 + >=sys-devel/gdb-7.0[python]
204 ninja? ( dev-util/ninja )
205 !dev-util/kdevelop:4
206 !dev-util/kdevelop-clang
207 @@ -76,8 +76,6 @@ src_configure() {
208 -DLEGACY_CPP_SUPPORT=$(usex !clang)
209 -DBUILD_cmake=$(usex cmake)
210 -DBUILD_cmakebuilder=$(usex cmake)
211 - -DBUILD_clang=$(usex cxx)
212 - -DBUILD_cpp=$(usex cxx)
213 $(cmake-utils_use_find_package gdbui KF5SysGuard)
214 -DBUILD_executeplasmoid=$(usex plasma)
215 $(cmake-utils_use_find_package plasma KF5Plasma)
Report Message
Find on MARC Find on Google Groups