[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Andreas Sturmlechner]

commit:     25c792d8ad0764aa7b9d06ee441beb53cbedddb3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 18:03:18 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 18:03:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c792d8

dev-util/kdevelop: Fix missing header with Frameworks 5.61

Closes: https://bugs.gentoo.org/692466
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kdevelop-5.3.3-missing-header.patch      | 25 ++++++++++++++++++++++
 dev-util/kdevelop/kdevelop-5.3.3.ebuild            |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
new file mode 100644
index 00000000000..39b1122f718
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
@@ -0,0 +1,25 @@
+From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
+From: Tomaz Canabrava <tcanabrava@kde.org>
+Date: Thu, 18 Jul 2019 18:07:39 +0200
+Subject: Add missing include
+
+(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
+---
+ kdevplatform/shell/mainwindow_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
+index 3020957..1e915a0 100644
+--- a/kdevplatform/shell/mainwindow_p.h
++++ b/kdevplatform/shell/mainwindow_p.h
+@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
+ #include <QObject>
+ #include <QPointer>
+ #include <QWidget>
+-
++#include <QMap>
+ #include <KXMLGUIClient>
+ 
+ #include <language/util/navigationtooltip.h>
+-- 
+cgit v1.1

diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
index 9f502160d9d..0e818dc362f 100644
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
@@ -93,6 +93,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # see bug 366471
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Andreas Sturmlechner]

commit:     ed8c0f1f3b9abc60c4e4e808a580500c8237b0dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 17:03:57 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 17:07:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8c0f1f

dev-util/kdevelop: Fix build with dev-util/astyle-3.4

Closes: https://bugs.gentoo.org/908977
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kdevelop-23.04.2-astyle-3.4.patch        | 62 ++++++++++++++++++++++
 dev-util/kdevelop/kdevelop-23.04.2.ebuild          |  2 +
 2 files changed, 64 insertions(+)

diff --git a/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch b/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch
new file mode 100644
index 000000000000..e5a73298aa19
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-23.04.2-astyle-3.4.patch
@@ -0,0 +1,62 @@
+From 8ca40a6454f053a262926794b96024bd02e0cdc5 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Wed, 31 May 2023 09:31:02 +0200
+Subject: [PATCH] Fix compile with newer astyle
+
+astyle::streamoff was always just an alias for std::streamoff,
+see also the upstream commit [1] that removed the
+`using namespace std` in the `astyle` namespace which breaks this
+code of our here now.
+
+[1]: https://gitlab.com/saalen/astyle/-/commit/0add646b21ee329b231ef7c5ab6963a94fb8935b
+---
+ plugins/astyle/astyle_stringiterator.cpp | 4 ++--
+ plugins/astyle/astyle_stringiterator.h   | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/astyle/astyle_stringiterator.cpp b/plugins/astyle/astyle_stringiterator.cpp
+index 02f8fb4264..a611869581 100644
+--- a/plugins/astyle/astyle_stringiterator.cpp
++++ b/plugins/astyle/astyle_stringiterator.cpp
+@@ -22,7 +22,7 @@ AStyleStringIterator::~AStyleStringIterator()
+ {
+ }
+ 
+-astyle::streamoff AStyleStringIterator::tellg()
++std::streamoff AStyleStringIterator::tellg()
+ {
+   return m_is.pos();
+ }
+@@ -59,7 +59,7 @@ void AStyleStringIterator::peekReset()
+     m_peekStart = -1; // invalid
+ }
+ 
+-astyle::streamoff AStyleStringIterator::getPeekStart() const
++std::streamoff AStyleStringIterator::getPeekStart() const
+ {
+     // NOTE: we're not entirely sure if this is the correct implementation.
+     // we're trying to work-around https://bugs.kde.org/show_bug.cgi?id=399048
+diff --git a/plugins/astyle/astyle_stringiterator.h b/plugins/astyle/astyle_stringiterator.h
+index f63a59c611..713800c0f3 100644
+--- a/plugins/astyle/astyle_stringiterator.h
++++ b/plugins/astyle/astyle_stringiterator.h
+@@ -21,13 +21,14 @@ public:
+     explicit AStyleStringIterator(const QString &string);
+     ~AStyleStringIterator() override;
+ 
+-    astyle::streamoff tellg() override;
++    std::streamoff tellg() override;
+     int getStreamLength() const override;
+     bool hasMoreLines() const override;
+     std::string nextLine(bool emptyLineWasDeleted = false) override;
+     std::string peekNextLine() override;
+     void peekReset() override;
+-    astyle::streamoff getPeekStart() const override;
++    std::streamoff getPeekStart() const override;
++
+ private:
+     QString m_content;
+     QTextStream m_is;
+-- 
+GitLab
+

diff --git a/dev-util/kdevelop/kdevelop-23.04.2.ebuild b/dev-util/kdevelop/kdevelop-23.04.2.ebuild
index 2d0c7632d4a1..949487270abd 100644
--- a/dev-util/kdevelop/kdevelop-23.04.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-23.04.2.ebuild
@@ -95,6 +95,8 @@ RDEPEND="${COMMON_DEPEND}
 	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-astyle-3.4.patch" ) # bug 908977
+
 llvm_check_deps() {
 	has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Maciej Mrozowski]

commit:     7d125afeff2d6b6b17ba9abf572ab6bd24cc5dba
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 18 00:27:23 2019 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 18 00:27:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d125afe

dev-util/kdevelop: Fix typo in QtCreator shortcuts theme (5.3.1)

Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../kdevelop-5.3.1-typo-in-QtCreator-theme.patch   |  26 ++++
 dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild         | 135 +++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch b/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
new file mode 100644
index 00000000000..97a0b660760
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
@@ -0,0 +1,26 @@
+From 8ceab1ea06ea846acf1d75955b0e0e725fc8b2fa Mon Sep 17 00:00:00 2001
+From: Maciej Mrozowski <reavertm@gmail.com>
+Date: Fri, 18 Jan 2019 00:59:28 +0100
+Subject: [PATCH] Fix typo in move cursor left action in QtCreator shortcuts
+ theme
+
+---
+ shortcuts/QtCreator | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shortcuts/QtCreator b/shortcuts/QtCreator
+index bd1334742e..b74aba9b54 100644
+--- a/shortcuts/QtCreator
++++ b/shortcuts/QtCreator
+@@ -38,7 +38,7 @@
+     <Action shortcut="Down" name="move_line_down"/>
+     <Action shortcut="Up" name="move_line_up"/>
+     <Action shortcut="Right" name="move_cursor_right"/>
+-    <Action shortcut="Left" name="move_cusor_left"/>
++    <Action shortcut="Left" name="move_cursor_left"/>
+     <Action shortcut="Shift+Down" name="select_line_down"/>
+     <Action shortcut="PgUp" name="scroll_page_up"/>
+     <Action shortcut="Shift+PgUp" name="select_page_up"/>
+-- 
+2.19.2
+

diff --git a/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild b/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild
new file mode 100644
index 00000000000..ca7b83fd34a
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.3"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(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 kguiaddons)
+	$(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 knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep threadweaver)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qthelp)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	>=sys-devel/clang-3.8.0:=
+	x11-misc/shared-mime-info
+	gdbui? ( $(add_plasma_dep libksysguard) )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( $(add_frameworks_dep purpose) )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+PATCHES=(
+	"${FILESDIR}/${P}-typo-in-QtCreator-theme.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Johannes Huber]

commit:     fbf77a3bbbf8137cf64f2fca4f4488f939db6f09
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 16:41:13 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 16:42:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf77a3b

dev-util/kdevelop: Remove 5.2.1

Superseded by 5.2.3.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-util/kdevelop/Manifest                         |   1 -
 .../kdevelop/files/kdevelop-5.2.1-qt-5.11.patch    |  52 --------
 dev-util/kdevelop/kdevelop-5.2.1.ebuild            | 135 ---------------------
 3 files changed, 188 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 96c2e88ae23..e74e0c9097d 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d

diff --git a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
deleted file mode 100644
index 72b0f8b035c..00000000000
--- a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
-From: Andras Mantia <andras@kdab.com>
-Date: Mon, 12 Feb 2018 17:52:15 +0200
-Subject: Add includes to build with Qt 5.11
-
-(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
----
- plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
- plugins/externalscript/editexternalscript.cpp      | 1 +
- plugins/git/gitnameemaildialog.cpp                 | 2 ++
- 3 files changed, 4 insertions(+)
-
-diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
-index e8d32ef..543b69f 100644
---- a/plugins/debuggercommon/widgets/disassemblewidget.h
-+++ b/plugins/debuggercommon/widgets/disassemblewidget.h
-@@ -26,6 +26,7 @@
- 
- #include "mi/mi.h"
- 
-+#include <QActionGroup>
- #include <QTreeWidget>
- #include <QUrl>
- 
-diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
-index 5ec756b..2c0de28 100644
---- a/plugins/externalscript/editexternalscript.cpp
-+++ b/plugins/externalscript/editexternalscript.cpp
-@@ -23,6 +23,7 @@
- 
- #include "externalscriptitem.h"
- 
-+#include <QAction>
- #include <QDialogButtonBox>
- #include <QPushButton>
- 
-diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
-index ba24a70..ddba09c 100644
---- a/plugins/git/gitnameemaildialog.cpp
-+++ b/plugins/git/gitnameemaildialog.cpp
-@@ -27,6 +27,8 @@
- 
- #include <QDialog>
- #include <QPushButton>
-+#include <QRegularExpression>
-+#include <QValidator>
- 
- using namespace KDevelop;
- 
--- 
-cgit v0.11.2
-

diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
deleted file mode 100644
index 93a5bc5f7b9..00000000000
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kguiaddons)
-	$(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 knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( kde-frameworks/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Andreas Sturmlechner]

commit:     19b98a019d762ab5f099f25499c4fe2d6002c2ca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 13:27:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 13:27:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b98a01

dev-util/kdevelop: Fix build with Qt 5.11

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../kdevelop/files/kdevelop-5.2.1-qt-5.11.patch    | 52 ++++++++++++++++++++++
 dev-util/kdevelop/kdevelop-5.2.1.ebuild            |  2 +
 2 files changed, 54 insertions(+)

diff --git a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
new file mode 100644
index 00000000000..72b0f8b035c
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
@@ -0,0 +1,52 @@
+From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
+From: Andras Mantia <andras@kdab.com>
+Date: Mon, 12 Feb 2018 17:52:15 +0200
+Subject: Add includes to build with Qt 5.11
+
+(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
+---
+ plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
+ plugins/externalscript/editexternalscript.cpp      | 1 +
+ plugins/git/gitnameemaildialog.cpp                 | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
+index e8d32ef..543b69f 100644
+--- a/plugins/debuggercommon/widgets/disassemblewidget.h
++++ b/plugins/debuggercommon/widgets/disassemblewidget.h
+@@ -26,6 +26,7 @@
+ 
+ #include "mi/mi.h"
+ 
++#include <QActionGroup>
+ #include <QTreeWidget>
+ #include <QUrl>
+ 
+diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
+index 5ec756b..2c0de28 100644
+--- a/plugins/externalscript/editexternalscript.cpp
++++ b/plugins/externalscript/editexternalscript.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include "externalscriptitem.h"
+ 
++#include <QAction>
+ #include <QDialogButtonBox>
+ #include <QPushButton>
+ 
+diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
+index ba24a70..ddba09c 100644
+--- a/plugins/git/gitnameemaildialog.cpp
++++ b/plugins/git/gitnameemaildialog.cpp
+@@ -27,6 +27,8 @@
+ 
+ #include <QDialog>
+ #include <QPushButton>
++#include <QRegularExpression>
++#include <QValidator>
+ 
+ using namespace KDevelop;
+ 
+-- 
+cgit v0.11.2
+

diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index d0dab918f87..832fd76122c 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
@@ -96,6 +96,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-16.04.0
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt.5.11.patch" )
+
 RESTRICT+=" test"
 # see bug 366471
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/, dev-util/kdevelop/files/

[Michael Palimaka]

commit:     d57408f1eebf1425a48d66db8c9a8bb0c5d47674
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 13:47:29 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:23:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57408f1

dev-util/kdevelop: version bump

Package-Manager: portage-2.3.0

 .../kdevelop/files/kdevelop-5.0.0-fix-cpp.patch    | 47 ++++++++++
 .../kdevelop/files/kdevelop-ninja-optional.patch   | 11 +++
 dev-util/kdevelop/kdevelop-5.0.0.ebuild            | 99 ++++++++++++++++++++++
 dev-util/kdevelop/metadata.xml                     |  2 +
 4 files changed, 159 insertions(+)

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 00000000..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/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
new file mode 100644
index 00000000..a60da91
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
@@ -0,0 +1,11 @@
+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.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
new file mode 100644
index 00000000..c533824
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
@@ -0,0 +1,99 @@
+# 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
+}

diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index e60001d..a83234df7 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -8,7 +8,9 @@
 	<use>
 		<flag name="cmake">Enable support for CMake build system</flag>
 		<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</flag>
+		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
 	</use>
 </pkgmetadata>