Bug 594304 – =dev-util/kdevelop-5.0.1 request for version bump

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Petros 2016-09-19 07:22:33 UTC]

Created attachment 446514 [details]
build.log

Last night I noticed that KDevelop-5.0.1 has been released. I managed to get it working by renaming *both* dev-util/kdevelop and dev-util/kdevplatform from 5.0.0 to 5.0.1 in a local overlay.

Sources were downloaded, but there was a hickup with kdevelop-5.0.0-fix-cpp.patch. Renaming the patch version to 5.0.1 didn't work, so for the moment the patch is disabled within the kdevelop ebuild. 

After this =dev-util/kdevelop-5.0.1 and =dev-util/kdevplatform-5.0.1 compiled ok.

Anyone who knows better on the patch isue?

[Comment 1 Petros 2016-09-19 11:06:36 UTC]

After usign ebuild kdevelop.xxx-ebuild prepare command, I inspected the $WORKDIR and the files that failed to be patched. 

The  "languages/cpp/cppduchain/cppducontext.cpp.rej" is this:
***

--- languages/cpp/cppduchain/cppducontext.cpp
+++ 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 );


*** 
When I tried to make the changes myself to cppducontext.cpp and then create another patch, I realized that the file is already as the *.rej file proposes.

After disabling the patch in the ebuild and running ebuild kdevelop.xxx-ebuild clean and once again prepare, I noticed that the same changes were present.

So...is the changes merged in this version and the kdevelop-${PV}-fix-cpp.patch has no reason to exist anymore?

[Comment 2 Petros 2016-09-19 11:08:47 UTC]

Created attachment 446610 [details, diff]
cppducontext.cpp.rej

[Comment 3 Michael Palimaka (kensington) 2016-09-21 15:15:05 UTC]

Thanks, Andreas' PR has been merged now.