| 1 |
creffett 12/06/30 01:20:52 |
| 2 |
|
| 3 |
Added: kaffeine-1.2.2-gcc4.7.patch |
| 4 |
Log: |
| 5 |
Added patch to fix building with gcc 4.7, wrt bug 424057 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: kaffeine-1.2.2-gcc4.7.patch |
| 16 |
=================================================================== |
| 17 |
commit 2da9df1e67004c3cfa879578c351300a99f23da1 |
| 18 |
Author: Christoph Pfister <christophpfister@×××××.com> |
| 19 |
Date: Wed Apr 4 21:22:09 2012 +0200 |
| 20 |
|
| 21 |
fix build for gcc 4.7 |
| 22 |
|
| 23 |
diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp |
| 24 |
index 7fc8f68..e70d8b8 100644 |
| 25 |
--- a/src/dvb/dvbepg.cpp |
| 26 |
+++ b/src/dvb/dvbepg.cpp |
| 27 |
@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size) |
| 28 |
// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011) |
| 29 |
QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC); |
| 30 |
|
| 31 |
- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid(); |
| 32 |
- --entryCount, entry.advance()) { |
| 33 |
+ for (AtscEitSectionEntry eitEntry = eitSection.entries(); |
| 34 |
+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) { |
| 35 |
DvbEpgEntry epgEntry; |
| 36 |
epgEntry.channel = channel; |
| 37 |
- epgEntry.begin = baseDateTime.addSecs(entry.startTime()); |
| 38 |
- epgEntry.duration = QTime().addSecs(entry.duration()); |
| 39 |
- epgEntry.title = entry.title(); |
| 40 |
+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); |
| 41 |
+ epgEntry.duration = QTime().addSecs(eitEntry.duration()); |
| 42 |
+ epgEntry.title = eitEntry.title(); |
| 43 |
|
| 44 |
- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); |
| 45 |
+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); |
| 46 |
DvbSharedEpgEntry entry = epgEntries.value(id); |
| 47 |
|
| 48 |
if (entry.isValid() && (entry->channel == epgEntry.channel) && |
Archives