From 12bee67e891a0d18faaaa12999923a830064c01d Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice(a)bellet.info>
Date: Thu, 15 Sep 2016 11:15:26 +0200
Subject: rebuild with newer SimGear
- fix for SGPath API change
---
Atlas-0.5.0-fix-sgpath-api-change.patch | 60 +++++++++++++++++++++++++++++++++
FlightGear-Atlas.spec | 8 ++++-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644 Atlas-0.5.0-fix-sgpath-api-change.patch
diff --git a/Atlas-0.5.0-fix-sgpath-api-change.patch
b/Atlas-0.5.0-fix-sgpath-api-change.patch
new file mode 100644
index 0000000..4c40885
--- /dev/null
+++ b/Atlas-0.5.0-fix-sgpath-api-change.patch
@@ -0,0 +1,60 @@
+Index: src/Map.cxx
+===================================================================
+RCS file: /cvsroot/atlas/Atlas/src/Map.cxx,v
+retrieving revision 1.64
+diff -u -p -r1.64 Map.cxx
+--- src/Map.cxx 24 Aug 2012 23:36:35 -0000 1.64
++++ src/Map.cxx 14 Sep 2016 19:52:03 -0000
+@@ -165,6 +165,14 @@ void print_help()
+ printf(" --help Print this message\n");
+ }
+
++// set path
++void SGPath::set( const string& p ) {
++ path = p;
++ fix();
++ _cached = false;
++ _rwCached = false;
++}
++
+ bool parse_arg(char* arg)
+ {
+ if (strncmp(arg, "--fg-root=", 10) == 0) {
+Index: src/Preferences.cxx
+===================================================================
+RCS file: /cvsroot/atlas/Atlas/src/Preferences.cxx,v
+retrieving revision 1.29
+diff -u -p -r1.29 Preferences.cxx
+--- src/Preferences.cxx 26 Nov 2012 19:51:16 -0000 1.29
++++ src/Preferences.cxx 14 Sep 2016 19:52:03 -0000
+@@ -312,6 +312,14 @@ inline bool TypedPrefVector<T>::save(ost
+ // SGPath
+ //////////////////////////////////////////////////////////////////////
+
++// set path
++void SGPath::set( const string& p ) {
++ path = p;
++ fix();
++ _cached = false;
++ _rwCached = false;
++}
++
+ // operator>> for SGPath
+ istream& operator>> (istream& is, SGPath& p)
+ {
+Index: src/Subbucket.cxx
+===================================================================
+RCS file: /cvsroot/atlas/Atlas/src/Subbucket.cxx,v
+retrieving revision 1.21
+diff -u -p -r1.21 Subbucket.cxx
+--- src/Subbucket.cxx 2 Oct 2014 00:39:17 -0000 1.21
++++ src/Subbucket.cxx 14 Sep 2016 19:58:15 -0000
+@@ -346,7 +346,7 @@ bool Subbucket::load(Bucket::Projection
+ //
http://wiki.flightgear.org/index.php/BTG_File_Format
+
+ SGBinObject btg;
+- if (!btg.read_bin(_path.c_str())) {
++ if (!btg.read_bin(_path)) {
+ // EYE - throw an error?
+ // EYE - will the cache continue to call load() then?
+ return false;
diff --git a/FlightGear-Atlas.spec b/FlightGear-Atlas.spec
index 3562f8e..57d122e 100644
--- a/FlightGear-Atlas.spec
+++ b/FlightGear-Atlas.spec
@@ -3,7 +3,7 @@
Name: FlightGear-Atlas
Summary: Flightgear map tools
Version: 0.5.0
-Release: 0.24%{snapshot}%{?dist}
+Release: 0.25%{snapshot}%{?dist}
License: GPLv2+
Group: Amusements/Games
@@ -15,6 +15,7 @@ Patch2:
Atlas-0.5.0-fix-operator-should-have-been-declared-inside-namesp
Patch3: Atlas-0.5.0-fix-removal-of-deprecated-function-in-sgtime.patch
Patch4: Atlas-0.5.0-add-material-from-corine-landcover-classes.patch
Patch5: Atlas-0.5.0-remove-assert-about-matching-navaids.patch
+Patch6: Atlas-0.5.0-fix-sgpath-api-change.patch
URL:
http://atlas.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freeglut-devel, curl-devel, libpng-devel, glew-devel, boost-devel
@@ -37,6 +38,7 @@ Atlas viewer
%patch3 -p0
%patch4 -p0
%patch5 -p0
+%patch6 -p0
find -type f -name '*.[hc]xx' -exec chmod a-x {} \;
%build
@@ -76,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/flightgear/Atlas
%changelog
+* Wed Sep 14 2016 Fabrice Bellet <fabrice(a)bellet.info> - 0.5.0-0.25.cvs20141002
+- rebuild with newer SimGear
+- fix for SGPath API change
+
* Thu May 19 2016 Fabrice Bellet <fabrice(a)bellet.info> - 0.5.0-0.24.cvs20141002
- rebuild with newer SimGear
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/FlightGear-Atlas.git/commit/?h=master&...