rpms/lyx/devel lyx-1.4.0-boost.patch, NONE, 1.1 lyx-1.4.0-gcc41.patch, NONE, 1.1 lyx.spec, 1.23, 1.24 lyx-1.4.0pre5-boost.patch, 1.2, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.4.0-boost.patch lyx-1.4.0-gcc41.patch 
Removed Files:
	lyx-1.4.0pre5-boost.patch 
Log Message:
* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
- gcc41 patch
- document boost/gcc41 patches
- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)


lyx-1.4.0-boost.patch:

--- NEW FILE lyx-1.4.0-boost.patch ---
--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
+++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
@@ -20,6 +20,7 @@
 #include "support/lstrings.h"
 
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <algorithm>
 #include <sstream>
--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -10,7 +10,12 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>
 
--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
@@ -39,6 +39,7 @@
 #include <boost/assert.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <fcntl.h>
 
--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
@@ -14,7 +14,12 @@
 
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG
--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -17,7 +17,12 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>

lyx-1.4.0-gcc41.patch:

--- NEW FILE lyx-1.4.0-gcc41.patch ---
Index: src/graphics/GraphicsCacheItem.C
===================================================================
--- src/graphics/GraphicsCacheItem.C	(revision 13257)
+++ src/graphics/GraphicsCacheItem.C	(working copy)
@@ -295,7 +295,7 @@
 
 	cl_.disconnect();
 	cl_ = image_->finishedLoading.connect(
-		boost::bind(&Impl::imageLoaded, this, _1));
+		boost::bind(&Impl::imageLoaded, boost::ref(*this), _1));
 	image_->load(file_to_load_);
 }
 
@@ -440,7 +440,7 @@
 	// the graphics converter so that we can load the modified file
 	// on completion of the conversion process.
 	converter_.reset(new Converter(filename, to_file_base, from, to));
-	converter_->connect(boost::bind(&Impl::imageConverted, this, _1));
+	converter_->connect(boost::bind(&Impl::imageConverted, boost::ref(*this), _1));
 	converter_->startConversion();
 }
 
Index: src/graphics/GraphicsLoader.C
===================================================================
--- src/graphics/GraphicsLoader.C	(revision 13257)
+++ src/graphics/GraphicsLoader.C	(working copy)
@@ -240,7 +240,7 @@
 	if (continue_monitoring && !cached_item_->monitoring())
 		cached_item_->startMonitoring();
 
-	cached_item_->connect(boost::bind(&Impl::statusChanged, this));
+	cached_item_->connect(boost::bind(&Impl::statusChanged, boost::ref(*this)));
 }
 
 
Index: src/graphics/GraphicsLoader.h
===================================================================
--- src/graphics/GraphicsLoader.h	(revision 13257)
+++ src/graphics/GraphicsLoader.h	(working copy)
@@ -89,7 +89,7 @@
 	 *  changes.
 	 */
 	typedef boost::signal<void()> sig_type;
-	typedef sig_type::slot_type slot_type;
+	typedef boost::function<void()> slot_type;
 	///
 	boost::signals::connection connect(slot_type const &) const;
 
Index: src/support/FileMonitor.h
===================================================================
--- src/support/FileMonitor.h	(revision 13257)
+++ src/support/FileMonitor.h	(working copy)
@@ -53,7 +53,7 @@
 
 	/// Connect and you'll be informed when the file has changed.
 	typedef boost::signal<void()> FileChangedSig;
-	typedef FileChangedSig::slot_type slot_type;
+	typedef boost::function<void()> slot_type;
 	///
 	boost::signals::connection connect(slot_type const &) const;
 


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lyx.spec	14 Feb 2006 21:44:30 -0000	1.23
+++ lyx.spec	20 Feb 2006 13:25:20 -0000	1.24
@@ -1,5 +1,6 @@
 
 ## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389
+## (fixed in gcc-4.0.3)
 %if "%{?fedora}" != "4"
 %define _without_included_boost --without-included-boost
 %endif
@@ -9,7 +10,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.9.%{beta}%{?dist}
+Release: 0.10.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -18,7 +19,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
-Patch2: lyx-1.4.0pre5-boost.patch
+# http://bugzilla.lyx.org/show_bug.cgi?id=2297
+Patch2: lyx-1.4.0-boost.patch
+# http://bugzilla.lyx.org/show_bug.cgi?id=2278
+# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg86593.html
+Patch3: lyx-1.4.0-gcc41.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -27,10 +32,7 @@
 Source21: lyx-qt.desktop
 Source22: lyx-xforms.desktop
 
-# "borrow" kde's crystal icon for lyx
-Source30: lyx-crystal.png
-
-# TODO: use this find_helpers.sh script at runtime, instead of depending on
+# TODO: use helpers.sh script at runtime, instead of depending on
 # lyx's configure and %%triggers
 #Source100: helpers.sh
 
@@ -46,7 +48,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-%{?_without_included_boost:BuildRequires: boost-devel}
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -101,6 +103,10 @@
 
 %patch1 -p1 -b .helpers
 %patch2 -p1 -b .boost
+# possibly questionable patch, leave it for gcc-4.1 platform(s) only
+%if "%{?fedora}" > "4"
+%patch3 -p0 -b .gcc41
+%endif
 
 # ./autogen.sh
 
@@ -211,6 +217,11 @@
 
 
 %changelog
+* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
+- gcc41 patch
+- document boost/gcc41 patches
+- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
+
 * Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
 - updated boost patch
 - drop -fexceptions from %%optflags


--- lyx-1.4.0pre5-boost.patch DELETED ---