[piklab] * Mon Jan 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.10-2 - Fix FTBFS with GCC 4.6

[Kevin Kofler]

commit 73edae8776e3901db24a28605000ec46e250c37c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jan 31 17:06:52 2011 +0100

    * Mon Jan 31 2011  Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.10-2
      - Fix FTBFS with GCC 4.6

 piklab-0.15.10-gcc46.patch |   12 ++++++++++++
 piklab.spec                |    9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/piklab-0.15.10-gcc46.patch b/piklab-0.15.10-gcc46.patch
new file mode 100644
index 0000000..e53b594
--- /dev/null
+++ b/piklab-0.15.10-gcc46.patch
@@ -0,0 +1,12 @@
+diff -ur piklab-0.15.10/src/xml_to_data/device_xml_to_data.h piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h
+--- piklab-0.15.10/src/xml_to_data/device_xml_to_data.h	2010-07-05 18:16:57.000000000 +0200
++++ piklab-0.15.10-gcc46/src/xml_to_data/device_xml_to_data.h	2011-01-31 17:03:42.000000000 +0100
+@@ -61,7 +61,7 @@
+     ts << "const char *" << namespaceName() << "::DATA_STREAM =" << endl;
+     QValueList<DataType *> list;
+     for (QMap<QString, Data *>::const_iterator it=_map.begin(); it!=_map.end(); ++it)
+-      list.append(static_cast<const DataType *>(it.data()));
++      list.append(static_cast<DataType *>(it.data()));
+     uint size = toCppString(list, ts);
+     ts << ";" << endl;
+     ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
diff --git a/piklab.spec b/piklab.spec
index 1111a58..56cfe8a 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -2,7 +2,7 @@
 
 Name:       piklab
 Version:    0.15.10
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -21,6 +21,7 @@ Source6:    %{name}-LISEZMOI.Fedora
 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
 
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +58,7 @@ comment finir l'installation.
 %patch0 -p0 -b .desktop-fr
 %patch1 -p0 -b .x-desktop-fr
 %patch2 -p0 -b .use-fedora-docdir
+%patch3 -p1 -b .gcc46
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -136,7 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
-* Sat Jan 30 2011  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.10-1
+* Mon Jan 31 2011  Kevin Kofler <Kevin at tigcc.ticalc.org> 0.5.10-2
+  - Fix FTBFS with GCC 4.6
+
+* Sat Jan 29 2011  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.10-1
   - New upstream version
   - Fix rules (BZ #594932), patch from David Dillow