* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2023-03-29 13:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-03-29 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 4452c53936e4eb6df13f7b28961b4b4857420c85
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 13:31:48 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 13:32:25 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4452c539
dev-util/kdevelop: drop obsolete clang 16 patch
Fixed upstream in 1a92bed73ae31e6f90c3bffe455f8e3c46ac4905 by using
the proper FindClang module.
Fixed on both the 23.03 branch & master.
Bug: https://bugs.gentoo.org/902101
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../kdevelop/files/kdevelop-22.12.3-clang16.patch | 24 ----------------------
dev-util/kdevelop/kdevelop-23.03.80.ebuild | 4 ----
dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild | 4 ----
dev-util/kdevelop/kdevelop-9999.ebuild | 4 ----
4 files changed, 36 deletions(-)
diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
deleted file mode 100644
index 38676cc164..0000000000
--- a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/902101
---- a/cmake/modules/FindClang.cmake
-+++ b/cmake/modules/FindClang.cmake
-@@ -97,6 +97,8 @@
- # dito for git
- string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
-
-+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
-+ string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
- find_path(CLANG_BUILTIN_DIR
- # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
- NAMES "cpuid.h"
-@@ -106,6 +108,10 @@
- "../../../clang/${CLANG_VERSION}/include"
- "clang/${CLANG_VERSION_CLEAN}/include"
- "../../../clang/${CLANG_VERSION_CLEAN}/include"
-+ "clang/${CLANG_VERSION_STRIPPED}/include"
-+ "../../../clang/${CLANG_VERSION_STRIPPED}/include"
-+ "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
-+ "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
- NO_DEFAULT_PATH
- )
-
-
diff --git a/dev-util/kdevelop/kdevelop-23.03.80.ebuild b/dev-util/kdevelop/kdevelop-23.03.80.ebuild
index 59cd6f2f22..d2848b6c73 100644
--- a/dev-util/kdevelop/kdevelop-23.03.80.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.03.80.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-22.12.3-clang16.patch
-)
-
llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
}
diff --git a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
index 9b93334c07..912f2c6e53 100644
--- a/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.04.49.9999.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-22.12.3-clang16.patch
-)
-
llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
}
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 9b93334c07..912f2c6e53 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -96,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-22.12.3-clang16.patch
-)
-
llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2016-10-30 18:03 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-10-30 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 6c0ee816a58d618b7c2ecd6f6f204be4cfe10bc3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 18:03:11 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 18:03:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6c0ee816
dev-util/kdevelop: Rename patch
Package-Manager: portage-2.3.2
...develop-ninja-optional.patch => kdevelop-5.0.2-ninja-optional.patch} | 0
dev-util/kdevelop/kdevelop-5.0.9999.ebuild | 2 +-
dev-util/kdevelop/kdevelop-9999.ebuild | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
similarity index 100%
rename from dev-util/kdevelop/files/kdevelop-ninja-optional.patch
rename to dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
index cd3a535..37c75ad 100644
--- a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
src_configure() {
local mycmakeargs=(
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index faf7159..e468cc5 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -74,7 +74,7 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
# see bug 366471
-PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2016-08-31 14:30 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-08-31 14:30 UTC (permalink / raw
To: gentoo-commits
commit: cae4c2337cff0a927842a57f1b6bee520fd87a9c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 14:29:29 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:30:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cae4c233
dev-util/kdevelop: moved to main tree
Package-Manager: portage-2.3.0
.../kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 ----------
dev-util/kdevelop/kdevelop-5.0.0.ebuild | 99 ----------------------
2 files changed, 146 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
deleted file mode 100644
index 9b15fe9..0000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
deleted file mode 100644
index c533824..0000000
--- a/dev-util/kdevelop/kdevelop-5.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="5.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cxx +cmake +gdbui +ninja okteta +plasma +qmake qthelp"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- >=dev-util/kdevplatform-${PV}:5
- x11-misc/shared-mime-info
- cxx? ( >=sys-devel/clang-3.5.0 )
- gdbui? ( $(add_plasma_dep libksysguard) )
- okteta? ( $(add_kdeapps_dep okteta) )
- plasma? (
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep plasma)
- )
- qmake? ( dev-util/kdevelop-pg-qt:5 )
- qthelp? ( $(add_qt_dep qthelp) )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep kapptemplate)
- $(add_kdeapps_dep kio-extras)
- >=sys-devel/gdb-7.0[python]
- ninja? ( dev-util/ninja )
- !dev-util/kdevelop:4
- !dev-util/kdevelop-clang
- !dev-util/kdevelop-qmake
- !dev-util/kdevelop-qmljs
- !<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-PATCHES=(
- "${FILESDIR}/${PN}-ninja-optional.patch"
- "${FILESDIR}/${P}-fix-cpp.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLEGACY_CPP_SUPPORT=$(usex !cxx)
- -DBUILD_cpp=OFF
- -DBUILD_cmake=$(usex cmake)
- -DBUILD_cmakebuilder=$(usex cmake)
- $(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)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2015-07-16 18:38 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2015-07-16 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 3f9eafb6a6447654aa7112f1715d901c43b3c6be
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jul 6 21:19:25 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 18:37:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f9eafb6
[dev-util/kdevelop] Add USE flag ninja and add optional RDEPEND
Ninja reported missing in terminal output without dev-util/ninja,
small patch makes it optional
Package-Manager: portage-2.2.18
dev-util/kdevelop/files/kdevelop-ninja-optional.patch | 9 +++++++++
dev-util/kdevelop/kdevelop-9999.ebuild | 6 +++++-
dev-util/kdevelop/metadata.xml | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
new file mode 100644
index 0000000..a84279b
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
@@ -0,0 +1,9 @@
+--- a/projectbuilders/CMakeLists.txt 2015-02-02 15:19:46.000000000 +0100
++++ b/projectbuilders/CMakeLists.txt 2015-07-06 22:51:22.083293634 +0200
+@@ -1,5 +1,5 @@
+
+ add_subdirectory(makebuilder)
+-add_subdirectory(ninjabuilder)
++ecm_optional_add_subdirectory(ninjabuilder)
+ ecm_optional_add_subdirectory(cmakebuilder)
+
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index e655b38..1b74024 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug +plasma qthelp"
+IUSE="+cmake +cxx debug +ninja +plasma qthelp"
KEYWORDS=""
# TODO: disabled upstream
@@ -48,16 +48,20 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_plasma_dep kio-extras)
cxx? ( >=sys-devel/gdb-7.0[python] )
+ ninja? ( dev-util/ninja )
!dev-util/kdevelop:4
"
RESTRICT="test"
# see bug 366471
+PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build cmake)
$(cmake-utils_use_build cmake cmakebuilder)
+ $(cmake-utils_use_build ninja ninjabuilder)
$(cmake-utils_use_build cxx cpp)
$(cmake-utils_use_build qthelp)
$(cmake-utils_use_find_package plasma KF5Plasma)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index d6717c3..2354710 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -4,6 +4,7 @@
<herd>kde</herd>
<use>
<flag name="cmake">Enable support for CMake build system</flag>
+ <flag name="ninja">Enable support for Ninja build system</flag>
<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
<flag name="okteta">Enable hex editor plugin</flag>
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2014-03-12 13:06 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-03-12 13:06 UTC (permalink / raw
To: gentoo-commits
commit: cafe4a8ac6827a7bd010c3a2b5459d7fb54fb717
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 12 12:24:20 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 12 12:24:20 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cafe4a8a
[dev-util/kdevelop] Bumped in tree + sync
Package-Manager: portage-2.2.8-r1
---
...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 -------------
dev-util/kdevelop/kdevelop-4.6.0.ebuild | 52 ----------------------
dev-util/kdevelop/kdevelop-9999.ebuild | 11 ++---
3 files changed, 6 insertions(+), 89 deletions(-)
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
deleted file mode 100644
index b456236..0000000
--- a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit fb4234cd72ceebb200bef13234ea9c36c9a62046
-Author: Kevin Funk <kevin@kfunk.org>
-Date: Sun Nov 3 22:09:56 2013 +0100
-
- Check if kdevplatform has JSON support
-
- BUG: 327095
-
-diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
-index 84ce3ee..fbdd4db 100644
---- a/languages/cpp/tests/CMakeLists.txt
-+++ b/languages/cpp/tests/CMakeLists.txt
-@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
- ########### next target ###############
-
- find_package(QJSON)
--if(QJSON_FOUND)
-+# Also check that kdevplatform is built with JSON support
-+# see: https://bugs.kde.org/show_bug.cgi?id=327095
-+if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
- set(cppfilestest_SRCS test_cppfiles.cpp)
- kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
- configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
-@@ -67,7 +69,7 @@ if(QJSON_FOUND)
- ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
- kdev4cppduchain
- )
--endif(QJSON_FOUND)
-+endif()
-
- ########### next target ###############
-
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
deleted file mode 100644
index d845dac..0000000
--- a/dev-util/kdevelop/kdevelop-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp reviewboard"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
- >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- okteta? ( $(add_kdebase_dep okteta) )
- qthelp? ( dev-qt/qthelp:4 )
- reviewboard? ( dev-libs/qjson )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kapptemplate)
- dev-qt/qtdeclarative:4[webkit]
- cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_build cmake)
- $(cmake-utils_use_build cmake cmakebuilder)
- $(cmake-utils_use_build cxx cpp)
- $(cmake-utils_use_with okteta LibKasten)
- $(cmake-utils_use_with okteta LibOkteta)
- $(cmake-utils_use_with okteta LibOktetaKasten)
- $(cmake-utils_use_build qthelp)
- $(cmake-utils_use_find_package reviewboard QJSON)
- )
-
- kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 80bdbfa..4b6f969 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -4,15 +4,14 @@
EAPI=5
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt
-pt_BR ru sl sv th uk zh_CN zh_TW"
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
VIRTUALX_REQUIRED=test
-
inherit kde4-base
DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
+IUSE="+cmake +cxx debug okteta qthelp reviewboard"
if [[ $PV == *9999* ]]; then
KEYWORDS=""
@@ -21,11 +20,12 @@ else
fi
DEPEND="
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
$(add_kdebase_dep ksysguard)
$(add_kdebase_dep libkworkspace)
- dev-libs/qjson
okteta? ( $(add_kdebase_dep okteta) )
qthelp? ( dev-qt/qthelp:4 )
+ reviewboard? ( dev-libs/qjson )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kapptemplate)
@@ -44,6 +44,7 @@ src_configure() {
$(cmake-utils_use_with okteta LibOkteta)
$(cmake-utils_use_with okteta LibOktetaKasten)
$(cmake-utils_use_build qthelp)
+ $(cmake-utils_use_find_package reviewboard QJSON)
)
kde4-base_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2013-12-27 16:19 Chris Reffett
0 siblings, 0 replies; 6+ messages in thread
From: Chris Reffett @ 2013-12-27 16:19 UTC (permalink / raw
To: gentoo-commits
commit: d5e16e90c83bdafb4ffa72a749887b1a99ce349a
Author: Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 15:20:37 2013 +0000
Commit: Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 15:20:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5e16e90
[dev-util/kdevelop] Bump to 4.6.0
Package-Manager: portage-2.2.7
---
...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 +++++++++++++
dev-util/kdevelop/kdevelop-4.6.0.ebuild | 52 ++++++++++++++++++++++
dev-util/kdevelop/metadata.xml | 1 +
3 files changed, 85 insertions(+)
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
new file mode 100644
index 0000000..b456236
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
@@ -0,0 +1,32 @@
+commit fb4234cd72ceebb200bef13234ea9c36c9a62046
+Author: Kevin Funk <kevin@kfunk.org>
+Date: Sun Nov 3 22:09:56 2013 +0100
+
+ Check if kdevplatform has JSON support
+
+ BUG: 327095
+
+diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
+index 84ce3ee..fbdd4db 100644
+--- a/languages/cpp/tests/CMakeLists.txt
++++ b/languages/cpp/tests/CMakeLists.txt
+@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
+ ########### next target ###############
+
+ find_package(QJSON)
+-if(QJSON_FOUND)
++# Also check that kdevplatform is built with JSON support
++# see: https://bugs.kde.org/show_bug.cgi?id=327095
++if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
+ set(cppfilestest_SRCS test_cppfiles.cpp)
+ kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
+ configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
+@@ -67,7 +69,7 @@ if(QJSON_FOUND)
+ ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
+ kdev4cppduchain
+ )
+-endif(QJSON_FOUND)
++endif()
+
+ ########### next target ###############
+
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
new file mode 100644
index 0000000..1841d14
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
+pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
+VIRTUALX_REQUIRED=test
+inherit kde4-base
+
+DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages."
+LICENSE="GPL-2 LGPL-2"
+IUSE="+cmake +cxx debug okteta qthelp reviewboard"
+SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
+
+if [[ $PV == *9999* ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DEPEND="
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
+ $(add_kdebase_dep ksysguard)
+ $(add_kdebase_dep libkworkspace)
+ okteta? ( $(add_kdebase_dep okteta) )
+ qthelp? ( dev-qt/qthelp:4 )
+ reviewboard? ( dev-libs/qjson )
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kapptemplate)
+ dev-qt/qtdeclarative:4[webkit]
+ cxx? ( >=sys-devel/gdb-7.0[python] )
+"
+RESTRICT="test"
+# see bug 366471
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_build cmake)
+ $(cmake-utils_use_build cmake cmakebuilder)
+ $(cmake-utils_use_build cxx cpp)
+ $(cmake-utils_use_with okteta LibKasten)
+ $(cmake-utils_use_with okteta LibOkteta)
+ $(cmake-utils_use_with okteta LibOktetaKasten)
+ $(cmake-utils_use_build qthelp)
+ $(cmake-utils_use_find_package reviewboard QJSON)
+ )
+
+ kde4-base_src_configure
+}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index d2b28f6..2316b9a 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -6,5 +6,6 @@
<flag name="cmake">Enable support for CMake build system</flag>
<flag name="okteta">Enable hex editor plugin</flag>
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+ <flag name="reviewboard">Enable reviewboard support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-29 13:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-29 13:32 [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-10-30 18:03 Johannes Huber
2016-08-31 14:30 Michael Palimaka
2015-07-16 18:38 Johannes Huber
2014-03-12 13:06 Johannes Huber
2013-12-27 16:19 Chris Reffett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox