Date: Fri, 21 Sep 2012 18:29:16 -0400 (EDT) From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ii@any.com.ru Subject: ports/171859: [PATCH] graphics/panomatic: fix build with clang Message-ID: <201209212229.q8LMTGkL027070@meatwad.mouf.net> Resent-Message-ID: <201209212240.q8LMe2KA011486@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171859 >Category: ports >Synopsis: [PATCH] graphics/panomatic: 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: Fri Sep 21 22:40:01 UTC 2012 >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 #7 r239244M: Mon Aug 13 23:21:42 EDT >Description: - Fix build with clang - Add SF mirror Port maintainer (ii@any.com.ru) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- panomatic-0.9.4.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 304643) +++ Makefile (working copy) @@ -7,7 +7,8 @@ PORTNAME= panomatic PORTVERSION= 0.9.4 CATEGORIES= graphics -MASTER_SITES= http://people.esterdev.com/yury/bicycles/ +MASTER_SITES= SF \ + http://people.esterdev.com/yury/bicycles/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ii@any.com.ru Index: files/patch-zthreads-Guard.h =================================================================== --- files/patch-zthreads-Guard.h (revision 0) +++ files/patch-zthreads-Guard.h (working copy) @@ -0,0 +1,43 @@ +--- zthread/include/zthread/Guard.h.orig 2008-02-28 23:15:33.000000000 +0000 ++++ zthread/include/zthread/Guard.h 2012-09-21 22:20:58.000000000 +0000 +@@ -58,7 +58,7 @@ + public: + + template <class T> +- LockHolder(T& t) : _lock(extract(t)._lock), _enabled(true) { } ++ LockHolder(T& t) : _lock(this->extract(t)._lock), _enabled(true) { } + + LockHolder(LockHolder& holder) : _lock(holder._lock), _enabled(true) { } + +@@ -114,11 +114,11 @@ + if(!Scope2::createScope(l, ms)) { + + Scope1::destroyScope(l); +- return false; ++ return; + + } + +- return true; ++ return; + + } + +@@ -428,7 +428,7 @@ + template <class U, class V> + Guard(Guard<U, V>& g) : LockHolder<LockType>(g) { + +- LockingPolicy::shareScope(*this, extract(g)); ++ LockingPolicy::shareScope(*this, this->extract(g)); + + } + +@@ -458,7 +458,7 @@ + template <class U, class V> + Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) { + +- LockingPolicy::transferScope(*this, extract(g)); ++ LockingPolicy::transferScope(*this, this->extract(g)); + + } + Property changes on: files/patch-zthreads-Guard.h ___________________________________________________________________ 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 --- panomatic-0.9.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?201209212229.q8LMTGkL027070>