[SCM] kaffeine packaging branch, master, updated. debian/0.8.4-5-38-gc29fb51

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=c29fb51

The following commit has been merged in the master branch:
commit c29fb51ceed4c9f01e8d3e934ed049f7f6bf0f42
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat May 12 22:41:53 2012 +0200

    Add ftbfs_gcc47.diff.
---
 debian/changelog                |    1 +
 debian/patches/ftbfs_gcc47.diff |   28 ++++++++++++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcc6e3e..aebc836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kaffeine (1.2.2-2) UNRELEASED; urgency=low
 
+   * Add ftbfs_gcc47.diff, avoids an FTBFS with GCC 4.7 (Closes: #667218)
    * Update Vcs-* fields, kaffeine packaging was just moved to git.
    * Bump Standards-Version to 3.9.3, no changes needed.
 
diff --git a/debian/patches/ftbfs_gcc47.diff b/debian/patches/ftbfs_gcc47.diff
new file mode 100644
index 0000000..962947b
--- /dev/null
+++ b/debian/patches/ftbfs_gcc47.diff
@@ -0,0 +1,28 @@
+Author: Christoph Pfister <christophpfister at gmail.com>
+Origin: http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e
+Description: fix build for gcc 4.7
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(co
+ 	// 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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b1cb9c2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ftbfs_gcc47.diff

-- 
kaffeine packaging