rpms/FlightGear-Atlas/F-13 FlightGear-Atlas-0.4.8-fix-segv.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 FlightGear-Atlas.spec, 1.7, 1.8 sources, 1.3, 1.4 FlightGear-Atlas-0.4.0-build-fixes.patch, 1.2, NONE

[Fabrice Bellet]

Author: bellet

Update of /cvs/pkgs/rpms/FlightGear-Atlas/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16830

Modified Files:
	.cvsignore FlightGear-Atlas.spec sources 
Added Files:
	FlightGear-Atlas-0.4.8-fix-segv.patch 
Removed Files:
	FlightGear-Atlas-0.4.0-build-fixes.patch 
Log Message:
* Mon Jul 19 2010 Fabrice Bellet <fabrice at bellet.info> 0.4.8-0.1.cvs20100719
- new cvs snapshot
- fix some segmentation faults


FlightGear-Atlas-0.4.8-fix-segv.patch:
 Atlas.cxx         |    4 ++--
 Notifications.cxx |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE FlightGear-Atlas-0.4.8-fix-segv.patch ---
--- Atlas.orig/src/Atlas.cxx	2010-07-19 10:38:47.000000000 +0200
+++ Atlas/src/Atlas.cxx	2010-07-20 16:50:44.000000000 +0200
@@ -1898,7 +1898,7 @@ void MainUI::setTrackList()
 	free(trackList);
     }
 
-    trackList = (char **)malloc(sizeof(char *) * globals.tracks().size() + 1);
+    trackList = (char **)malloc(sizeof(char *)*(globals.tracks().size() + 1));
     for (unsigned int i = 0; i < globals.tracks().size(); i++) {
 	// The display styles are the same as in the graphs window.
 	trackList[i] = strdup(globals.track(i)->niceName());
@@ -2797,7 +2797,7 @@ void LightingUI::updatePalettes()
     }
 
     const vector<Palette *>& p = palettes->palettes();
-    paletteList = (char **)malloc(sizeof(char *) * p.size() + 1);
+    paletteList = (char **)malloc(sizeof(char *)*(p.size() + 1));
     for (unsigned int i = 0; i < p.size(); i++) {
 	// Display the filename of the palette (but not the path).
 	SGPath full(p[i]->path());
--- Atlas.orig/src/Notifications.cxx	2009-06-15 10:44:58.000000000 +0200
+++ Atlas/src/Notifications.cxx	2010-07-20 23:40:55.103800411 +0200
@@ -80,7 +80,6 @@ Subscriber::Subscriber()
 
 Subscriber::~Subscriber()
 {
-    Notification::unsubscribe(this, Notification::All);
 }
 
 bool Subscriber::subscribe(Notification::type n)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	27 Feb 2010 11:21:50 -0000	1.3
+++ .cvsignore	22 Jul 2010 19:24:54 -0000	1.4
@@ -1,2 +1,2 @@
-Atlas-cvs20100226.tar.gz
+Atlas-cvs20100719.tar.gz
 Atlas-0.4.0-default-maps.tar.gz


Index: FlightGear-Atlas.spec
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/F-13/FlightGear-Atlas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- FlightGear-Atlas.spec	12 Mar 2010 16:06:45 -0000	1.7
+++ FlightGear-Atlas.spec	22 Jul 2010 19:24:54 -0000	1.8
@@ -1,15 +1,15 @@
-%define cvsdate 20100226
+%define cvsdate 20100719
 Name:		FlightGear-Atlas
 Summary:	Flightgear map tools
-Version:	0.4.0
-Release:	0.5.cvs%{cvsdate}%{?dist}
+Version:	0.4.8
+Release:	0.1.cvs%{cvsdate}%{?dist}
 
 License:	GPLv2+
 Group:		Amusements/Games
 Source0:	Atlas-cvs%{cvsdate}.tar.gz
 Source1:	Atlas-0.4.0-default-maps.tar.gz
-Patch0:		FlightGear-Atlas-0.4.0-build-fixes.patch
-Patch1:		FlightGear-Atlas-0.4.0-fix-graph-axis-formatting.patch
+Patch0:		FlightGear-Atlas-0.4.0-fix-graph-axis-formatting.patch
+Patch1:		FlightGear-Atlas-0.4.8-fix-segv.patch
 URL:		http://atlas.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freeglut-devel, curl-devel, libpng-devel
@@ -26,13 +26,13 @@ Atlas viewer
 
 %prep
 %setup -q -n Atlas
-%patch0 -p1 -b .buildfixes
-%patch1 -p1 -b .axis
+%patch0 -p1 -b .axis
+%patch1 -p1 -b .segv
 find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
 
 %build
 ./autogen.sh
-%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DGL_GLEXT_PROTOTYPES" \
+%configure CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \
 	--with-fgbase=%{_datadir}/FlightGear
 make %{?_smp_mflags}
 
@@ -52,6 +52,8 @@ install -m 0644 src/data/Palettes/*.ap \
 	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas/Palettes
 install -m 0644 src/data/background.jpg \
 	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas
+install -m 0644 src/data/airplane_image.png \
+	$RPM_BUILD_ROOT%{_datadir}/FlightGear/Atlas
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/FlightGear/Atlas
 
 %changelog
+* Mon Jul 19 2010 Fabrice Bellet <fabrice at bellet.info> 0.4.8-0.1.cvs20100719
+- new cvs snapshot
+- fix some segmentation faults
+
 * Thu Mar 11 2010 Fabrice Bellet <fabrice at bellet.info> 0.4.0-0.5.cvs20100226
 - Fix graph axis formatting bug, by avoiding negative values in the
   format string


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/FlightGear-Atlas/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	27 Feb 2010 11:21:50 -0000	1.3
+++ sources	22 Jul 2010 19:24:55 -0000	1.4
@@ -1,2 +1,2 @@
-75c593986761431ab166fa67a18fd702  Atlas-cvs20100226.tar.gz
+383b785062c42bdd148e97009e95dab8  Atlas-cvs20100719.tar.gz
 ad39040ecb18627f695d4a3c852db81b  Atlas-0.4.0-default-maps.tar.gz


--- FlightGear-Atlas-0.4.0-build-fixes.patch DELETED ---