public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [gentoo-commits] gentoo-x86 commit in media-video/kaffeine/files: kaffeine-1.2.2-gcc4.7.patch
@ 2012-06-30  1:20 99% Chris Reffett (creffett)
  0 siblings, 0 replies; 1+ results
From: Chris Reffett (creffett) @ 2012-06-30  1:20 UTC (permalink / raw
  To: gentoo-commits

creffett    12/06/30 01:20:52

  Added:                kaffeine-1.2.2-gcc4.7.patch
  Log:
  Added patch to fix building with gcc 4.7, wrt bug 424057
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch

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
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

Index: kaffeine-1.2.2-gcc4.7.patch
===================================================================
commit 2da9df1e67004c3cfa879578c351300a99f23da1
Author: Christoph Pfister <christophpfister@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) &&






^ permalink raw reply related	[relevance 99%]

Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-06-30  1:20 99% [gentoo-commits] gentoo-x86 commit in media-video/kaffeine/files: kaffeine-1.2.2-gcc4.7.patch Chris Reffett (creffett)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox