From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 6 20:20:31 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 E856616A4CE for ; Fri, 6 Aug 2004 20:20:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AED1F43D5E for ; Fri, 6 Aug 2004 20:20:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i76KKVHE050961 for ; Fri, 6 Aug 2004 20:20:31 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i76KKVZF050960; Fri, 6 Aug 2004 20:20:31 GMT (envelope-from gnats) Resent-Date: Fri, 6 Aug 2004 20:20:31 GMT Resent-Message-Id: <200408062020.i76KKVZF050960@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, Andrew Thompson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7390416A4DB for ; Fri, 6 Aug 2004 20:16:59 +0000 (GMT) Received: from mta205-rme.xtra.co.nz (mta205-rme.xtra.co.nz [210.86.15.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C1E443D39 for ; Fri, 6 Aug 2004 20:16:58 +0000 (GMT) (envelope-from thompsa@fud.org.nz) Received: from mta1-rme.xtra.co.nz ([210.86.15.157]) by mta205-rme.xtra.co.nz with ESMTP <20040806201657.RSND3618.mta205-rme.xtra.co.nz@mta1-rme.xtra.co.nz> for ; Sat, 7 Aug 2004 08:16:57 +1200 Received: from spoon.fud.org.nz ([219.88.116.21]) by mta1-rme.xtra.co.nz with ESMTP id <20040806201654.KGDW21194.mta1-rme.xtra.co.nz@spoon.fud.org.nz> for ; Sat, 7 Aug 2004 08:16:54 +1200 Received: by spoon.fud.org.nz (Postfix, from userid 1001) id 3DF2A2841A; Sat, 7 Aug 2004 08:16:00 +1200 (NZST) Message-Id: <20040806201600.3DF2A2841A@spoon.fud.org.nz> Date: Sat, 7 Aug 2004 08:16:00 +1200 (NZST) From: Andrew Thompson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70095: [PATCH] Fix LyX build with gcc3.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Andrew Thompson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2004 20:20:32 -0000 >Number: 70095 >Category: ports >Synopsis: [PATCH] Fix LyX build with gcc3.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Aug 06 20:20:31 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Andrew Thompson >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD spoon.fud.org.nz 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Jun 24 22:52:15 NZST 2004 root@spoon.fud.org.nz:/usr/obj/usr/src/sys/SPOON i386 >Description: Fix LyX build on current (gcc3.4.2). Also, as LyX has no maintainer, I am happy to be that man. Obtained from: NetBSD >How-To-Repeat: apply diff >Fix: diff -urN print/lyx.orig/files/patch-ab print/lyx/files/patch-ab --- print/lyx.orig/files/patch-ab Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ab Fri Aug 6 23:46:47 2004 @@ -0,0 +1,13 @@ +$NetBSD$ + +--- ./src/BoostFormat.h.orig 2002-11-25 12:44:44.000000000 -0700 ++++ ./src/BoostFormat.h +@@ -15,7 +15,7 @@ namespace boost + { + + extern +-template basic_format; ++template class basic_format; + + extern template + std::ostream & diff -urN print/lyx.orig/files/patch-ac print/lyx/files/patch-ac --- print/lyx.orig/files/patch-ac Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ac Fri Aug 6 23:46:47 2004 @@ -0,0 +1,85 @@ +$NetBSD$ + +--- src/frontends/controllers/ControlDialog.tmpl.orig 2004-05-29 04:23:23.000000000 -0600 ++++ src/frontends/controllers/ControlDialog.tmpl +@@ -4,7 +4,7 @@ + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * +- * \author Angus Leeming ++ * \author Angus Leeming + * + * Full author contact details are available in file CREDITS + * +@@ -27,54 +27,56 @@ ControlDialog::ControlDialog(LyXVi + template + void ControlDialog::show() + { +- if (isBufferDependent() && !bufferIsAvailable()) ++ if (this->isBufferDependent() && !this->bufferIsAvailable()) + return; + +- connect(); ++ this->connect(); + + if (!dialog_built_) { +- view().build(); ++ this->view().build(); + dialog_built_ = true; + } + + setParams(); +- if (emergency_exit_) { ++ if (this->emergency_exit_) { + hide(); + return; + } + +- bc().readOnly(bufferIsReadonly()); +- view().show(); ++ this->bc().readOnly(this->bufferIsReadonly()); ++ this->view().show(); + + // The widgets may not be valid, so refresh the button controller +- bc().refresh(); ++ this->bc().refresh(); + } + ++ + template + void ControlDialog::update() + { +- if (isBufferDependent() && !bufferIsAvailable()) ++ if (this->isBufferDependent() && !this->bufferIsAvailable()) + return; + + setParams(); +- if (emergency_exit_) { ++ if (this->emergency_exit_) { + hide(); + return; + } + +- bc().readOnly(bufferIsReadonly()); +- view().update(); ++ this->bc().readOnly(this->bufferIsReadonly()); ++ this->view().update(); + + // The widgets may not be valid, so refresh the button controller +- bc().refresh(); ++ this->bc().refresh(); + } + ++ + template + void ControlDialog::hide() + { +- emergency_exit_ = false; ++ this->emergency_exit_ = false; + clearParams(); + +- disconnect(); +- view().hide(); ++ this->disconnect(); ++ this->view().hide(); + } diff -urN print/lyx.orig/files/patch-ad print/lyx/files/patch-ad --- print/lyx.orig/files/patch-ad Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ad Fri Aug 6 23:46:47 2004 @@ -0,0 +1,21 @@ +$NetBSD$ + +--- src/frontends/xforms/FormBase.h.orig 2003-02-01 17:48:38.000000000 -0700 ++++ src/frontends/xforms/FormBase.h +@@ -188,14 +188,14 @@ FormCB::FormCB(string + template + Controller & FormCB::controller() + { +- return static_cast(getController()); ++ return static_cast(this->getController()); + } + + + template + Controller const & FormCB::controller() const + { +- return static_cast(getController()); ++ return static_cast(this->getController()); + } + + diff -urN print/lyx.orig/files/patch-ae print/lyx/files/patch-ae --- print/lyx.orig/files/patch-ae Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ae Fri Aug 6 23:46:47 2004 @@ -0,0 +1,21 @@ +$NetBSD$ + +--- ./src/frontends/qt2/Qt2Base.h.orig 2003-02-01 17:48:38.000000000 -0700 ++++ ./src/frontends/qt2/Qt2Base.h +@@ -174,14 +174,14 @@ Qt2CB::Qt2CB(QString c + template + Controller & Qt2CB::controller() + { +- return static_cast(getController()); ++ return static_cast(this->getController()); + } + + + template + Controller const & Qt2CB::controller() const + { +- return static_cast(getController()); ++ return static_cast(this->getController()); + } + + diff -urN print/lyx.orig/files/patch-af print/lyx/files/patch-af --- print/lyx.orig/files/patch-af Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-af Fri Aug 6 23:46:47 2004 @@ -0,0 +1,13 @@ +$NetBSD$ + +--- ./boost/boost/format/feed_args.hpp.orig 2002-11-20 10:20:54.000000000 -0700 ++++ ./boost/boost/format/feed_args.hpp +@@ -34,7 +34,7 @@ namespace { + + template inline + void empty_buf(BOOST_IO_STD basic_ostringstream & os) { +- static const std::basic_string emptyStr; // avoids 2 cases ( "" and L"" ) ++ const std::basic_string emptyStr; // avoids 2 cases ( "" and L"" ) + os.str(emptyStr); + } + diff -urN print/lyx.orig/files/patch-ag print/lyx/files/patch-ag --- print/lyx.orig/files/patch-ag Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ag Fri Aug 6 23:46:47 2004 @@ -0,0 +1,13 @@ +$NetBSD$ + +--- ./boost/boost/format/format_implementation.hpp.orig 2002-11-21 11:33:01.000000000 -0700 ++++ ./boost/boost/format/format_implementation.hpp +@@ -151,7 +151,7 @@ basic_format& basic_format + { + if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] ) + { +- if( exceptions() & out_of_range_bit ) ++ if( exceptions() & io::out_of_range_bit ) + boost::throw_exception(io::out_of_range()); // arg not in range. + else return *this; + } diff -urN print/lyx.orig/files/patch-ah print/lyx/files/patch-ah --- print/lyx.orig/files/patch-ah Thu Jan 1 12:00:00 1970 +++ print/lyx/files/patch-ah Fri Aug 6 23:46:47 2004 @@ -0,0 +1,97 @@ +$NetBSD$ + +--- ./boost/boost/config/compiler/gcc.hpp.orig 2003-05-26 08:27:34.000000000 -0600 ++++ ./boost/boost/config/compiler/gcc.hpp +@@ -1,7 +1,13 @@ +-// (C) Copyright Boost.org 2001. Permission to copy, use, modify, sell and +-// distribute this software is granted provided this copyright notice appears +-// in all copies. This software is provided "as is" without express or implied +-// warranty, and with no claim as to its suitability for any purpose. ++// (C) Copyright John Maddock 2001 - 2003. ++// (C) Copyright Darin Adler 2001 - 2002. ++// (C) Copyright Jens Maurer 2001 - 2002. ++// (C) Copyright Beman Dawes 2001 - 2003. ++// (C) Copyright Douglas Gregor 2002. ++// (C) Copyright David Abrahams 2002 - 2003. ++// (C) Copyright Synge Todo 2003. ++// Use, modification and distribution are subject to the ++// Boost Software License, Version 1.0. (See accompanying file ++// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + + // See http://www.boost.org for most recent version. + +@@ -23,24 +29,53 @@ + # endif + # endif + ++# if __GNUC__ == 2 && __GNUC_MINOR__ < 96 ++# define BOOST_NO_SFINAE ++# endif ++ + # if __GNUC__ == 2 && __GNUC_MINOR__ <= 97 + # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS + # define BOOST_NO_OPERATORS_IN_NAMESPACE + # endif + ++# if __GNUC__ < 3 ++# define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE ++# define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL ++# endif ++ ++# ++# ++# ++ ++// ++// Bug specific to gcc 3.1 and 3.2: ++// ++#if (__GNUC__ == 3) && ((__GNUC_MINOR__ == 1) || (__GNUC_MINOR__ == 2)) ++# define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS ++#endif ++ + // +-// Threading support: +-// Turn this on unconditionally here, it will get turned off again later +-// if no threading API is detected. ++// Threading support: Turn this on unconditionally here (except for ++// those platforms where we can know for sure). It will get turned off again ++// later if no threading API is detected. + // +-#define BOOST_HAS_THREADS ++#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__) ++# define BOOST_HAS_THREADS ++#endif + + // + // gcc has "long long" + // + #define BOOST_HAS_LONG_LONG + +-#define BOOST_COMPILER "GNU C++ version " BOOST_STRINGIZE(__GNUC__) "." BOOST_STRINGIZE(__GNUC_MINOR__) ++// ++// gcc implements the named return value optimization since version 3.1 ++// ++#if __GNUC__ > 3 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 1 ) ++#define BOOST_HAS_NRVO ++#endif ++ ++#define BOOST_COMPILER "GNU C++ version " __VERSION__ + + // + // versions check: +@@ -49,11 +84,13 @@ + # error "Compiler not configured - please reconfigure" + #endif + // +-// last known and checked version is 3.2: +-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) ++// last known and checked version is 3.4: ++#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4)) + # if defined(BOOST_ASSERT_CONFIG) + # error "Unknown compiler version - please run the configure tests and report the results" + # else + # warning "Unknown compiler version - please run the configure tests and report the results" + # endif + #endif ++ ++ >Release-Note: >Audit-Trail: >Unformatted: