From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 14 06:50:34 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BEEC716A4D5 for ; Sat, 14 Aug 2004 06:50:34 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0635743D54 for ; Sat, 14 Aug 2004 06:50:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7E6oQZr091438 for ; Sat, 14 Aug 2004 06:50:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7E6oQAn091437; Sat, 14 Aug 2004 06:50:26 GMT (envelope-from gnats) Resent-Date: Sat, 14 Aug 2004 06:50:26 GMT Resent-Message-Id: <200408140650.i7E6oQAn091437@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, Cheng-Lung Sung Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47FFA16A4CE for ; Sat, 14 Aug 2004 06:48:56 +0000 (GMT) Received: from FreeBSD.csie.NCTU.edu.tw (freebsd.csie.nctu.edu.tw [140.113.17.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16E2943D49 for ; Sat, 14 Aug 2004 06:48:56 +0000 (GMT) (envelope-from clsung@FreeBSD.csie.NCTU.edu.tw) Received: from localhost (unknown [127.0.0.1]) by FreeBSD.csie.NCTU.edu.tw (Postfix) with ESMTP id 9D617106C28 for ; Sat, 14 Aug 2004 14:48:46 +0800 (CST) Received: from FreeBSD.csie.NCTU.edu.tw ([127.0.0.1]) by localhost (FreeBSD.csie.NCTU.edu.tw [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 69998-05 for ; Sat, 14 Aug 2004 14:48:45 +0800 (CST) Received: by FreeBSD.csie.NCTU.edu.tw (Postfix, from userid 1038) id DD685106C1B; Sat, 14 Aug 2004 14:48:45 +0800 (CST) Message-Id: <20040814064845.DD685106C1B@FreeBSD.csie.NCTU.edu.tw> Date: Sat, 14 Aug 2004 14:48:45 +0800 (CST) From: Cheng-Lung Sung To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70443: [MAINTAINER] textproc/rtfx: fix build error under gcc 3.4.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2004 06:50:35 -0000 >Number: 70443 >Category: ports >Synopsis: [MAINTAINER] textproc/rtfx: fix build error under gcc 3.4.2 >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: Sat Aug 14 06:50:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Cheng-Lung Sung >Release: FreeBSD 4.10-STABLE i386 >Organization: FreeBSD @ Taiwan >Environment: System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat May 29 08:18:00 CST 2004 >Description: - fix build error under gcc 3.4.2 - rename bool variable to distinguish between bool and function Added file(s): - files/extra-patch-src::reference.h-gcc342 - files/extra-patch-src::sablo.h-gcc342 Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- rtfx-0.9.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/Makefile /home/clsung/rtfx/Makefile --- /usr/ports/textproc/rtfx/Makefile Thu Jul 29 22:53:55 2004 +++ /home/clsung/rtfx/Makefile Sat Aug 14 14:46:12 2004 @@ -28,5 +28,9 @@ post-patch: @${REINPLACE_CMD} -e "s/ //g" ${WRKSRC}/src/xmlcomposer.cpp .endif +.if ${OSVERSION} >= 502124 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src::reference.h-gcc342 \ + ${FILESDIR}/extra-patch-src::sablo.h-gcc342 +.endif .include diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 /home/clsung/rtfx/files/extra-patch-src::reference.h-gcc342 --- /usr/ports/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 Thu Jan 1 08:00:00 1970 +++ /home/clsung/rtfx/files/extra-patch-src::reference.h-gcc342 Sat Aug 14 14:42:04 2004 @@ -0,0 +1,15 @@ +--- src/reference.h.orig Fri Jul 23 05:03:03 2004 ++++ src/reference.h Sat Aug 14 14:41:14 2004 +@@ -57,10 +57,10 @@ + addref(); + } + +- Reference(C* ptr, bool addref) ++ Reference(C* ptr, bool has_addref) + { + m_ptr = ptr; +- if(addref) ++ if(has_addref) + addref(); + } + diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 /home/clsung/rtfx/files/extra-patch-src::sablo.h-gcc342 --- /usr/ports/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 Thu Jan 1 08:00:00 1970 +++ /home/clsung/rtfx/files/extra-patch-src::sablo.h-gcc342 Sat Aug 14 14:43:04 2004 @@ -0,0 +1,15 @@ +--- src/sablo.h.orig Sat Jul 24 12:18:06 2004 ++++ src/sablo.h Sat Aug 14 14:42:45 2004 +@@ -146,10 +146,10 @@ + addref(); + } + +- Ref(C* ptr, bool addref) ++ Ref(C* ptr, bool has_addref) + { + m_ptr = ptr; +- if(addref) ++ if(has_addref) + addref(); + } + --- rtfx-0.9.3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: