diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/kaffeine/kaffeine-fix-gcc4.7.patch | 35 | ||||
| -rw-r--r-- | multimedia/kaffeine/kaffeine.SlackBuild | 4 |
2 files changed, 38 insertions, 1 deletions
diff --git a/multimedia/kaffeine/kaffeine-fix-gcc4.7.patch b/multimedia/kaffeine/kaffeine-fix-gcc4.7.patch new file mode 100644 index 0000000000000..7d8785aa6b2e8 --- /dev/null +++ b/multimedia/kaffeine/kaffeine-fix-gcc4.7.patch @@ -0,0 +1,35 @@ +From: Christoph Pfister <christophpfister@gmail.com> +Date: Wed, 04 Apr 2012 19:22:09 +0000 +Subject: fix build for gcc 4.7 +X-Git-Url: http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e67004c3cfa879578c351300a99f23da1 +--- +fix build for gcc 4.7 +--- + + +--- a/src/dvb/dvbepg.cpp ++++ b/src/dvb/dvbepg.cpp +@@ -690,15 +690,15 @@ + // 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(); +- +- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); ++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); ++ epgEntry.duration = QTime().addSecs(eitEntry.duration()); ++ epgEntry.title = eitEntry.title(); ++ ++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); + DvbSharedEpgEntry entry = epgEntries.value(id); + + if (entry.isValid() && (entry->channel == epgEntry.channel) && + diff --git a/multimedia/kaffeine/kaffeine.SlackBuild b/multimedia/kaffeine/kaffeine.SlackBuild index 4de7b90449f56..c1e2acd253e1c 100644 --- a/multimedia/kaffeine/kaffeine.SlackBuild +++ b/multimedia/kaffeine/kaffeine.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=kaffeine VERSION=${VERSION:-1.2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,6 +71,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Add upstream patch +patch -p1 < $CWD/kaffeine-fix-gcc4.7.patch mkdir -p build cd build cmake \ |