* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/
@ 2017-08-08 18:23 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2017-08-08 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 9699a0efbcd83298e9c32c8b04e31cc63b0a3913
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 17:53:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 18:11:33 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9699a0ef
dev-util/kdevelop: Drop USE=ninja
It is not saving us anything these days, deps pull it in anyway.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch | 11 -----------
dev-util/kdevelop/kdevelop-5.1.9999.ebuild | 7 ++-----
dev-util/kdevelop/kdevelop-9999.ebuild | 7 ++-----
dev-util/kdevelop/metadata.xml | 1 -
4 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
deleted file mode 100644
index a60da91df6..0000000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt
-index 80d7866..825ca8b 100644
---- a/projectbuilders/CMakeLists.txt
-+++ b/projectbuilders/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory(makebuilder)
--add_subdirectory(ninjabuilder)
-+ecm_optional_add_subdirectory(ninjabuilder)
- ecm_optional_add_subdirectory(cmakebuilder)
- if (KDevelop-PG-Qt_FOUND)
- ecm_optional_add_subdirectory(qmakebuilder)
diff --git a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
index acb31ee1a3..5830cee06b 100644
--- a/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.1.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
+IUSE="+gdbui okteta +plasma +qmake qthelp"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
@@ -62,8 +62,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_kdeapps_dep kio-extras)
+ dev-util/ninja
>=sys-devel/gdb-7.0[python]
- ninja? ( dev-util/ninja )
!dev-util/kdevelop:4
!dev-util/kdevelop-clang
!dev-util/kdevelop-cppcheck
@@ -75,14 +75,11 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package gdbui KF5SysGuard)
-DBUILD_executeplasmoid=$(usex plasma)
$(cmake-utils_use_find_package plasma KF5Plasma)
- -DBUILD_ninjabuilder=$(usex ninja)
$(cmake-utils_use_find_package okteta OktetaKastenControllers)
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-DBUILD_qthelp=$(usex qthelp)
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index fd0eeb63c3..929a93e10f 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
+IUSE="+gdbui okteta +plasma +qmake qthelp"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
@@ -60,8 +60,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_kdeapps_dep kio-extras)
+ dev-util/ninja
>=sys-devel/gdb-7.0[python]
- ninja? ( dev-util/ninja )
!dev-util/kdevelop:4
!dev-util/kdevelop-clang
!dev-util/kdevelop-cppcheck
@@ -73,14 +73,11 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package gdbui KF5SysGuard)
-DBUILD_executeplasmoid=$(usex plasma)
$(cmake-utils_use_find_package plasma KF5Plasma)
- -DBUILD_ninjabuilder=$(usex ninja)
$(cmake-utils_use_find_package okteta OktetaKastenControllers)
$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-DBUILD_qthelp=$(usex qthelp)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index cfde64ce07..1aa0399b05 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
- <flag name="ninja">Enable support for Ninja build system</flag>
<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
<flag name="qmake">Enable support for QMake build system</flag>
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/
@ 2016-08-24 13:38 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-08-24 13:38 UTC (permalink / raw
To: gentoo-commits
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 <mail@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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-08 18:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-08 18:23 [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-08-24 13:38 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox