[kaffeine] backport upstream patch to fix FTBFS with g++ 4.7

[Kevin Kofler]

commit 64eb96749f4ab07f607f395e2403c63b856cdbb3
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Apr 22 00:27:49 2012 +0200

    backport upstream patch to fix FTBFS with g++ 4.7
    
    * Sat Apr 21 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.2-3
    - backport upstream patch to fix FTBFS with g++ 4.7

 kaffeine-1.2.2-gcc47.patch |   32 ++++++++++++++++++++++++++++++++
 kaffeine.spec              |   11 +++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/kaffeine-1.2.2-gcc47.patch b/kaffeine-1.2.2-gcc47.patch
new file mode 100644
index 0000000..e74563e
--- /dev/null
+++ b/kaffeine-1.2.2-gcc47.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister at gmail.com>
+Date:   Wed Apr 4 21:22:09 2012 +0200
+
+    fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ 	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ 	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+ 
+-	for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+-	     --entryCount, entry.advance()) {
++	for (AtscEitSectionEntry eitEntry = eitSection.entries();
++	     (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ 		DvbEpgEntry epgEntry;
+ 		epgEntry.channel = channel;
+-		epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+-		epgEntry.duration = QTime().addSecs(entry.duration());
+-		epgEntry.title = entry.title();
++		epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++		epgEntry.duration = QTime().addSecs(eitEntry.duration());
++		epgEntry.title = eitEntry.title();
+ 
+-		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ 		DvbSharedEpgEntry entry = epgEntries.value(id);
+ 
+ 		if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/kaffeine.spec b/kaffeine.spec
index 5cbf877..7072380 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
 Name:    kaffeine
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
@@ -9,7 +9,10 @@ URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
+## upstream patches
+# fix build with g++ 4.7 (Christoph Pfister)
+# http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
+Patch100: kaffeine-1.2.2-gcc47.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -29,6 +32,7 @@ Kaffeine is a KDE media player.
 
 %prep
 %setup -q -n kaffeine-%{version}
+%patch100 -p1 -b .gcc47
 
 
 %build
@@ -88,6 +92,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 
 %changelog
+* Sat Apr 21 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.2-3
+- backport upstream patch to fix FTBFS with g++ 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild