[kdevplatform] * Sat Jan 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.0-2 - fix FTBFS with g++ 4.6

[Kevin Kofler]

commit 180df7513303186cebfbfa7ff963a0f599cf0e82
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Jan 29 02:57:06 2011 +0100

    * Sat Jan 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.0-2
    - fix FTBFS with g++ 4.6

 kdevplatform-1.2.0-gcc46.patch |   24 ++++++++++++++++++++++++
 kdevplatform.spec              |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/kdevplatform-1.2.0-gcc46.patch b/kdevplatform-1.2.0-gcc46.patch
new file mode 100644
index 0000000..4c789a3
--- /dev/null
+++ b/kdevplatform-1.2.0-gcc46.patch
@@ -0,0 +1,24 @@
+diff -ur kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h
+--- kdevplatform-1.2.0/language/duchain/repositories/itemrepository.h	2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/duchain/repositories/itemrepository.h	2011-01-29 02:54:27.000000000 +0100
+@@ -236,7 +236,7 @@
+ 
+     QString m_name;
+     int m_version;
+-    mutable ItemRepositoryRegistry& m_registry;
++    ItemRepositoryRegistry& m_registry;
+     AbstractRepositoryManager* (*m_shareMutex)();
+ };
+ 
+diff -ur kdevplatform-1.2.0/language/util/basicsetrepository.h kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h
+--- kdevplatform-1.2.0/language/util/basicsetrepository.h	2011-01-23 20:29:25.000000000 +0100
++++ kdevplatform-1.2.0-gcc46/language/util/basicsetrepository.h	2011-01-29 02:53:21.000000000 +0100
+@@ -129,7 +129,7 @@
+   SetNodeData data;
+   
+   uint m_hash;
+-  mutable SetDataRepository& repository;
++  SetDataRepository& repository;
+   mutable BasicSetRepository* setRepository; //May be zero when no notifications are wanted
+   mutable bool m_created;
+ };
diff --git a/kdevplatform.spec b/kdevplatform.spec
index 3495c01..bec687f 100644
--- a/kdevplatform.spec
+++ b/kdevplatform.spec
@@ -2,12 +2,14 @@
 Name:           kdevplatform
 Summary:        Libraries for use by KDE development tools
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.2.0/src/kdevplatform-%{version}.tar.bz2
+# fix FTBFS with g++ 4.6
+Patch0:         kdevplatform-1.2.0-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -48,6 +50,7 @@ Requires: subversion-devel
 
 %prep
 %setup -q -n kdevplatform-%{version}
+%patch0 -p1 -b .gcc46
 
 
 %build
@@ -109,6 +112,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Sat Jan 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.0-2
+- fix FTBFS with g++ 4.6
+
 * Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-1
 - 1.2.0