Applied a patch to make lyx compile on gcc 3.4; bug #62126.

4 files changed, 207 insertions, 7 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 97ffcd4420b1..3ed9423d5273 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.46 2004/06/24 22:42:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.47 2004/09/08 18:40:33 usata Exp $
+
+  09 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> +files/lyx-1.3.4-gcc34.patch,
+  lyx-1.3.4.ebuild:
+  Applied a patch to make lyx compile on gcc 3.4; bug #62126.
 
   18 Jun 2004; Jason Wever <weeve@gentoo.org> lyx-1.3.4.ebuild:
   Stable on sparc.
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 35fb30a35383..ce681c3101c3 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,7 +1,8 @@
-MD5 ec4dba4e88c5522a4f80649d51822d21 lyx-1.3.4.ebuild 3081
-MD5 93951dec73c7e1ddb64d98094b2a06a2 ChangeLog 7639
+MD5 0e5c35c8527aa429acd28569b2642fc1 ChangeLog 7798
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188
-MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
+MD5 f25127a7ddcdf89a9e199787ef7d552a lyx-1.3.4.ebuild 3115
 MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
+MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
+MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
+MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188
diff --git a/app-office/lyx/files/lyx-1.3.4-gcc34.patch b/app-office/lyx/files/lyx-1.3.4-gcc34.patch
new file mode 100644
index 000000000000..6789d75eab1c
--- /dev/null
+++ b/app-office/lyx/files/lyx-1.3.4-gcc34.patch
@@ -0,0 +1,194 @@
+Index: boost/boost/config/compiler/gcc.hpp
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/config/compiler/gcc.hpp,v
+retrieving revision 1.1.4.1
+diff -u -p -b -r1.1.4.1 gcc.hpp
+--- boost/boost/config/compiler/gcc.hpp	27 May 2003 12:45:50 -0000	1.1.4.1
++++ boost/boost/config/compiler/gcc.hpp	22 Apr 2004 17:03:24 -0000
+@@ -50,7 +50,7 @@
+ #endif
+ //
+ // last known and checked version is 3.2:
+-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
++#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
+Index: boost/boost/format/format_implementation.hpp
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/boost/format/format_implementation.hpp,v
+retrieving revision 1.2
+diff -u -p -b -r1.2 format_implementation.hpp
+--- boost/boost/format/format_implementation.hpp	21 Nov 2002 18:33:01 -0000	1.2
++++ boost/boost/format/format_implementation.hpp	22 Apr 2004 17:03:25 -0000
+@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr>
+ {
+     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;
+       }
+Index: src/BoostFormat.h
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Attic/BoostFormat.h,v
+retrieving revision 1.4
+diff -u -p -b -r1.4 BoostFormat.h
+--- src/BoostFormat.h	25 Nov 2002 19:44:44 -0000	1.4
++++ src/BoostFormat.h	22 Apr 2004 17:03:25 -0000
+@@ -15,7 +15,7 @@ namespace boost
+ {
+ 
+ extern
+-template basic_format<char>;
++template class basic_format<char>;
+ 
+ extern template
+ std::ostream &
+Index: src/buffer.C
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
+retrieving revision 1.399.2.7
+diff -u -p -b -r1.399.2.7 buffer.C
+Index: src/frontends/controllers/ControlDialog.tmpl
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/Attic/ControlDialog.tmpl,v
+retrieving revision 1.9.2.1
+diff -u -p -b -r1.9.2.1 ControlDialog.tmpl
+--- src/frontends/controllers/ControlDialog.tmpl	19 Mar 2003 13:20:48 -0000	1.9.2.1
++++ src/frontends/controllers/ControlDialog.tmpl	22 Apr 2004 17:03:26 -0000
+@@ -27,54 +27,54 @@ ControlDialog<Base>::ControlDialog(LyXVi
+ template <class Base>
+ void ControlDialog<Base>::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 <class Base>
+ void ControlDialog<Base>::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 <class Base>
+ void ControlDialog<Base>::hide()
+ {
+-	emergency_exit_ = false;
++	this->emergency_exit_ = false;
+ 	clearParams();
+ 
+-	disconnect();
+-	view().hide();
++	this->disconnect();
++	this->view().hide();
+ }
+Index: src/frontends/qt2/FileDialog.C
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/FileDialog.C,v
+retrieving revision 1.15.2.1
+diff -u -p -b -r1.15.2.1 FileDialog.C
+Index: src/frontends/qt2/Qt2Base.h
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Attic/Qt2Base.h,v
+retrieving revision 1.20
+diff -u -p -b -r1.20 Qt2Base.h
+--- src/frontends/qt2/Qt2Base.h	2 Feb 2003 00:48:38 -0000	1.20
++++ src/frontends/qt2/Qt2Base.h	22 Apr 2004 17:03:26 -0000
+@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c
+ template <class Controller, class Base>
+ Controller & Qt2CB<Controller, Base>::controller()
+ {
+-	return static_cast<Controller &>(getController());
++	return static_cast<Controller &>(this->getController());
+ }
+ 
+ 
+ template <class Controller, class Base>
+ Controller const & Qt2CB<Controller, Base>::controller() const
+ {
+-	return static_cast<Controller const &>(getController());
++	return static_cast<Controller const &>(this->getController());
+ }
+ 
+ 
+Index: src/frontends/xforms/FormBase.h
+===================================================================
+RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Attic/FormBase.h,v
+retrieving revision 1.54
+diff -u -p -b -r1.54 FormBase.h
+--- src/frontends/xforms/FormBase.h	2 Feb 2003 00:48:38 -0000	1.54
++++ src/frontends/xforms/FormBase.h	22 Apr 2004 17:03:27 -0000
+@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string 
+ template <class Controller, class Base>
+ Controller & FormCB<Controller, Base>::controller()
+ {
+-	return static_cast<Controller &>(getController());
++	return static_cast<Controller &>(this->getController());
+ }
+ 
+ 
+ template <class Controller, class Base>
+ Controller const & FormCB<Controller, Base>::controller() const
+ {
+-	return static_cast<Controller const &>(getController());
++	return static_cast<Controller const &>(this->getController());
+ }
+ 
+ 
+--- boost/boost/format/feed_args.hpp	2004/05/15 00:41:57	1.1
++++ boost/boost/format/feed_args.hpp	2004/05/15 00:58:24
+@@ -34,7 +34,7 @@ namespace  {
+ 
+   template<class Tr, class Ch> inline
+   void empty_buf(BOOST_IO_STD basic_ostringstream<Ch,Tr> & os) {
+-    static const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and  L"" )
++    const std::basic_string<Ch, Tr> emptyStr; // avoids 2 cases ( "" and  L"" )
+     os.str(emptyStr);
+   }
+ 
diff --git a/app-office/lyx/lyx-1.3.4.ebuild b/app-office/lyx/lyx-1.3.4.ebuild
index 4008cd5bcad8..c9d92d4eb9f7 100644
--- a/app-office/lyx/lyx-1.3.4.ebuild
+++ b/app-office/lyx/lyx-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.8 2004/06/24 22:42:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.4.ebuild,v 1.9 2004/09/08 18:40:33 usata Exp $
 
 inherit kde-functions eutils libtool
 
@@ -48,6 +48,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch
 	epatch ${FILESDIR}/${PN}-1.3.3-configure-diff
+	epatch ${FILESDIR}/${P}-gcc34.patch
 	elibtoolize || die
 }