[arch-commits] Commit in kaffeine/trunk (kaffeine-1.2.2-gcc4.7.patch)

Antonio Rojas arojas at archlinux.org
Sat Aug 15 22:52:59 UTC 2015


    Date: Sunday, August 16, 2015 @ 00:52:59
  Author: arojas
Revision: 138397

Remove old patch

Deleted:
  kaffeine/trunk/kaffeine-1.2.2-gcc4.7.patch

-----------------------------+
 kaffeine-1.2.2-gcc4.7.patch |   32 --------------------------------
 1 file changed, 32 deletions(-)

Deleted: kaffeine-1.2.2-gcc4.7.patch
===================================================================
--- kaffeine-1.2.2-gcc4.7.patch	2015-08-15 22:51:53 UTC (rev 138396)
+++ kaffeine-1.2.2-gcc4.7.patch	2015-08-15 22:52:59 UTC (rev 138397)
@@ -1,32 +0,0 @@
-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) &&



More information about the arch-commits mailing list