[fedora-extras-commits] rpms/lyx/devel lyx-1.3.4-gcc34.patch, NONE, 1.1 lyx.spec, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/lyx/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv7654

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.3.4-gcc34.patch 
Log Message:
Fix build for FC3.

lyx-1.3.4-gcc34.patch:

--- NEW FILE lyx-1.3.4-gcc34.patch ---
diff -Nur lyx-1.3.4-orig/boost/boost/format/format_implementation.hpp lyx-1.3.4/boost/boost/format/format_implementation.hpp
--- lyx-1.3.4-orig/boost/boost/format/format_implementation.hpp	2002-11-21 19:33:01.000000000 +0100
+++ lyx-1.3.4/boost/boost/format/format_implementation.hpp	2004-11-11 13:00:55.725734384 +0100
@@ -151,7 +151,7 @@
 {
     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 -Nur lyx-1.3.4-orig/src/BoostFormat.h lyx-1.3.4/src/BoostFormat.h
--- lyx-1.3.4-orig/src/BoostFormat.h	2002-11-25 20:44:44.000000000 +0100
+++ lyx-1.3.4/src/BoostFormat.h	2004-11-11 12:58:41.000000000 +0100
@@ -14,8 +14,8 @@
 namespace boost
 {
 
-extern
-template basic_format<char>;
+//extern
+//template basic_format<char>;
 
 extern template
 std::ostream &
diff -Nur lyx-1.3.4-orig/src/frontends/controllers/ControlDialog.tmpl lyx-1.3.4/src/frontends/controllers/ControlDialog.tmpl
--- lyx-1.3.4-orig/src/frontends/controllers/ControlDialog.tmpl	2003-03-19 12:04:11.000000000 +0100
+++ lyx-1.3.4/src/frontends/controllers/ControlDialog.tmpl	2004-11-11 13:14:38.372673040 +0100
@@ -27,54 +27,54 @@
 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();
 }
diff -Nur lyx-1.3.4-orig/src/frontends/qt2/Qt2Base.h lyx-1.3.4/src/frontends/qt2/Qt2Base.h
--- lyx-1.3.4-orig/src/frontends/qt2/Qt2Base.h	2003-02-02 01:48:38.000000000 +0100
+++ lyx-1.3.4/src/frontends/qt2/Qt2Base.h	2004-11-11 13:37:07.069639936 +0100
@@ -174,14 +174,14 @@
 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: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lyx.spec	8 Nov 2004 04:51:31 -0000	1.3
+++ lyx.spec	11 Nov 2004 13:13:36 -0000	1.4
@@ -7,12 +7,12 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.4
-Epoch:	 0
-Release: 0.fdr.6%{?dist_tag}.1.92
+Release: 7
 License: GPL (see http://www.lyx.org/about/license.php3) 
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
 Source:	 ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.bz2
+Patch:   lyx-1.3.4-gcc34.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: lyx.desktop
@@ -69,6 +69,7 @@
 %prep
 
 %setup -q
+%patch -p1 -b .gcc34
 
 
 %build
@@ -147,7 +148,10 @@
 %{_datadir}/texmf/tex/latex/%{name}
 
 
-%changelog 
+%changelog
+* Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.4-7
+- Fix build for FC3/GCC 3.4.
+
 * Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
 - BR: libtool