[kdevplatform] Fix kdevelop-php build failure

[Radek Novacek]

commit 5cb96099a54410cdfb49ffbdce90f285a51a9053
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Wed Jan 25 14:27:00 2012 +0100

    Fix kdevelop-php build failure

 kdevplatform-1.2.81-fix-kdevphp-build.patch |   27 +++++++++++++++++++++++++++
 kdevplatform.spec                           |    8 +++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/kdevplatform-1.2.81-fix-kdevphp-build.patch b/kdevplatform-1.2.81-fix-kdevphp-build.patch
new file mode 100644
index 0000000..007cd37
--- /dev/null
+++ b/kdevplatform-1.2.81-fix-kdevphp-build.patch
@@ -0,0 +1,27 @@
+diff -up kdevplatform-1.2.81/language/duchain/builders/abstractdeclarationbuilder.h.fix-kdevphp-build kdevplatform-1.2.81/language/duchain/builders/abstractdeclarationbuilder.h
+--- kdevplatform-1.2.81/language/duchain/builders/abstractdeclarationbuilder.h.fix-kdevphp-build	2012-01-25 12:08:22.896234636 +0100
++++ kdevplatform-1.2.81/language/duchain/builders/abstractdeclarationbuilder.h	2012-01-25 12:09:16.348670648 +0100
+@@ -71,9 +71,9 @@ protected:
+   {
+     DUChainWriteLocker lock(DUChain::lock());
+ 
+-    RangeInRevision newRange = editorFindRange(name ? name : range, name ? name : range);
++    RangeInRevision newRange = this->editorFindRange(name ? name : range, name ? name : range);
+ 
+-    QualifiedIdentifier id = identifierForNode(name);
++    QualifiedIdentifier id = this->identifierForNode(name);
+ 
+     return openDeclaration<DeclarationT>(id, newRange, flags);
+   }
+diff -up kdevplatform-1.2.81/language/duchain/builders/abstractusebuilder.h.fix-kdevphp-build kdevplatform-1.2.81/language/duchain/builders/abstractusebuilder.h
+--- kdevplatform-1.2.81/language/duchain/builders/abstractusebuilder.h.fix-kdevphp-build	2012-01-25 12:09:52.926652605 +0100
++++ kdevplatform-1.2.81/language/duchain/builders/abstractusebuilder.h	2012-01-25 12:12:47.761336852 +0100
+@@ -113,7 +113,7 @@ protected:
+    */
+   void newUse(T* node, const KDevelop::DeclarationPointer& declaration)
+   {
+-    newUse(node, editorFindRange(node, node), declaration);
++    newUse(node, this->editorFindRange(node, node), declaration);
+   }
+ 
+   /**
diff --git a/kdevplatform.spec b/kdevplatform.spec
index 0ca8cce..8f21952 100644
--- a/kdevplatform.spec
+++ b/kdevplatform.spec
@@ -2,7 +2,7 @@
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        1.2.81
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
@@ -13,6 +13,8 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.2.3/src/kdevplatform
 Patch0:         kdevplatform-1.2.3-no-rpath.patch
 # Fix build failure with g++ 4.7 (missing unistd.h include)
 Patch1:         kdevplatform-1.2.81-fix-for-g++47.patch
+# Fix kdevelop-php build failure
+Patch2:         kdevplatform-1.2.81-fix-kdevphp-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +59,7 @@ Requires: subversion-devel
 %setup -q -n kdevplatform-%{version}
 %patch0 -p1 -b .no-rpath
 %patch1 -p1 -b .fix-for-g++47
+%patch2 -p1 -b .fix-kdevphp-build
 
 
 %build
@@ -121,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Jan 25 2012 Radek Novacek <rnovacek at redhat.com> 1.2.81-2
+- Fix kdevelop-php build failure
+
 * Mon Jan 23 2012 Radek Novacek <rnovacek at redhat.com> 1.2.81-1
 - Update to 1.2.81 (1.3 beta)
 - Fix missing unistd.h include (g++ 4.7 issue)