rpms/lyx/devel lyx-1.5.0rc2-bz#248282.patch, NONE, 1.1 lyx.spec, 1.58, 1.59

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.5.0rc2-bz#248282.patch 
Log Message:
* Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.10.rc2
- upstream patch for 'lyx --export latex' crasher (#248282)


lyx-1.5.0rc2-bz#248282.patch:

--- NEW FILE lyx-1.5.0rc2-bz#248282.patch ---
Index: /lyx-devel/trunk/src/insets/InsetInclude.cpp
===================================================================
--- /lyx-devel/trunk/src/insets/InsetInclude.cpp (revision 18897)
+++ /lyx-devel/trunk/src/insets/InsetInclude.cpp (revision 19029)
@@ -405,7 +405,17 @@
 		if (!fs::exists(included_file.toFilesystemEncoding()))
 			return false;
-		lyx::dispatch(FuncRequest(LFUN_BUFFER_CHILD_OPEN,
-			included_file.absFilename() + "|true"));
-		buf = theBufferList().getBuffer(included_file.absFilename());
+		if (use_gui) {
+			lyx::dispatch(FuncRequest(LFUN_BUFFER_CHILD_OPEN,
+				included_file.absFilename() + "|true"));
+			buf = theBufferList().getBuffer(included_file.absFilename());
+		}
+		else {
+			buf = theBufferList().newBuffer(included_file.absFilename());
+			if (!loadLyXFile(buf, included_file)) {
+				//close the buffer we just opened
+				theBufferList().close(buf, false);
+				return false;
+			}
+		}
 		return buf;
 	}


Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- lyx.spec	28 Jun 2007 15:16:28 -0000	1.58
+++ lyx.spec	15 Jul 2007 18:33:14 -0000	1.59
@@ -4,7 +4,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.5.0
-Release: 0.9.%{pre}%{?dist}
+Release: 0.10.%{pre}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.5.0rc2-xdg-open.patch 
+Patch248282: lyx-1.5.0rc2-bz#248282.patch
 
 Source1: lyxrc.dist
 
@@ -76,6 +77,7 @@
 %setup -q -n %{name}-%{version}%{?pre}
 
 %patch1 -p1 -b .xdg-open
+%patch248282 -p3 -b .bz#248282
 
 
 %build
@@ -174,6 +176,9 @@
 
 
 %changelog
+* Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.10.rc2
+- upstream patch for 'lyx --export latex' crasher (#248282)
+
 * Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.9.rc2
 - scriptlet optmization