From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 2 18:10:07 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6F125260 for ; Sun, 2 Jun 2013 18:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 518711224 for ; Sun, 2 Jun 2013 18:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r52IA74g099582 for ; Sun, 2 Jun 2013 18:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r52IA7tf099581; Sun, 2 Jun 2013 18:10:07 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jun 2013 18:10:07 GMT Resent-Message-Id: <201306021810.r52IA7tf099581@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2998DF65 for ; Sun, 2 Jun 2013 18:01:00 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164]) by mx1.freebsd.org (Postfix) with ESMTP id C6C7A11BD for ; Sun, 2 Jun 2013 18:00:59 +0000 (UTC) Received: from localhost.localdomain (ZT029100.ppp.dion.ne.jp [59.128.29.100]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id CF35A34034 for ; Mon, 3 Jun 2013 03:00:56 +0900 (JST) Message-Id: <20130603025101.585a66e16a461c03a2c16fb2@yahoo.com> Date: Mon, 3 Jun 2013 02:51:01 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/179225: graphics/qslim: Fix build with clang X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2013 18:10:07 -0000 >Number: 179225 >Category: ports >Synopsis: graphics/qslim: 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: Sun Jun 02 18:10:07 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE i386 >Organization: >Environment: >Description: - Fix build with clang New file: files/patch-mixkit__src__MxDynBlock.h files/patch-mixkit__src__MxStack.h files/patch-tools__qslim__qslim.cxx >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/qslim/files/patch-mixkit__src__MxDynBlock.h graphics/qslim/files/patch-mixkit__src__MxDynBlock.h --- /usr/ports/graphics/qslim/files/patch-mixkit__src__MxDynBlock.h 1970-01-01 09:00:00.000000000 +0900 +++ graphics/qslim/files/patch-mixkit__src__MxDynBlock.h 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,29 @@ +--- mixkit/src/MxDynBlock.h.orig ++++ mixkit/src/MxDynBlock.h +@@ -35,13 +35,13 @@ + + void room_for(int len) + { +- if( length()resize(len); + fill = len; + } + + T& add() + { +- if( length()==total_space() ) resize(total_space() * 2); ++ if( length()==total_space() ) this->resize(total_space() * 2); + fill++; + return last(); + } +@@ -62,8 +62,8 @@ + // + int size() const { return length(); } + +- typename MxBlock::iterator end() { return begin()+size(); } +- typename MxBlock::const_iterator end() const { return begin()+size(); } ++ typename MxBlock::iterator end() { return this->begin()+size(); } ++ typename MxBlock::const_iterator end() const { return this->begin()+size(); } + + void push_back(const T& t) { add(t); } + }; diff -urN /usr/ports/graphics/qslim/files/patch-mixkit__src__MxStack.h graphics/qslim/files/patch-mixkit__src__MxStack.h --- /usr/ports/graphics/qslim/files/patch-mixkit__src__MxStack.h 1970-01-01 09:00:00.000000000 +0900 +++ graphics/qslim/files/patch-mixkit__src__MxStack.h 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,31 @@ +--- mixkit/src/MxStack.h.orig ++++ mixkit/src/MxStack.h +@@ -26,14 +26,14 @@ + MxStack(const T& val, unsigned int n) : MxDynBlock(n) + { push(val); } + +- T& top() { return last(); } +- const T& top() const { return last(); } ++ T& top() { return this->last(); } ++ const T& top() const { return this->last(); } + +- bool is_empty() { return length()==0; } ++ bool is_empty() { return this->length()==0; } + +- T& pop() { return drop(); } ++ T& pop() { return this->drop(); } + +- void push(const T& val) { add(val); } ++ void push(const T& val) { this->add(val); } + // + // NOTE: In this code, it is *crucial* that we do the add() and + // assignment in separate steps. The obvious alternative +@@ -41,7 +41,7 @@ + // broken! The top() will grab a pointer into the block, + // but the add() may reallocate the block before doing the + // assignment. Thus, the pointer will become invalid. +- void push() { add(); top() = (*this)[length()-2]; } ++ void push() { this->add(); top() = (*this)[this->length()-2]; } + }; + + // MXSTACK_INCLUDED diff -urN /usr/ports/graphics/qslim/files/patch-tools-qslim_qvis.cxx graphics/qslim/files/patch-tools-qslim_qvis.cxx --- /usr/ports/graphics/qslim/files/patch-tools-qslim_qvis.cxx 2012-11-08 09:45:12.000000000 +0900 +++ graphics/qslim/files/patch-tools-qslim_qvis.cxx 2013-06-03 00:00:00.000000000 +0900 @@ -9,3 +9,12 @@ #include #include #include +@@ -228,7 +228,7 @@ + // Main application routine + // + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + // Change default values for application variables in GUI version + will_record_history = true; diff -urN /usr/ports/graphics/qslim/files/patch-tools__qslim__qslim.cxx graphics/qslim/files/patch-tools__qslim__qslim.cxx --- /usr/ports/graphics/qslim/files/patch-tools__qslim__qslim.cxx 1970-01-01 09:00:00.000000000 +0900 +++ graphics/qslim/files/patch-tools__qslim__qslim.cxx 2013-06-03 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- tools/qslim/qslim.cxx.orig ++++ tools/qslim/qslim.cxx +@@ -32,7 +32,7 @@ + output_preamble(); + } + +-main(int argc, char **argv) ++int main(int argc, char **argv) + { + double input_time, init_time, slim_time, output_time; + >Release-Note: >Audit-Trail: >Unformatted: