rpms/FlightGear/devel FlightGear-2.0.0-requested-visual-unavailable.patch, NONE, 1.1 FlightGear.spec, 1.17, 1.18

[Fabrice Bellet]

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31050

Modified Files:
	FlightGear.spec 
Added Files:
	FlightGear-2.0.0-requested-visual-unavailable.patch 
Log Message:
* Wed Jun 02 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-2
- Fix a crasher when the requested visual cannot be created


FlightGear-2.0.0-requested-visual-unavailable.patch:
 CameraGroup.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE FlightGear-2.0.0-requested-visual-unavailable.patch ---
diff -uNrp FlightGear-2.0.0.orig/src/Main/CameraGroup.cxx FlightGear-2.0.0/src/Main/CameraGroup.cxx
--- FlightGear-2.0.0.orig/src/Main/CameraGroup.cxx	2010-02-17 17:12:13.000000000 +0100
+++ FlightGear-2.0.0/src/Main/CameraGroup.cxx	2010-06-02 16:27:18.217898705 +0200
@@ -411,7 +411,9 @@ CameraInfo* CameraGroup::buildGUICamera(
         if (windowNode) {
             // New style window declaration / definition
             window = wBuild->buildWindow(windowNode);
-            
+	    if (!window) {
+	        return 0;
+	    }
         } else {
             return 0;
         }


Index: FlightGear.spec
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear/devel/FlightGear.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- FlightGear.spec	27 Feb 2010 11:12:24 -0000	1.17
+++ FlightGear.spec	8 Jun 2010 14:12:20 -0000	1.18
@@ -1,19 +1,22 @@
 Name:		FlightGear
 Summary:	The FlightGear Flight Simulator
 Version:	2.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
 Source:		http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-%{version}.tar.gz
 Source1:	%{name}.desktop
-Source2:	http://jrbabcock.home.comcast.net/flightgear/icons/fg-16.png
-Source3:	http://jrbabcock.home.comcast.net/flightgear/icons/fg-32.png
-Source4:	http://jrbabcock.home.comcast.net/flightgear/icons/fg-48.png
-Source5:	http://jrbabcock.home.comcast.net/flightgear/icons/fg-64.png
-Source6:	http://jrbabcock.home.comcast.net/flightgear/icons/fg-128.png
-Source7:	http://jrbabcock.home.comcast.net/flightgear/icons/COPYING
+# these icons were previously available from
+# http://jrbabcock.home.comcast.net/flightgear/icons
+Source2:	fg-16.png
+Source3:	fg-32.png
+Source4:	fg-48.png
+Source5:	fg-64.png
+Source6:	fg-128.png
+Source7:	COPYING
 Patch0:		FlightGear-0.9.10-no-automake-in-configure.patch
+Patch1:		FlightGear-2.0.0-requested-visual-unavailable.patch
 URL:		http://www.flightgear.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openal-soft-devel >= 1.11.753, SimGear-devel >= %{version}, freeglut-devel
@@ -31,6 +34,7 @@ expanded and improved upon by anyone int
 %setup -q
 # automake shouldn't be called in configure Summary page
 %patch0 -p1 -b .no-automake-in-configure
+%patch1 -p1 -b .visual-unavailable
 
 # make rpmlint happy
 find -name \*.h -o -name \*.cpp -o -name \*.cxx -o -name \*.hxx \
@@ -43,7 +47,7 @@ do
 	mv -f ${f}.utf8 ${f}
 done
 sed -i 's/\r//' docs-mini/AptNavFAQ.FlightGear.html
-# remove some unneeded files for %doc
+# remove some unneeded files for the doc section
 for ext in Cygwin IRIX Joystick Linux MSVC MSVC8 MacOS SimGear Unix \
 	Win32-X autoconf mingw plib src xmlsyntax 
 do
@@ -110,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Jun 02 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-2
+- Fix a crasher when the requested visual cannot be created
+
 * Fri Feb 26 2010 Fabrice Bellet <fabrice at bellet.info> 2.0.0-1
 - New upstream release