[piklab] Add piklab-0.15.10-gcc47.patch (Fix FTBFS with GCC 4.7).

[corsepiu]

commit d2d5aa326277bc69260050fc34c6eea8b6604078
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jan 17 07:57:47 2012 +0100

    Add piklab-0.15.10-gcc47.patch (Fix FTBFS with GCC 4.7).

 piklab-0.15.10-gcc47.patch |   36 ++++++++++++++++++++++++++++++++++++
 piklab.spec                |    8 ++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/piklab-0.15.10-gcc47.patch b/piklab-0.15.10-gcc47.patch
new file mode 100644
index 0000000..1cadcec
--- /dev/null
+++ b/piklab-0.15.10-gcc47.patch
@@ -0,0 +1,36 @@
+diff -Naur piklab-0.15.10.orig/src/common/common/range.h piklab-0.15.10/src/common/common/range.h
+--- piklab-0.15.10.orig/src/common/common/range.h	2010-07-05 18:16:51.000000000 +0200
++++ piklab-0.15.10/src/common/common/range.h	2012-01-17 07:18:50.482097827 +0100
+@@ -43,7 +43,7 @@
+ {
+ public:
+   GenericRangeVector() {}
+-  GenericRangeVector(const RangeType &range) { append(range); }
++  GenericRangeVector(const RangeType &range) { this->append(range); }
+   bool isEmpty() const {
+     uint nb = this->count();
+     for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false;
+diff -Naur piklab-0.15.10.orig/src/devices/base/device_group.h piklab-0.15.10/src/devices/base/device_group.h
+--- piklab-0.15.10.orig/src/devices/base/device_group.h	2010-07-05 18:16:35.000000000 +0200
++++ piklab-0.15.10/src/devices/base/device_group.h	2012-01-17 07:32:09.089353912 +0100
+@@ -47,7 +47,7 @@
+ {
+ protected:
+   virtual void initSupported() {
+-    QValueList<DataType *> list = fromCppString(dataStream(), dataSize());
++    QValueList<DataType *> list = this->fromCppString(dataStream(), dataSize());
+     for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested);
+   }
+   virtual uint dataSize() const = 0;
+diff -Naur piklab-0.15.10.orig/src/xml_to_data/device_xml_to_data.h piklab-0.15.10/src/xml_to_data/device_xml_to_data.h
+--- piklab-0.15.10.orig/src/xml_to_data/device_xml_to_data.h	2012-01-17 07:17:55.584186284 +0100
++++ piklab-0.15.10/src/xml_to_data/device_xml_to_data.h	2012-01-17 07:42:25.681588964 +0100
+@@ -62,7 +62,7 @@
+     QValueList<DataType *> list;
+     for (QMap<QString, Data *>::const_iterator it=_map.begin(); it!=_map.end(); ++it)
+       list.append(static_cast<DataType *>(it.data()));
+-    uint size = toCppString(list, ts);
++    uint size = this->toCppString(list, ts);
+     ts << ";" << endl;
+     ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
+     file.close();
diff --git a/piklab.spec b/piklab.spec
index fb542f0..a43996a 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.10
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -22,7 +22,7 @@ Patch0:     %{name}-0.15.3.desktop-fr.patch
 Patch1:     %{name}-0.12.1.x-desktop-fr.patch
 Patch2:     %{name}-0.15.8.use-fedora-docdir.patch
 Patch3:     %{name}-0.15.10-gcc46.patch
-
+Patch4:     %{name}-0.15.10-gcc47.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -59,6 +59,7 @@ comment finir l'installation.
 %patch1 -p0 -b .x-desktop-fr
 %patch2 -p0 -b .use-fedora-docdir
 %patch3 -p1 -b .gcc46
+%patch4 -p1 -b .gcc47
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -138,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Tue Jan 17 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.15.10-5
+- Add piklab-0.15.10-gcc47.patch (Fix FTBFS with GCC 4.7).
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild