diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-08-31 23:47:29 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-09-01 00:23:26 +1000 |
| commit | d57408f1eebf1425a48d66db8c9a8bb0c5d47674 (patch) | |
| tree | 67ecd32c89b1c7128700b34302be0d16e657ab72 /dev-util/kdevelop/files | |
| parent | dev-util/kdevelop-pg-qt: version bump (diff) | |
| download | gentoo-d57408f1eebf1425a48d66db8c9a8bb0c5d47674.tar.gz gentoo-d57408f1eebf1425a48d66db8c9a8bb0c5d47674.tar.bz2 gentoo-d57408f1eebf1425a48d66db8c9a8bb0c5d47674.zip | |
dev-util/kdevelop: version bump
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-util/kdevelop/files')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch | 47 | ||||
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-ninja-optional.patch | 11 |
2 files changed, 58 insertions, 0 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 000000000000..9b15fe954825 --- /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 000000000000..a60da91df6dc --- /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) |