From swills@mouf.net  Wed Sep  4 02:02:51 2013
Return-Path: <swills@mouf.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 3A2FF651
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 02:02:51 +0000 (UTC)
	(envelope-from swills@mouf.net)
Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id EBC402F18
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 02:02:50 +0000 (UTC)
Received: from meatwad.mouf.net (cpe-107-015-170-205.nc.res.rr.com [107.15.170.205])
	by mouf.net (8.14.5/8.14.5) with ESMTP id r8422eRg073068
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Wed, 4 Sep 2013 02:02:45 GMT
	(envelope-from swills@meatwad.mouf.net)
Received: (from swills@localhost)
	by meatwad.mouf.net (8.14.7/8.14.5/Submit) id r8422clb064236;
	Wed, 4 Sep 2013 02:02:38 GMT
	(envelope-from swills)
Message-Id: <201309040202.r8422clb064236@meatwad.mouf.net>
Date: Wed, 4 Sep 2013 02:02:38 GMT
From: Steve Wills <swills@FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: arved@FreeBSD.org
Subject: [PATCH] multimedia/kaffeine: fix build with clang
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         181788
>Category:       ports
>Synopsis:       [PATCH] multimedia/kaffeine: fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    arved
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 04 02:10:00 UTC 2013
>Closed-Date:    Thu Sep 05 13:44:14 UTC 2013
>Last-Modified:  Thu Sep  5 13:50:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->arved 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Sep 4 02:10:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181788 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Thu Sep 5 13:44:14 UTC 2013 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181788 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181788: commit references a PR
Date: Thu,  5 Sep 2013 13:43:56 +0000 (UTC)

 Author: swills
 Date: Thu Sep  5 13:43:48 2013
 New Revision: 326397
 URL: http://svnweb.freebsd.org/changeset/ports/326397
 
 Log:
   - Fix build with clang
   
   PR:		ports/181788
   Approved by:	arved (maintainer, via private mail)
 
 Added:
   head/multimedia/kaffeine/files/patch-clang   (contents, props changed)
 
 Added: head/multimedia/kaffeine/files/patch-clang
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/multimedia/kaffeine/files/patch-clang	Thu Sep  5 13:43:48 2013	(r326397)
 @@ -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) &&
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
