[packages/celestia] Version: 1.6.1
jajcus
jajcus at pld-linux.org
Fri Jul 10 20:37:30 CEST 2015
commit e11c2ee1536071f0c4e321323a3c897e498d6d50
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Fri Jul 10 20:31:51 2015 +0200
Version: 1.6.1
– use GTK+2 instead of KDE3 (anything else that GTK+ is probably broken
now)
– some changes needed to make it compile are taken from Debian
celestia-as-needed.patch | 58 +-
celestia-desktop.patch | 32 +-
celestia-extras.patch | 12 -
celestia-gcc43.patch | 1203 ----------------------------------------
celestia-gcc47.patch | 11 +
celestia-includes.patch | 280 ++++++++++
celestia-lua51.patch | 11 -
celestia-null.patch | 12 +
celestia.spec | 48 +-
gtk-enable-locales-early.patch | 37 ++
use-stdint_h.patch | 48 ++
11 files changed, 498 insertions(+), 1254 deletions(-)
---
diff --git a/celestia.spec b/celestia.spec
index 1a9beb3..5c3b124 100644
--- a/celestia.spec
+++ b/celestia.spec
@@ -1,33 +1,38 @@
#
# Conditional build:
-%bcond_without kde # KDE UI as the default one
-%bcond_with gtk # use GTK+2 UI instead
+%bcond_with kde # KDE3 UI as the default one
+%bcond_without gtk # use GTK+2 UI instead
%bcond_with gnome # use libgnome2 UI instead
%bcond_with glut # use glut UI instead
%bcond_without theora # without theora support
#
-%if %{with gtk} || %{with gnome} || %{with glut}
-%undefine with_kde
+%if %{with kde} || %{with gnome} || %{with glut}
+%undefine with_gtk
%endif
Summary: A real-time visual space simulation
Summary(pl.UTF-8): Symulacja przestrzeni kosmicznej w czasie rzeczywistym
Name: celestia
-Version: 1.5.1
+Version: 1.6.1
Release: 1
License: GPL
Group: X11/Applications/Science
Source0: http://dl.sourceforge.net/celestia/%{name}-%{version}.tar.gz
-# Source0-md5: df6854a2cf62d2e96612398c13b68fd2
-Patch0: %{name}-as-needed.patch
-Patch1: %{name}-gcc43.patch
-Patch2: %{name}-extras.patch
-Patch3: %{name}-desktop.patch
-Patch4: %{name}-lua51.patch
+# Source0-md5: 02208982a431b984502fac909bf380f4
+Patch0: %{name}-includes.patch
+Patch1: %{name}-as-needed.patch
+Patch2: gtk-enable-locales-early.patch
+Patch3: use-stdint_h.patch
+Patch4: %{name}-desktop.patch
+Patch5: %{name}-gcc47.patch
+Patch6: %{name}-null.patch
+#Patch2: %{name}-extras.patch
+#Patch4: %{name}-lua51.patch
URL: http://www.shatters.net/celestia/
BuildRequires: OpenGL-GLU-devel
%{?with_glut:BuildRequires: OpenGL-glut-devel >= 4.0}
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: gettext-tools
%if %{with gtk} || %{with gnome}
BuildRequires: cairo-devel
BuildRequires: gtk+2-devel >= 2:2.6
@@ -95,20 +100,29 @@ widoku kilkumetrowych statków kosmicznych. Interfejs typu
%prep
%setup -q
-%patch0
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# ugly hack not to require GConf2-devel if we're not building gnome version
%{!?with_gnome:sed -i "s#AM_GCONF_SOURCE_2##g" configure.in}
%build
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common
+%{__gettextize}
+cp -a po/Makefile* po2/
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
+ CFLAGS="%{rpmcflags} $(pkg-config --cflags libpng)" \
+ LIBS="-ldl" \
%{?with_kde:--with-kde} \
%{?with_gtk:--with-gtk} \
%{?with_gnome:--with-gnome} \
@@ -134,6 +148,8 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
%{!?with_kde:install src/celestia/kde/data/celestia.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop}
install src/celestia/kde/data/hi48-app-celestia.png $RPM_BUILD_ROOT%{_pixmapsdir}/celestia.png
+rm -r $RPM_BUILD_ROOT%{_localedir}/no
+
%find_lang %{name} --all-name --with-kde
%clean
@@ -149,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README AUTHORS TODO controls.txt ChangeLog
+%doc NEWS README AUTHORS controls.txt ChangeLog
%attr(755,root,root) %{_bindir}/*
%{_datadir}/celestia
%{_pixmapsdir}/*
diff --git a/celestia-as-needed.patch b/celestia-as-needed.patch
index 0e1c443..be4cb4d 100644
--- a/celestia-as-needed.patch
+++ b/celestia-as-needed.patch
@@ -1,13 +1,59 @@
---- src/celestia/Makefile.am~ 2008-04-23 22:17:06.000000000 +0100
-+++ src/celestia/Makefile.am 2008-08-26 16:05:51.000000000 +0100
-@@ -7,8 +7,8 @@
+diff -dur celestia-1.6.1.orig/src/celestia/Makefile.am celestia-1.6.1/src/celestia/Makefile.am
+--- celestia-1.6.1.orig/src/celestia/Makefile.am 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/Makefile.am 2015-07-10 18:49:02.940315395 +0200
+@@ -7,14 +7,14 @@
if ENABLE_KDE
SUBDIRS += kde
-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-- $(LIBSOCKET) kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-+ $(LIBSOCKET)
+- $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++ $(LIB_KFILE) $(LIBSOCKET) -lDCOP
celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
endif
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS)
+ endif
+
+ COMMONSOURCES = \
+@@ -88,7 +88,8 @@
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(SPICE_LIBS) \
++ $(GL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
+diff -dur celestia-1.6.1.orig/src/celestia/Makefile.in celestia-1.6.1/src/celestia/Makefile.in
+--- celestia-1.6.1.orig/src/celestia/Makefile.in 2011-06-05 20:34:28.000000000 +0200
++++ celestia-1.6.1/src/celestia/Makefile.in 2015-07-10 18:49:02.940315395 +0200
+@@ -473,11 +473,11 @@
+ xdg_menudir = @xdg_menudir@
+ SUBDIRS = res $(am__append_1) $(am__append_2)
+ INCLUDES = -I..
+- at ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+- at ENABLE_KDE_TRUE@ $(LIBSOCKET) -lDCOP kde/libkdegui.a
++ at ENABLE_KDE_TRUE@celestiaKDELIBS = kde/libkdegui.a $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++ at ENABLE_KDE_TRUE@ $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+
+ @ENABLE_KDE_TRUE at celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+- at ENABLE_GTK_TRUE@celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++ at ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a $(GTK_LIBS)
+ COMMONSOURCES = \
+ celestiacore.cpp \
+ configfile.cpp \
+@@ -538,7 +538,8 @@
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(SPICE_LIBS) \
++ $(GL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
diff --git a/celestia-desktop.patch b/celestia-desktop.patch
index 36b8ba4..c05d75e 100644
--- a/celestia-desktop.patch
+++ b/celestia-desktop.patch
@@ -1,6 +1,26 @@
-diff -urN celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am celestia-1.4.1.mod/src/celestia/kde/data/Makefile.am
---- celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am 2006-01-07 12:15:48.000000000 +0100
-+++ celestia-1.4.1.mod/src/celestia/kde/data/Makefile.am 2006-06-29 21:00:32.172758750 +0200
+diff -dur -x '*~' -x '*.rej' -x '*.orig' celestia-1.6.1.orig/src/celestia/gtk/data/celestia.desktop celestia-1.6.1/src/celestia/gtk/data/celestia.desktop
+--- celestia-1.6.1.orig/src/celestia/gtk/data/celestia.desktop 2011-06-05 18:11:10.000000000 +0200
++++ celestia-1.6.1/src/celestia/gtk/data/celestia.desktop 2015-07-10 19:01:11.534166719 +0200
+@@ -1,12 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Version=1.4.0
+ Type=Application
+ Exec=celestia
+ Icon=celestia
+ X-GNOME-DocPath=
+ Terminal=false
+ Name=Celestia
+-Comment=Space Simulator
++Comment=A real-time visual space simulation
++Comment[pl]=Symulacja przestrzeni kosmicznej w czasie rzeczywistym
+ StartupNotify=true
+-Categories=Astronomy;Science;Application;
++Categories=Qt;KDE;Education;Science;Astronomy;
++# vi: encoding=utf-8
+diff -dur -x '*~' -x '*.rej' -x '*.orig' celestia-1.6.1.orig/src/celestia/kde/data/Makefile.am celestia-1.6.1/src/celestia/kde/data/Makefile.am
+--- celestia-1.6.1.orig/src/celestia/kde/data/Makefile.am 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/kde/data/Makefile.am 2015-07-10 18:58:02.449884263 +0200
@@ -14,7 +14,7 @@
mimedir = $(kde_mimedir)/application
mime_DATA = x-celestia-script.desktop
@@ -10,9 +30,9 @@ diff -urN celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am celestia-1.4.1.m
apps_DATA = celestia.desktop
KDE_ICON = celestia
-diff -urN celestia-1.4.1.orig/src/celestia/kde/data/celestia.desktop celestia-1.4.1.mod/src/celestia/kde/data/celestia.desktop
---- celestia-1.4.1.orig/src/celestia/kde/data/celestia.desktop 2002-12-15 17:58:23.000000000 +0100
-+++ celestia-1.4.1.mod/src/celestia/kde/data/celestia.desktop 2006-06-29 20:59:13.863864750 +0200
+diff -dur -x '*~' -x '*.rej' -x '*.orig' celestia-1.6.1.orig/src/celestia/kde/data/celestia.desktop celestia-1.6.1/src/celestia/kde/data/celestia.desktop
+--- celestia-1.6.1.orig/src/celestia/kde/data/celestia.desktop 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/kde/data/celestia.desktop 2015-07-10 18:58:59.646838368 +0200
@@ -1,8 +1,14 @@
[Desktop Entry]
+Encoding=UTF-8
diff --git a/celestia-extras.patch b/celestia-extras.patch
deleted file mode 100644
index c79c039..0000000
--- a/celestia-extras.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN celestia-1.4.0./celestia.cfg celestia-1.4.0/celestia.cfg
---- celestia-1.4.0./celestia.cfg 2005-09-04 23:35:51.000000000 +0200
-+++ celestia-1.4.0/celestia.cfg 2005-12-25 01:33:24.169965072 +0100
-@@ -137,7 +137,7 @@
- # or
- # ExtrasDirectories [ "D:\\celestia-extras" ]
- #------------------------------------------------------------------------
-- ExtrasDirectories [ "extras" ]
-+ ExtrasDirectories [ "extras" "~/.celestia" ]
-
-
- #------------------------------------------------------------------------
diff --git a/celestia-gcc43.patch b/celestia-gcc43.patch
deleted file mode 100644
index 09b2b2f..0000000
--- a/celestia-gcc43.patch
+++ /dev/null
@@ -1,1203 +0,0 @@
-Marek Mahut <mmahut at fedoraproject.org>: Fix problems with compilation under gcc 4.3
-
-diff -Naur celestia-1.5.0-upstream/src/buildstardb.cpp celestia-1.5.0/src/buildstardb.cpp
---- celestia-1.5.0-upstream/src/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/buildstardb.cpp 2008-03-01 08:52:23.000000000 +0100
-@@ -17,6 +17,7 @@
- #include <assert.h>
- #include <unistd.h>
- #include "celengine/stardb.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/asterism.cpp celestia-1.5.0/src/celengine/asterism.cpp
---- celestia-1.5.0-upstream/src/celengine/asterism.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/asterism.cpp 2008-03-01 09:23:23.000000000 +0100
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <algorithm>
-+#include <libintl.h>
-
- #ifndef _WIN32
- #ifndef TARGET_OS_MAC
-diff -Naur celestia-1.5.0-upstream/src/celengine/astro.cpp celestia-1.5.0/src/celengine/astro.cpp
---- celestia-1.5.0-upstream/src/celengine/astro.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/astro.cpp 2008-03-01 09:14:33.000000000 +0100
-@@ -10,12 +10,14 @@
- #include <cmath>
- #include <iomanip>
- #include <cstdio>
-+#include <cstring>
- #include <time.h>
- #include <celutil/basictypes.h>
- #include <celmath/mathlib.h>
- #include "celestia.h"
- #include "astro.h"
- #include <celutil/util.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/body.cpp celestia-1.5.0/src/celengine/body.cpp
---- celestia-1.5.0-upstream/src/celengine/body.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/body.cpp 2008-03-01 09:34:10.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <celmath/mathlib.h>
- #include <celutil/util.h>
- #include <celutil/utf8.h>
-+#include <libintl.h>
- #include "mesh.h"
- #include "meshmanager.h"
- #include "body.h"
-diff -Naur celestia-1.5.0-upstream/src/celengine/cmdparser.cpp celestia-1.5.0/src/celengine/cmdparser.cpp
---- celestia-1.5.0-upstream/src/celengine/cmdparser.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/cmdparser.cpp 2008-03-01 08:52:32.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "astro.h"
- #include "cmdparser.h"
- #include "glcontext.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/console.cpp celestia-1.5.0/src/celengine/console.cpp
---- celestia-1.5.0-upstream/src/celengine/console.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/console.cpp 2008-03-01 08:50:23.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <cstdarg>
- #include <cstdio>
- #include <cassert>
-+#include <cstring>
- #include "celutil/utf8.h"
- #include "gl.h"
- #include "vecgl.h"
-diff -Naur celestia-1.5.0-upstream/src/celengine/dds.cpp celestia-1.5.0/src/celengine/dds.cpp
---- celestia-1.5.0-upstream/src/celengine/dds.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/dds.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <celengine/gl.h>
- #include <celengine/glext.h>
- #include <celengine/image.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/dsodb.cpp celestia-1.5.0/src/celengine/dsodb.cpp
---- celestia-1.5.0-upstream/src/celengine/dsodb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/dsodb.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -32,6 +32,7 @@
- #include <celengine/galaxy.h>
- #include <celengine/opencluster.h>
- #include <celengine/nebula.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp celestia-1.5.0/src/celengine/fragmentprog.cpp
---- celestia-1.5.0-upstream/src/celengine/fragmentprog.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/fragmentprog.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -13,6 +13,7 @@
- #include "gl.h"
- #include "glext.h"
- #include "fragmentprog.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/galaxy.cpp celestia-1.5.0/src/celengine/galaxy.cpp
---- celestia-1.5.0-upstream/src/celengine/galaxy.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/galaxy.cpp 2008-03-01 11:52:10.000000000 +0100
-@@ -23,6 +23,8 @@
- #include "vecgl.h"
- #include "render.h"
- #include "texture.h"
-+#include <libintl.h>
-+#include <string.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/glcontext.cpp celestia-1.5.0/src/celengine/glcontext.cpp
---- celestia-1.5.0-upstream/src/celengine/glcontext.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/glcontext.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -12,6 +12,7 @@
- #include "gl.h"
- #include "glext.h"
- #include "glcontext.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/glext.cpp celestia-1.5.0/src/celengine/glext.cpp
---- celestia-1.5.0-upstream/src/celengine/glext.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/glext.cpp 2008-03-01 08:52:56.000000000 +0100
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <string.h>
-+#include <cstring>
- #include "gl.h"
-
- #ifndef _WIN32
-@@ -19,6 +20,7 @@
- #endif /* ! _WIN32 */
-
- #include "glext.h"
-+#include <libintl.h>
-
- // ARB_texture_compression
- glx::PFNGLCOMPRESSEDTEXIMAGE3DARBPROC glx::glCompressedTexImage3DARB;
-diff -Naur celestia-1.5.0-upstream/src/celengine/image.cpp celestia-1.5.0/src/celengine/image.cpp
---- celestia-1.5.0-upstream/src/celengine/image.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/image.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -66,6 +66,7 @@
- #include <iostream>
- #include <algorithm>
- #include <cmath>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/location.cpp celestia-1.5.0/src/celengine/location.cpp
---- celestia-1.5.0-upstream/src/celengine/location.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/location.cpp 2008-03-01 09:34:18.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <celengine/location.h>
- #include <celengine/body.h>
- #include <celutil/util.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp celestia-1.5.0/src/celengine/lodspheremesh.cpp
---- celestia-1.5.0-upstream/src/celengine/lodspheremesh.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/lodspheremesh.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -17,6 +17,7 @@
- #include "glext.h"
- #include "vecgl.h"
- #include "lodspheremesh.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/marker.cpp celestia-1.5.0/src/celengine/marker.cpp
---- celestia-1.5.0-upstream/src/celengine/marker.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/marker.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -9,6 +9,7 @@
-
- #include "marker.h"
- #include "gl.h"
-+#include <libintl.h>
-
-
- using namespace std;
-diff -Naur celestia-1.5.0-upstream/src/celengine/mesh.cpp celestia-1.5.0/src/celengine/mesh.cpp
---- celestia-1.5.0-upstream/src/celengine/mesh.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/mesh.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <cassert>
- #include <iostream>
- #include <algorithm>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/meshmanager.cpp celestia-1.5.0/src/celengine/meshmanager.cpp
---- celestia-1.5.0-upstream/src/celengine/meshmanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/meshmanager.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -26,6 +26,7 @@
- #include "spheremesh.h"
- #include "texmanager.h"
- #include "meshmanager.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/modelfile.cpp celestia-1.5.0/src/celengine/modelfile.cpp
---- celestia-1.5.0-upstream/src/celengine/modelfile.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/modelfile.cpp 2008-03-01 11:52:21.000000000 +0100
-@@ -15,6 +15,8 @@
- #include <cassert>
- #include <cmath>
- #include <cstdio>
-+#include <libintl.h>
-+#include <string.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/nebula.cpp celestia-1.5.0/src/celengine/nebula.cpp
---- celestia-1.5.0-upstream/src/celengine/nebula.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/nebula.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -21,6 +21,7 @@
- #include "glext.h"
- #include "vecgl.h"
- #include "render.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/opencluster.cpp celestia-1.5.0/src/celengine/opencluster.cpp
---- celestia-1.5.0-upstream/src/celengine/opencluster.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/opencluster.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -19,6 +19,7 @@
- #include "gl.h"
- #include "vecgl.h"
- #include "render.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/overlay.cpp celestia-1.5.0/src/celengine/overlay.cpp
---- celestia-1.5.0-upstream/src/celengine/overlay.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/overlay.cpp 2008-03-01 08:50:23.000000000 +0100
-@@ -9,6 +9,7 @@
-
- #include <cstdarg>
- #include <cstdio>
-+#include <cstring>
- #include <celutil/utf8.h>
- #include "gl.h"
- #include "vecgl.h"
-diff -Naur celestia-1.5.0-upstream/src/celengine/parseobject.cpp celestia-1.5.0/src/celengine/parseobject.cpp
---- celestia-1.5.0-upstream/src/celengine/parseobject.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/parseobject.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -21,6 +21,7 @@
- #include "trajmanager.h"
- #include "rotationmanager.h"
- #include "universe.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/render.cpp celestia-1.5.0/src/celengine/render.cpp
---- celestia-1.5.0-upstream/src/celengine/render.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/render.cpp 2008-03-01 08:53:29.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <cstdio>
- #include <cstring>
- #include <cassert>
-+#include <libintl.h>
-
- #ifndef _WIN32
- #ifndef TARGET_OS_MAC
-diff -Naur celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp celestia-1.5.0/src/celengine/rotationmanager.cpp
---- celestia-1.5.0-upstream/src/celengine/rotationmanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/rotationmanager.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <celutil/debug.h>
- #include "samporient.h"
- #include "rotationmanager.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/selection.cpp celestia-1.5.0/src/celengine/selection.cpp
---- celestia-1.5.0-upstream/src/celengine/selection.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/selection.cpp 2008-03-01 09:34:25.000000000 +0100
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <cstdio>
-+#include <libintl.h>
- #include "astro.h"
- #include "selection.h"
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/shadermanager.cpp celestia-1.5.0/src/celengine/shadermanager.cpp
---- celestia-1.5.0-upstream/src/celengine/shadermanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/shadermanager.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <iomanip>
- #include <cstdio>
- #include <cassert>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/simulation.cpp celestia-1.5.0/src/celengine/simulation.cpp
---- celestia-1.5.0-upstream/src/celengine/simulation.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/simulation.cpp 2008-03-01 09:34:28.000000000 +0100
-@@ -11,6 +11,7 @@
- // of the License, or (at your option) any later version.
-
- #include <algorithm>
-+#include <libintl.h>
- #include "simulation.h"
-
- using namespace std;
-diff -Naur celestia-1.5.0-upstream/src/celengine/solarsys.cpp celestia-1.5.0/src/celengine/solarsys.cpp
---- celestia-1.5.0-upstream/src/celengine/solarsys.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/solarsys.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "universe.h"
- #include "multitexture.h"
- #include "parseobject.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp celestia-1.5.0/src/celengine/solarsysxml.cpp
---- celestia-1.5.0-upstream/src/celengine/solarsysxml.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/solarsysxml.cpp 2008-03-01 11:52:31.000000000 +0100
-@@ -8,6 +8,8 @@
- // of the License, or (at your option) any later version.
-
- #include <cassert>
-+#include <cstring>
-+#include <string.h>
-
- #include <libxml/parser.h>
- #include <libxml/parserInternals.h>
-@@ -20,6 +22,7 @@
- #include "texmanager.h"
- #include "meshmanager.h"
- #include "solarsysxml.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp celestia-1.5.0/src/celengine/spiceinterface.cpp
---- celestia-1.5.0-upstream/src/celengine/spiceinterface.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/spiceinterface.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -11,6 +11,7 @@
-
- #include "SpiceUsr.h"
- #include "spiceinterface.h"
-+#include <libintl.h>
-
-
- bool
-diff -Naur celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp celestia-1.5.0/src/celengine/spiceorbit.cpp
---- celestia-1.5.0-upstream/src/celengine/spiceorbit.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/spiceorbit.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -14,6 +14,7 @@
- #include "SpiceUsr.h"
- #include "astro.h"
- #include "spiceorbit.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/stardb.cpp celestia-1.5.0/src/celengine/stardb.cpp
---- celestia-1.5.0-upstream/src/celengine/stardb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/stardb.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <cmath>
- #include <cstdlib>
- #include <cstdio>
-+#include <cstring>
- #include <cassert>
- #include <algorithm>
- #include <celmath/mathlib.h>
-@@ -24,6 +25,7 @@
- #include "multitexture.h"
- #include "meshmanager.h"
- #include <celutil/debug.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/texmanager.cpp celestia-1.5.0/src/celengine/texmanager.cpp
---- celestia-1.5.0-upstream/src/celengine/texmanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/texmanager.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <fstream>
- #include "multitexture.h"
- #include "texmanager.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/texture.cpp celestia-1.5.0/src/celengine/texture.cpp
---- celestia-1.5.0-upstream/src/celengine/texture.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/texture.cpp 2008-03-01 08:54:00.000000000 +0100
-@@ -28,6 +28,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <cassert>
-+#include <libintl.h>
-
- #ifndef _WIN32
- #ifndef TARGET_OS_MAC
-diff -Naur celestia-1.5.0-upstream/src/celengine/tokenizer.cpp celestia-1.5.0/src/celengine/tokenizer.cpp
---- celestia-1.5.0-upstream/src/celengine/tokenizer.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/tokenizer.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <iomanip>
- #include <celutil/utf8.h>
- #include "tokenizer.h"
-+#include <libintl.h>
-
-
- static bool issep(char c)
-diff -Naur celestia-1.5.0-upstream/src/celengine/trajmanager.cpp celestia-1.5.0/src/celengine/trajmanager.cpp
---- celestia-1.5.0-upstream/src/celengine/trajmanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/trajmanager.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <celutil/debug.h>
- #include "samporbit.h"
- #include "trajmanager.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/universe.cpp celestia-1.5.0/src/celengine/universe.cpp
---- celestia-1.5.0-upstream/src/celengine/universe.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/universe.cpp 2008-03-01 09:34:33.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <celmath/intersect.h>
- #include <celutil/utf8.h>
- #include <cassert>
-+#include <libintl.h>
- #include "astro.h"
- #include "3dsmesh.h"
- #include "meshmanager.h"
-diff -Naur celestia-1.5.0-upstream/src/celengine/vertexprog.cpp celestia-1.5.0/src/celengine/vertexprog.cpp
---- celestia-1.5.0-upstream/src/celengine/vertexprog.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/vertexprog.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -14,6 +14,7 @@
- #include "gl.h"
- #include "glext.h"
- #include "vertexprog.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celengine/virtualtex.cpp celestia-1.5.0/src/celengine/virtualtex.cpp
---- celestia-1.5.0-upstream/src/celengine/virtualtex.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celengine/virtualtex.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -19,6 +19,7 @@
- #include "virtualtex.h"
- #include "gl.h"
- #include "parser.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/celestiacore.cpp celestia-1.5.0/src/celestia/celestiacore.cpp
---- celestia-1.5.0-upstream/src/celestia/celestiacore.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/celestiacore.cpp 2008-03-01 08:54:18.000000000 +0100
-@@ -43,6 +43,7 @@
- #include <celutil/debug.h>
- #include <celutil/utf8.h>
- #include "url.h"
-+#include <libintl.h>
-
- #ifdef CELX
- #include <celengine/scriptobject.h>
-diff -Naur celestia-1.5.0-upstream/src/celestia/celx.cpp celestia-1.5.0/src/celestia/celx.cpp
---- celestia-1.5.0-upstream/src/celestia/celx.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/celx.cpp 2008-03-01 11:52:38.000000000 +0100
-@@ -11,7 +11,9 @@
-
- #include <cassert>
- #include <cstring>
-+#include <string.h>
- #include <cstdio>
-+#include <libintl.h>
- #include <map>
- #include <celengine/astro.h>
- #include <celengine/celestia.h>
-diff -Naur celestia-1.5.0-upstream/src/celestia/configfile.cpp celestia-1.5.0/src/celestia/configfile.cpp
---- celestia-1.5.0-upstream/src/celestia/configfile.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/configfile.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <celengine/celestia.h>
- #include <celengine/texmanager.h>
- #include "configfile.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/destination.cpp celestia-1.5.0/src/celestia/destination.cpp
---- celestia-1.5.0-upstream/src/celestia/destination.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/destination.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <celengine/astro.h>
- #include <celengine/parser.h>
- #include "destination.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp celestia-1.5.0/src/celestia/eclipsefinder.cpp
---- celestia-1.5.0-upstream/src/celestia/eclipsefinder.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/eclipsefinder.cpp 2008-03-01 09:14:53.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <algorithm>
- #include <set>
- #include <cassert>
-+#include <cstring>
- #include "eclipsefinder.h"
- #include "celmath/mathlib.h"
- #include "celmath/ray.h"
-diff -Naur celestia-1.5.0-upstream/src/celestia/glutmain.cpp celestia-1.5.0/src/celestia/glutmain.cpp
---- celestia-1.5.0-upstream/src/celestia/glutmain.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/glutmain.cpp 2008-03-01 08:55:18.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <cstdlib>
- #include <cctype>
- #include <cstring>
-+#include <libintl.h>
- #include <time.h>
- #include <unistd.h>
- #include <celengine/gl.h>
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp celestia-1.5.0/src/celestia/gtk/actions.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/actions.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/actions.cpp 2008-03-01 08:55:33.000000000 +0100
-@@ -15,6 +15,7 @@
- #endif /* HAVE_CONFIG_H */
-
- #include <cstring>
-+#include <libintl.h>
- #include <fstream>
- #include <gtk/gtk.h>
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/common.cpp celestia-1.5.0/src/celestia/gtk/common.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/common.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/common.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <celestia/celestiacore.h>
-
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Returns the offset of the timezone at date */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-eclipse.cpp 2008-03-01 08:51:48.000000000 +0100
-@@ -18,6 +18,7 @@
-
- #include "dialog-eclipse.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Definitions: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-goto.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-goto.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -18,6 +18,7 @@
-
- #include "dialog-goto.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp celestia-1.5.0/src/celestia/gtk/dialog-options.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-options.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-options.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -17,6 +17,7 @@
- #include "dialog-options.h"
- #include "common.h"
- #include "ui.h"
-+#include <libintl.h>
-
-
- /* Definitions: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-solar.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-solar.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -22,6 +22,7 @@
- #include "dialog-solar.h"
- #include "actions.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp celestia-1.5.0/src/celestia/gtk/dialog-star.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-star.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-star.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -25,6 +25,7 @@
- #include "dialog-star.h"
- #include "actions.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp celestia-1.5.0/src/celestia/gtk/dialog-time.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-time.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-time.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -18,6 +18,7 @@
-
- #include "dialog-time.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/dialog-tour.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/dialog-tour.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -18,6 +18,7 @@
-
- #include "dialog-tour.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/main.cpp celestia-1.5.0/src/celestia/gtk/main.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/main.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/main.cpp 2008-03-01 08:56:03.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <cstdlib>
- #include <cctype>
- #include <cstring>
-+#include <libintl.h>
- #include <time.h>
-
- #ifdef WIN32
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp celestia-1.5.0/src/celestia/gtk/menu-context.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/menu-context.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/menu-context.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -20,6 +20,7 @@
- #include "menu-context.h"
- #include "actions.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Definitions: Callbacks */
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp celestia-1.5.0/src/celestia/gtk/settings-file.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/settings-file.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/settings-file.cpp 2008-03-01 09:34:40.000000000 +0100
-@@ -11,6 +11,7 @@
- */
-
- #include <gtk/gtk.h>
-+#include <libintl.h>
-
- #include <celengine/body.h>
- #include <celengine/galaxy.h>
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/settings-gconf.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/settings-gconf.cpp 2008-03-01 09:34:44.000000000 +0100
-@@ -12,6 +12,7 @@
-
- #include <gtk/gtk.h>
- #include <gconf/gconf-client.h>
-+#include <libintl.h>
-
- #include <celengine/body.h>
- #include <celengine/galaxy.h>
-diff -Naur celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp celestia-1.5.0/src/celestia/gtk/splash.cpp
---- celestia-1.5.0-upstream/src/celestia/gtk/splash.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/gtk/splash.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -22,6 +22,7 @@
-
- #include "splash.h"
- #include "common.h"
-+#include <libintl.h>
-
-
- /* Declarations */
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/celestialbrowser.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/celestialbrowser.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -16,6 +16,7 @@
- #include "cellistviewitem.h"
- #include "selectionpopup.h"
- #include "celutil/utf8.h"
-+#include <libintl.h>
-
- /*
- * Constructs a CelestialBrowser which is a child of 'parent', with the
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/celsplashscreen.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/celsplashscreen.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <kglobalsettings.h>
- #include <celsplashscreen.h>
- #include <X11/Xlib.h>
-+#include <libintl.h>
-
- CelSplashScreen::CelSplashScreen(const QString& filename, QWidget* _parent):
- QWidget(0, 0, WStyle_Customize | WX11BypassWM),
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/eclipsefinderdlg.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -11,6 +11,7 @@
- #include "celestiacore.h"
- #include "celengine/astro.h"
- #include "eclipsefinder.h"
-+#include <libintl.h>
-
- /*
- * Constructs a EclipseFinder which is a child of 'parent', with the
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmanager.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <qdir.h>
- #include <kstandarddirs.h>
- #include "kcelbookmarkmanager.h"
-+#include <libintl.h>
-
- KBookmarkManager* KCelBookmarkManager::self() {
- if ( !s_bookmarkManager )
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kcelbookmarkmenu.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <kpopupmenu.h>
- #include <kstdaccel.h>
- #include <kstdaction.h>
-+#include <libintl.h>
-
- template class QPtrList<KCelBookmarkMenu>;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp celestia-1.5.0/src/celestia/kde/kdeapp.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kdeapp.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kdeapp.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -87,6 +87,7 @@
- #endif
-
- #include "celengine/glext.h"
-+#include <libintl.h>
-
- #define MENUMAXSIZE 100
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kdeglwidget.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kdeglwidget.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -48,6 +48,7 @@
-
- #include <math.h>
- #include <vector>
-+#include <libintl.h>
-
- KdeGlWidget::KdeGlWidget( QWidget* parent, const char* name, CelestiaCore* core)
- : QGLWidget( parent, name )
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp celestia-1.5.0/src/celestia/kde/kdemain.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kdemain.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kdemain.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <klocale.h>
-
- #include "kdeuniquecelestia.h"
-+#include <libintl.h>
-
- static const char *description =
- I18N_NOOP("Celestia");
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kdepreferencesdialog.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -40,6 +40,7 @@
- #include "celengine/render.h"
- #include "celengine/glcontext.h"
- #include "celengine/astro.h"
-+#include <libintl.h>
-
- static uint32 FilterOtherLocations = ~(Location::City |
- Location::Observatory |
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/kdeuniquecelestia.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <string>
- #include <vector>
- #include <klocale.h>
-+#include <libintl.h>
-
- KdeUniqueCelestia::KdeUniqueCelestia() {
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp celestia-1.5.0/src/celestia/kde/selectionpopup.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/selectionpopup.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/selectionpopup.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <krun.h>
-
- #include "celutil/utf8.h"
-+#include <libintl.h>
-
- SelectionPopup::SelectionPopup(QWidget* parent, CelestiaCore* _appCore, Selection _sel):
- KPopupMenu(parent),
-diff -Naur celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp
---- celestia-1.5.0-upstream/src/celestia/kde/videocapturedlg.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/kde/videocapturedlg.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <kstatusbar.h>
- #include <kapp.h>
- #include "kdeapp.h"
-+#include <libintl.h>
-
- VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir):
- accepted(false)
-diff -Naur celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp celestia-1.5.0/src/celestia/oggtheoracapture.cpp
---- celestia-1.5.0-upstream/src/celestia/oggtheoracapture.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/oggtheoracapture.cpp 2008-03-01 09:15:02.000000000 +0100
-@@ -66,11 +66,14 @@
- #include <celutil/util.h>
- #include "../celengine/gl.h"
- #include <string>
-+#include <cstring>
-+#include <ctime>
- #include "theora/theora.h"
-
- using namespace std;
-
- #include "oggtheoracapture.h"
-+#include <libintl.h>
-
- // {"video-rate-target",required_argument,NULL,'V'},
- // {"video-quality",required_argument,NULL,'v'},
-diff -Naur celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp celestia-1.5.0/src/celestia/scriptmenu.cpp
---- celestia-1.5.0-upstream/src/celestia/scriptmenu.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/scriptmenu.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -13,6 +13,7 @@
- #include "celutil/directory.h"
- #include "celutil/filetype.h"
- #include <fstream>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/url.cpp celestia-1.5.0/src/celestia/url.cpp
---- celestia-1.5.0-upstream/src/celestia/url.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/url.cpp 2008-03-01 11:52:48.000000000 +0100
-@@ -16,10 +16,12 @@
- ***************************************************************************/
-
- #include <string>
-+#include <string.h>
- #include <stdio.h>
- #include "celestiacore.h"
- #include "celengine/astro.h"
- #include "url.h"
-+#include <libintl.h>
-
- static const unsigned int CurrentCelestiaURLVersion = 2;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/wglext.cpp celestia-1.5.0/src/celestia/wglext.cpp
---- celestia-1.5.0-upstream/src/celestia/wglext.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/wglext.cpp 2008-03-01 11:52:52.000000000 +0100
-@@ -14,7 +14,10 @@
- #include "wglext.h"
- #include <windows.h>
- #include <cstdio>
-+#include <cstring>
-+#include <string.h>
- #include <vector>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp celestia-1.5.0/src/celestia/winbookmarks.cpp
---- celestia-1.5.0-upstream/src/celestia/winbookmarks.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/winbookmarks.cpp 2008-03-01 11:52:58.000000000 +0100
-@@ -13,6 +13,7 @@
- #include "res/resource.h"
- #include <celutil/winutil.h>
- #include <iostream>
-+#include <string.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/windatepicker.cpp celestia-1.5.0/src/celestia/windatepicker.cpp
---- celestia-1.5.0-upstream/src/celestia/windatepicker.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/windatepicker.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -11,10 +11,12 @@
-
- #include <windows.h>
- #include <commctrl.h>
-+#include <cstring>
- #include "celutil/basictypes.h"
- #include "celengine/astro.h"
- #include "celutil/util.h"
- #include "celutil/winutil.h"
-+#include <libintl.h>
-
-
- // DatePicker is a Win32 control for setting the date. It replaces the
-diff -Naur celestia-1.5.0-upstream/src/celestia/wineclipses.cpp celestia-1.5.0/src/celestia/wineclipses.cpp
---- celestia-1.5.0-upstream/src/celestia/wineclipses.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/wineclipses.cpp 2008-03-01 11:53:02.000000000 +0100
-@@ -10,6 +10,7 @@
-
- #include <string>
- #include <sstream>
-+#include <string.h>
- #include <algorithm>
- #include <set>
- #include <cassert>
-@@ -23,6 +24,7 @@
- #include "celmath/distance.h"
- #include "celutil/util.h"
- #include "celutil/winutil.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp celestia-1.5.0/src/celestia/winhyperlinks.cpp
---- celestia-1.5.0-upstream/src/celestia/winhyperlinks.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/winhyperlinks.cpp 2008-03-01 08:50:24.000000000 +0100
-@@ -9,6 +9,7 @@
- // as published by the Free Software Foundation; either version 2
- // of the License, or (at your option) any later version.
-
-+#include <cstring>
- #include "winhyperlinks.h"
- #include "res/resource.h"
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/winmain.cpp celestia-1.5.0/src/celestia/winmain.cpp
---- celestia-1.5.0-upstream/src/celestia/winmain.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/winmain.cpp 2008-03-01 11:53:07.000000000 +0100
-@@ -23,6 +23,7 @@
- #include <windows.h>
- #include <commctrl.h>
- #include <mmsystem.h>
-+#include <string.h>
-
- #include <celmath/vecmath.h>
- #include <celmath/quaternion.h>
-@@ -59,6 +60,7 @@
- #include "wglext.h"
-
- #include <locale.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/winsplash.cpp celestia-1.5.0/src/celestia/winsplash.cpp
---- celestia-1.5.0-upstream/src/celestia/winsplash.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/winsplash.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -15,8 +15,9 @@
- #include <commctrl.h>
- #include "res/resource.h"
- #include "celutil/util.h"
- #include <iostream>
-+#include <libintl.h>
- #include <locale.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp celestia-1.5.0/src/celestia/winstarbrowser.cpp
---- celestia-1.5.0-upstream/src/celestia/winstarbrowser.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/winstarbrowser.cpp 2008-03-01 11:53:13.000000000 +0100
-@@ -15,10 +15,12 @@
- #include <windows.h>
- #include <commctrl.h>
- #include <cstring>
-+#include <string.h>
- #include "winstarbrowser.h"
- #include "celutil/winutil.h"
-
- #include "res/resource.h"
-+#include <libintl.h>
-
- extern void SetMouseCursor(LPCTSTR lpCursor);
-
-diff -Naur celestia-1.5.0-upstream/src/celestia/wintime.cpp celestia-1.5.0/src/celestia/wintime.cpp
---- celestia-1.5.0-upstream/src/celestia/wintime.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celestia/wintime.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <celengine/astro.h>
- #include "celutil/util.h"
- #include "celutil/winutil.h"
-+#include <libintl.h>
-
-
-
-diff -Naur celestia-1.5.0-upstream/src/celmath/quaternion.h celestia-1.5.0/src/celmath/quaternion.h
---- celestia-1.5.0-upstream/src/celmath/quaternion.h 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celmath/quaternion.h 2008-03-01 12:30:07.000000000 +0100
-@@ -16,7 +16,6 @@
- #include <celmath/mathlib.h>
- #include <celmath/vecmath.h>
-
--
- template<class T> class Quaternion
- {
- public:
-diff -Naur celestia-1.5.0-upstream/src/celutil/bigfix.cpp celestia-1.5.0/src/celutil/bigfix.cpp
---- celestia-1.5.0-upstream/src/celutil/bigfix.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/bigfix.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <math.h>
- #include <stdio.h>
- #include "bigfix.h"
-+#include <libintl.h>
-
-
- /*** Constructors ***/
-diff -Naur celestia-1.5.0-upstream/src/celutil/color.cpp celestia-1.5.0/src/celutil/color.cpp
---- celestia-1.5.0-upstream/src/celutil/color.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/color.cpp 2008-03-01 11:53:16.000000000 +0100
-@@ -9,6 +9,7 @@
-
- #include <cstdio>
- #include <cstring>
-+#include <string.h>
- #include <cctype>
- #include "color.h"
-
-diff -Naur celestia-1.5.0-upstream/src/celutil/directory.cpp celestia-1.5.0/src/celutil/directory.cpp
---- celestia-1.5.0-upstream/src/celutil/directory.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/directory.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -9,6 +9,7 @@
-
- #include <iostream>
- #include "directory.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celutil/filetype.cpp celestia-1.5.0/src/celutil/filetype.cpp
---- celestia-1.5.0-upstream/src/celutil/filetype.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/filetype.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <cstdlib>
- #include "util.h"
- #include "filetype.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celutil/formatnum.cpp celestia-1.5.0/src/celutil/formatnum.cpp
---- celestia-1.5.0-upstream/src/celutil/formatnum.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/formatnum.cpp 2008-03-01 08:50:23.000000000 +0100
-@@ -10,6 +10,8 @@
- #include <cmath>
- #include <cstdio>
- #include <string>
-+#include <cstring>
-+#include <limits.h>
- #include "formatnum.h"
-
- // HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
-diff -Naur celestia-1.5.0-upstream/src/celutil/utf8.cpp celestia-1.5.0/src/celutil/utf8.cpp
---- celestia-1.5.0-upstream/src/celutil/utf8.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/utf8.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -9,7 +9,9 @@
-
- #include "utf8.h"
- #include <cctype>
-+#include <cstring>
- #include "util.h"
-+#include <libintl.h>
-
- unsigned int WGL4_Normalization_00[256] = {
- 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-diff -Naur celestia-1.5.0-upstream/src/celutil/util.cpp celestia-1.5.0/src/celutil/util.cpp
---- celestia-1.5.0-upstream/src/celutil/util.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/util.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -12,6 +12,7 @@
- #include "util.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/celutil/util.h celestia-1.5.0/src/celutil/util.h
---- celestia-1.5.0-upstream/src/celutil/util.h 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/util.h 2008-03-01 11:49:36.000000000 +0100
-@@ -22,11 +22,11 @@
- switch(0){case 0: case pred:;}
-
- #ifndef min
--#define min(a, b) ((a) < (b) ? (a) : (b))
-+template <typename T1, typename T2> bool min(T1 a, T2 b){ return a<(T1)b; }
- #endif
-
- #ifndef max
--#define max(a, b) ((a) < (b) ? (b) : (a))
-+template <typename T1, typename T2> bool max(T1 a, T2 b){ return a<(T1)b; }
- #endif
-
- #ifdef _WIN32
-diff -Naur celestia-1.5.0-upstream/src/celutil/windirectory.cpp celestia-1.5.0/src/celutil/windirectory.cpp
---- celestia-1.5.0-upstream/src/celutil/windirectory.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/celutil/windirectory.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <iostream>
- #include <windows.h>
- #include "directory.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/packdb.cpp celestia-1.5.0/src/packdb.cpp
---- celestia-1.5.0-upstream/src/packdb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/packdb.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <libintl.h>
-
- #define SPECTRAL_O 0
- #define SPECTRAL_B 1
-diff -Naur celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp celestia-1.5.0/src/tools/atmosphere/scattersim.cpp
---- celestia-1.5.0-upstream/src/tools/atmosphere/scattersim.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/atmosphere/scattersim.cpp 2008-03-01 11:53:23.000000000 +0100
-@@ -11,7 +11,9 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <string.h>
- #include <cstdlib>
-+#include <libintl.h>
- #include <cmath>
- #include <algorithm>
- #include <map>
-diff -Naur celestia-1.5.0-upstream/src/tools/buildstardb.cpp celestia-1.5.0/src/tools/buildstardb.cpp
---- celestia-1.5.0-upstream/src/tools/buildstardb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/buildstardb.cpp 2008-03-01 08:51:49.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <cstdio>
- #include <assert.h>
- #include "stardb.h"
-+#include <libintl.h>
-
- using namespace std;
-
-diff -Naur celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp celestia-1.5.0/src/tools/cmod/cmodfix.cpp
---- celestia-1.5.0-upstream/src/tools/cmod/cmodfix.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/cmod/cmodfix.cpp 2008-03-01 11:53:27.000000000 +0100
-@@ -18,6 +18,7 @@
- #include <cassert>
- #include <cmath>
- #include <cstdio>
-+#include <string.h>
- #include <algorithm>
- #include <vector>
- #ifdef TRISTRIP
-diff -Naur celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp celestia-1.5.0/src/tools/cmod/xtocmod.cpp
---- celestia-1.5.0-upstream/src/tools/cmod/xtocmod.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/cmod/xtocmod.cpp 2008-03-01 11:53:31.000000000 +0100
-@@ -3,6 +3,7 @@
- #include <iomanip>
- #include <algorithm>
- #include <cstdio>
-+#include <string.h>
- #include <cassert>
- #include <cstring>
- #include <d3dx9.h>
-diff -Naur celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp celestia-1.5.0/src/tools/stardb/makestardb.cpp
---- celestia-1.5.0-upstream/src/tools/stardb/makestardb.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/stardb/makestardb.cpp 2008-03-01 11:53:34.000000000 +0100
-@@ -14,6 +14,7 @@
- #include <iomanip>
- #include <cctype>
- #include <cassert>
-+#include <string.h>
- #include <celutil/basictypes.h>
- #include <celutil/bytes.h>
- #include <celengine/astro.h>
-diff -Naur celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp celestia-1.5.0/src/tools/stardb/startextdump.cpp
---- celestia-1.5.0-upstream/src/tools/stardb/startextdump.cpp 2008-03-01 12:51:20.000000000 +0100
-+++ celestia-1.5.0/src/tools/stardb/startextdump.cpp 2008-03-01 11:53:40.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <iostream>
- #include <fstream>
- #include <iomanip>
-+#include <string.h>
- #include <celutil/basictypes.h>
- #include <celutil/bytes.h>
- #include <celengine/astro.h>
diff --git a/celestia-gcc47.patch b/celestia-gcc47.patch
new file mode 100644
index 0000000..068933c
--- /dev/null
+++ b/celestia-gcc47.patch
@@ -0,0 +1,11 @@
+diff -dur celestia-1.6.1.orig/src/celmath/intersect.h celestia-1.6.1/src/celmath/intersect.h
+--- celestia-1.6.1.orig/src/celmath/intersect.h 2011-06-05 18:11:15.000000000 +0200
++++ celestia-1.6.1/src/celmath/intersect.h 2015-07-10 18:55:37.912489627 +0200
+@@ -15,6 +15,7 @@
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"
++#include "mathlib.h"
+
+
+ template<class T> bool testIntersection(const Ray3<T>& ray,
diff --git a/celestia-includes.patch b/celestia-includes.patch
new file mode 100644
index 0000000..e14e869
--- /dev/null
+++ b/celestia-includes.patch
@@ -0,0 +1,280 @@
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/asterism.cpp celestia-1.6.1/src/celengine/asterism.cpp
+--- celestia-1.6.1.orig/src/celengine/asterism.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/asterism.cpp 2015-07-10 19:59:04.239679001 +0200
+@@ -15,6 +15,7 @@
+ #endif /* TARGET_OS_MAC */
+ #endif /* _WIN32 */
+
++#include <libintl.h>
+ #include <celutil/util.h>
+ #include <celutil/debug.h>
+ #include "parser.h"
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/astro.cpp celestia-1.6.1/src/celengine/astro.cpp
+--- celestia-1.6.1.orig/src/celengine/astro.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/astro.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -11,6 +11,7 @@
+ #include <cmath>
+ #include <iomanip>
+ #include <cstdio>
++#include <cstring>
+ #include <time.h>
+ #include <celutil/basictypes.h>
+ #include <celmath/mathlib.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/dsodb.cpp celestia-1.6.1/src/celengine/dsodb.cpp
+--- celestia-1.6.1.orig/src/celengine/dsodb.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/dsodb.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -14,6 +14,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cassert>
++#include <libintl.h>
+ #include <algorithm>
+ #include <celmath/mathlib.h>
+ #include <celmath/plane.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/fragmentprog.cpp celestia-1.6.1/src/celengine/fragmentprog.cpp
+--- celestia-1.6.1.orig/src/celengine/fragmentprog.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/fragmentprog.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -7,6 +7,7 @@
+ // as published by the Free Software Foundation; either version 2
+ // of the License, or (at your option) any later version.
+
++#include <libintl.h>
+ #include <iostream>
+ #include <fstream>
+ #include <string>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/galaxy.cpp celestia-1.6.1/src/celengine/galaxy.cpp
+--- celestia-1.6.1.orig/src/celengine/galaxy.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/galaxy.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -12,6 +12,8 @@
+ #include <algorithm>
+ #include <cstdio>
+ #include <cassert>
++#include <cstring>
++#include <libintl.h>
+ #include "celestia.h"
+ #include <celmath/mathlib.h>
+ #include <celmath/perlin.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/image.cpp celestia-1.6.1/src/celengine/image.cpp
+--- celestia-1.6.1.orig/src/celengine/image.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/image.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -8,6 +8,7 @@
+ // of the License, or (at your option) any later version.
+
+ #include <fstream>
++#include <cstring>
+
+ #ifndef TARGET_OS_MAC
+ #define JPEG_SUPPORT
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/location.cpp celestia-1.6.1/src/celengine/location.cpp
+--- celestia-1.6.1.orig/src/celengine/location.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/location.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -7,6 +7,7 @@
+ // as published by the Free Software Foundation; either version 2
+ // of the License, or (at your option) any later version.
+
++#include <libintl.h>
+ #include <map>
+ #include <celengine/location.h>
+ #include <celengine/body.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/meshmanager.cpp celestia-1.6.1/src/celengine/meshmanager.cpp
+--- celestia-1.6.1.orig/src/celengine/meshmanager.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/meshmanager.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -13,6 +13,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <cassert>
++#include <libintl.h>
+
+ #include "celestia.h"
+ #include <celutil/debug.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/nebula.cpp celestia-1.6.1/src/celengine/nebula.cpp
+--- celestia-1.6.1.orig/src/celengine/nebula.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/nebula.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -8,7 +8,8 @@
+ // of the License, or (at your option) any later version.
+
+ #include <algorithm>
+-#include <stdio.h>
++#include <cstdio>
++#include <libintl.h>
+ #include "celestia.h"
+ #include <celmath/mathlib.h>
+ #include <celutil/util.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/opencluster.cpp celestia-1.6.1/src/celengine/opencluster.cpp
+--- celestia-1.6.1.orig/src/celengine/opencluster.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/opencluster.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -8,7 +8,8 @@
+ // of the License, or (at your option) any later version.
+
+ #include <algorithm>
+-#include <stdio.h>
++#include <cstdio>
++#include <libintl.h>
+ #include "celestia.h"
+ #include <celmath/mathlib.h>
+ #include <celutil/util.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/overlay.cpp celestia-1.6.1/src/celengine/overlay.cpp
+--- celestia-1.6.1.orig/src/celengine/overlay.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/overlay.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -10,6 +10,7 @@
+ #include <cstring>
+ #include <cstdarg>
+ #include <cstdio>
++#include <cstring>
+ #include <celutil/utf8.h>
+ #include "gl.h"
+ #include "vecgl.h"
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/solarsys.cpp celestia-1.6.1/src/celengine/solarsys.cpp
+--- celestia-1.6.1.orig/src/celengine/solarsys.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/solarsys.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -19,6 +19,7 @@
+ #endif /* ! TARGET_OS_MAC */
+ #endif /* ! _WIN32 */
+
++#include <libintl.h>
+ #include <celutil/debug.h>
+ #include <celmath/mathlib.h>
+ #include <celutil/util.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/stardb.cpp celestia-1.6.1/src/celengine/stardb.cpp
+--- celestia-1.6.1.orig/src/celengine/stardb.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/stardb.cpp 2015-07-10 19:59:04.243012354 +0200
+@@ -11,7 +11,9 @@
+ #include <cmath>
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ #include <cassert>
++#include <libintl.h>
+ #include <algorithm>
+ #include <celmath/mathlib.h>
+ #include <celmath/plane.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/texture.cpp celestia-1.6.1/src/celengine/texture.cpp
+--- celestia-1.6.1.orig/src/celengine/texture.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/texture.cpp 2015-07-10 19:59:04.246345706 +0200
+@@ -22,12 +22,14 @@
+ #endif
+
+ #include <cmath>
++#include <libintl.h>
+ #include <algorithm>
+ #include <iostream>
+ #include <fstream>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cassert>
++#include <cstring>
+
+ #ifndef _WIN32
+ #ifndef TARGET_OS_MAC
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/vertexprog.cpp celestia-1.6.1/src/celengine/vertexprog.cpp
+--- celestia-1.6.1.orig/src/celengine/vertexprog.cpp 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/vertexprog.cpp 2015-07-10 19:59:04.246345706 +0200
+@@ -7,6 +7,7 @@
+ // as published by the Free Software Foundation; either version 2
+ // of the License, or (at your option) any later version.
+
++#include <libintl.h>
+ #include <iostream>
+ #include <fstream>
+ #include <string>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/celestiacore.cpp celestia-1.6.1/src/celestia/celestiacore.cpp
+--- celestia-1.6.1.orig/src/celestia/celestiacore.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/celestiacore.cpp 2015-07-10 19:59:04.246345706 +0200
+@@ -23,6 +23,7 @@
+ #include <cstring>
+ #include <cassert>
+ #include <ctime>
++#include <libintl.h>
+ #include <celengine/gl.h>
+ #include <celmath/vecmath.h>
+ #include <celmath/quaternion.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/glutmain.cpp celestia-1.6.1/src/celestia/glutmain.cpp
+--- celestia-1.6.1.orig/src/celestia/glutmain.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/glutmain.cpp 2015-07-10 19:59:04.246345706 +0200
+@@ -15,6 +15,7 @@
+ #include <cstdlib>
+ #include <cctype>
+ #include <cstring>
++#include <libintl.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <celengine/gl.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/imagecapture.cpp celestia-1.6.1/src/celestia/imagecapture.cpp
+--- celestia-1.6.1.orig/src/celestia/imagecapture.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/imagecapture.cpp 2015-07-10 19:59:25.123132399 +0200
+@@ -28,6 +28,7 @@
+ #ifdef MACOSX
+ #include "../celestia/Celestia.app.skel/Contents/Frameworks/Headers/png.h"
+ #else
++#include <zlib.h>
+ #include "png.h"
+ #endif
+
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/kde/kdeapp.cpp celestia-1.6.1/src/celestia/kde/kdeapp.cpp
+--- celestia-1.6.1.orig/src/celestia/kde/kdeapp.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/kde/kdeapp.cpp 2015-07-10 19:59:04.246345706 +0200
+@@ -19,6 +19,7 @@
+ #include <libintl.h>
+ #include <fstream>
+ #include <sstream>
++#include <libintl.h>
+
+ #include <qpushbutton.h>
+ #include <qslider.h>
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.6.1/src/celestia/kde/kdeuniquecelestia.cpp
+--- celestia-1.6.1.orig/src/celestia/kde/kdeuniquecelestia.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/kde/kdeuniquecelestia.cpp 2015-07-10 19:59:04.249679059 +0200
+@@ -20,6 +20,7 @@
+ #include <qdir.h>
+ #include <string>
+ #include <vector>
++#include <libintl.h>
+ #include <klocale.h>
+ #include <libintl.h>
+
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/kde/selectionpopup.cpp celestia-1.6.1/src/celestia/kde/selectionpopup.cpp
+--- celestia-1.6.1.orig/src/celestia/kde/selectionpopup.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/kde/selectionpopup.cpp 2015-07-10 19:59:04.249679059 +0200
+@@ -20,6 +20,7 @@
+ #include <sstream>
+ #include <fstream>
+ #include <algorithm>
++#include <libintl.h>
+
+ #include "selectionpopup.h"
+
+diff -dur -x '*~' celestia-1.6.1.orig/src/celestia/oggtheoracapture.cpp celestia-1.6.1/src/celestia/oggtheoracapture.cpp
+--- celestia-1.6.1.orig/src/celestia/oggtheoracapture.cpp 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/oggtheoracapture.cpp 2015-07-10 19:59:04.249679059 +0200
+@@ -62,6 +62,9 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cmath>
++#include <cstring>
++#include <ctime>
++#include <libintl.h>
+ #include <celutil/debug.h>
+ #include <celutil/util.h>
+ #include "../celengine/gl.h"
+diff -dur -x '*~' celestia-1.6.1.orig/src/celmath/intersect.h celestia-1.6.1/src/celmath/intersect.h
+--- celestia-1.6.1.orig/src/celmath/intersect.h 2011-06-05 18:11:15.000000000 +0200
++++ celestia-1.6.1/src/celmath/intersect.h 2015-07-10 19:59:04.249679059 +0200
+@@ -12,6 +12,7 @@
+ #ifndef _CELMATH_INTERSECT_H_
+ #define _CELMATH_INTERSECT_H_
+
++#include "mathlib.h"
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"
+diff -dur -x '*~' celestia-1.6.1.orig/src/celutil/util.cpp celestia-1.6.1/src/celutil/util.cpp
+--- celestia-1.6.1.orig/src/celutil/util.cpp 2011-06-05 18:11:15.000000000 +0200
++++ celestia-1.6.1/src/celutil/util.cpp 2015-07-10 19:59:04.249679059 +0200
+@@ -12,6 +12,7 @@
+ #include "util.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <libintl.h>
+
+ using namespace std;
+
diff --git a/celestia-lua51.patch b/celestia-lua51.patch
deleted file mode 100644
index fade4ec..0000000
--- a/celestia-lua51.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in~ 2008-09-02 19:01:47.000000000 +0100
-+++ configure.in 2008-09-02 19:09:09.000000000 +0100
-@@ -399,7 +399,7 @@
-
- if (test "$enable_lua" != "no"); then
- LUA_VER=0
-- PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1.0, LUA_VER=0x050100,
-+ PKG_CHECK_MODULES(LUA, lua51 >= 5.1.0, LUA_VER=0x050100,
- [ PKG_CHECK_MODULES(LUA, lua >= 5.1.0, LUA_VER=0x050100,
- [ PKG_CHECK_MODULES(LUA, lua50 >= 5.0.0 lua50 < 5.1.0, LUA_VER=0x050000,
- [ PKG_CHECK_MODULES(LUA, lua >= 5.0.0 lua < 5.1.0, LUA_VER=0x050000, AC_MSG_RESULT([no])) ]
diff --git a/celestia-null.patch b/celestia-null.patch
new file mode 100644
index 0000000..500f2e1
--- /dev/null
+++ b/celestia-null.patch
@@ -0,0 +1,12 @@
+diff -dur -x '*~' celestia-1.6.1.orig/src/celengine/frametree.h celestia-1.6.1/src/celengine/frametree.h
+--- celestia-1.6.1.orig/src/celengine/frametree.h 2011-06-05 18:11:09.000000000 +0200
++++ celestia-1.6.1/src/celengine/frametree.h 2015-07-10 19:35:49.882049018 +0200
+@@ -49,7 +49,7 @@
+
+ bool isRoot() const
+ {
+- return bodyParent == NULL;
++ return bodyParent == 0;
+ }
+
+ bool updateRequired() const
diff --git a/gtk-enable-locales-early.patch b/gtk-enable-locales-early.patch
new file mode 100644
index 0000000..96bf7df
--- /dev/null
+++ b/gtk-enable-locales-early.patch
@@ -0,0 +1,37 @@
+diff -dur celestia-1.6.1.orig/src/celestia/gtk/main.cpp celestia-1.6.1/src/celestia/gtk/main.cpp
+--- celestia-1.6.1.orig/src/celestia/gtk/main.cpp 2011-06-05 18:11:10.000000000 +0200
++++ celestia-1.6.1/src/celestia/gtk/main.cpp 2015-07-10 18:51:53.261256046 +0200
+@@ -269,6 +269,16 @@
+ /* MAIN */
+ int main(int argc, char* argv[])
+ {
++ /* Force number displays into C locale. */
++ setlocale(LC_NUMERIC, "C");
++ setlocale(LC_ALL, "");
++
++ #ifndef WIN32
++ bindtextdomain(PACKAGE, LOCALEDIR);
++ bind_textdomain_codeset(PACKAGE, "UTF-8");
++ textdomain(PACKAGE);
++ #endif /* WIN32 */
++
+ /* Initialize the structure that holds the application's vitals. */
+ AppData* app = g_new0(AppData, 1);
+
+@@ -329,16 +339,6 @@
+
+ SetDebugVerbosity(0);
+
+- /* Force number displays into C locale. */
+- setlocale(LC_NUMERIC, "C");
+- setlocale(LC_ALL, "");
+-
+- #ifndef WIN32
+- bindtextdomain(PACKAGE, LOCALEDIR);
+- bind_textdomain_codeset(PACKAGE, "UTF-8");
+- textdomain(PACKAGE);
+- #endif /* WIN32 */
+-
+ app->core = new CelestiaCore();
+ if (app->core == NULL)
+ {
diff --git a/use-stdint_h.patch b/use-stdint_h.patch
new file mode 100644
index 0000000..919931e
--- /dev/null
+++ b/use-stdint_h.patch
@@ -0,0 +1,48 @@
+diff -dur -x '*~' celestia-1.6.1.orig/src/celutil/basictypes.h celestia-1.6.1/src/celutil/basictypes.h
+--- celestia-1.6.1.orig/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200
++++ celestia-1.6.1/src/celutil/basictypes.h 2015-07-10 19:09:08.546551326 +0200
+@@ -10,34 +10,19 @@
+ #ifndef _BASICTYPES_H_
+ #define _BASICTYPES_H_
+
++#include <stdint.h>
++
+ typedef unsigned int uint;
+
+ // Fixed size types
+-typedef int int32;
+-typedef unsigned int uint32;
+-typedef short int16;
+-typedef unsigned short uint16;
+-typedef char int8;
+-typedef unsigned char uint8;
+-
+-#ifdef _MSC_VER
+-// MS Visual C++ does not include stdint.h
+-typedef __int64 int64;
+-typedef unsigned __int64 uint64;
+-#define INT64_MAX LLONG_MAX
+-#define UINT64_MAX ULLONG_MAX
+-#else
+-#include <stdint.h>
+-#include <limits>
+-typedef int64_t int64;
+-typedef uint64_t uint64;
+-#define INT64_MAX 9223372036854775807LL
+-#ifndef UINT64_MAX
+-#define UINT64_MAX 0xffffffffffffffffULL
+-#endif
+-//#define INT64_MAX std::numeric_limits<int64_t>::max()
+-//#define UINT64_MAX std::numeric_limits<uint64_t>::max()
+-#endif
++typedef int32_t int32;
++typedef uint32_t uint32;
++typedef int16_t int16;
++typedef uint16_t uint16;
++typedef int8_t int8;
++typedef uint8_t uint8;
++typedef int64_t int64;
++typedef uint64_t uint64;
+
+ #endif // _BASICTYPES_H_
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/celestia.git/commitdiff/e11c2ee1536071f0c4e321323a3c897e498d6d50
More information about the pld-cvs-commit
mailing list