Date: Wed, 4 Sep 2013 02:02:38 GMT From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/181788: [PATCH] multimedia/kaffeine: fix build with clang Message-ID: <201309040202.r8422clb064236@meatwad.mouf.net> Resent-Message-ID: <201309040210.r842A0wb023443@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181788 >Category: ports >Synopsis: [PATCH] multimedia/kaffeine: fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Sep 04 02:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Steve Wills >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #4 r255014M: Thu Aug 29 01:43:17 UTC >Description: Fix build with clang, taken from: https://projects.kde.org/projects/extragear/multimedia/kaffeine/repository/diff/src/dvb/dvbepg.cpp?rev=2da9df1e67004c3cfa879578c351300a99f23da1&rev_to=fefd55407f51fb2e2d16fac55092447a1dfa6f2a Port maintainer (arved@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- kaffeine-1.2.2_4.patch begins here --- Index: files/patch-clang =================================================================== --- files/patch-clang (revision 0) +++ files/patch-clang (working copy) @@ -0,0 +1,24 @@ +--- src/dvb/dvbepg.cpp.orig 2011-04-17 19:17:19.000000000 +0000 ++++ src/dvb/dvbepg.cpp 2013-09-04 01:48:35.479500850 +0000 +@@ -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(); ++ 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) && Property changes on: files/patch-clang ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --- kaffeine-1.2.2_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309040202.r8422clb064236>