[packages/celestia] - up to 1.6.2
mrozowik
mrozowik at pld-linux.org
Tue Aug 17 10:46:38 CEST 2021
commit e6b2369d9074520382df0633a6a281217376e8c3
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Tue Aug 17 08:45:53 2021 +0000
- up to 1.6.2
celestia-as-needed.patch | 59 ---------
celestia-desktop.patch | 33 ++---
celestia-gcc47.patch | 11 --
celestia-includes.patch | 280 -----------------------------------------
celestia.spec | 31 ++---
gtk-enable-locales-early.patch | 37 ------
use-stdint_h.patch | 48 -------
7 files changed, 19 insertions(+), 480 deletions(-)
---
diff --git a/celestia.spec b/celestia.spec
index f7432de..e3e06ce 100644
--- a/celestia.spec
+++ b/celestia.spec
@@ -12,22 +12,15 @@
Summary: A real-time visual space simulation
Summary(pl.UTF-8): Symulacja przestrzeni kosmicznej w czasie rzeczywistym
Name: celestia
-Version: 1.6.1
+Version: 1.6.2
Release: 1
License: GPL
Group: X11/Applications/Science
-Source0: http://downloads.sourceforge.net/celestia/%{name}-%{version}.tar.gz
-# 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/
+Source0: https://github.com/CelestiaProject/Celestia/archive/refs/tags/%{version}.tar.gz
+# Source0-md5: 604434b1d99b7ac1b51a4933c04a652b
+Patch0: %{name}-desktop.patch
+Patch1: %{name}-null.patch
+URL: https://celestia.space
BuildRequires: OpenGL-GLU-devel
%{?with_glut:BuildRequires: OpenGL-glut-devel >= 4.0}
BuildRequires: autoconf
@@ -46,7 +39,7 @@ BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
%{?with_theora:BuildRequires: libtheora-devel}
BuildRequires: libtool
-BuildRequires: lua51-devel
+BuildRequires: lua53-devel
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
# celestia < 1.4 original packages
@@ -98,17 +91,9 @@ spojrzenia na galaktyki do widoku kilkumetrowych statków kosmicznych.
Interfejs typu 'pokaż-i-leć' czyni nawigację przez Wszechświat prostą.
%prep
-%setup -q
+%setup -q -n Celestia-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%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
%{__gettextize}
diff --git a/celestia-as-needed.patch b/celestia-as-needed.patch
deleted file mode 100644
index be4cb4d..0000000
--- a/celestia-as-needed.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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) -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 c05d75e..f1187b4 100644
--- a/celestia-desktop.patch
+++ b/celestia-desktop.patch
@@ -1,26 +1,16 @@
-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
+--- Celestia-1.6.2/src/celestia/gtk/data/celestia.desktop~ 2020-11-06 23:34:57.000000000 +0000
++++ Celestia-1.6.2/src/celestia/gtk/data/celestia.desktop 2021-08-17 07:09:49.377162127 +0000
+@@ -9,5 +9,7 @@
+ Name=Celestia (Gtk+)
+ GenericName=Space Simulator
+ Comment=Explore the Universe in this detailed space simulation
+Comment[pl]=Symulacja przestrzeni kosmicznej w czasie rzeczywistym
StartupNotify=true
--Categories=Astronomy;Science;Application;
+-Categories=Astronomy;Education;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
+--- Celestia-1.6.2/src/celestia/kde/data/Makefile.am~ 2020-11-06 23:34:57.000000000 +0000
++++ Celestia-1.6.2/src/celestia/kde/data/Makefile.am 2021-08-17 07:12:45.142135370 +0000
@@ -14,7 +14,7 @@
mimedir = $(kde_mimedir)/application
mime_DATA = x-celestia-script.desktop
@@ -30,9 +20,8 @@ diff -dur -x '*~' -x '*.rej' -x '*.orig' celestia-1.6.1.orig/src/celestia/kde/da
apps_DATA = celestia.desktop
KDE_ICON = celestia
-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
+--- Celestia-1.6.2/src/celestia/kde/data/celestia.desktop~ 2020-11-06 23:34:57.000000000 +0000
++++ Celestia-1.6.2/src/celestia/kde/data/celestia.desktop 2021-08-17 07:15:26.860041315 +0000
@@ -1,8 +1,14 @@
[Desktop Entry]
+Encoding=UTF-8
diff --git a/celestia-gcc47.patch b/celestia-gcc47.patch
deleted file mode 100644
index 068933c..0000000
--- a/celestia-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index e14e869..0000000
--- a/celestia-includes.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-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/gtk-enable-locales-early.patch b/gtk-enable-locales-early.patch
deleted file mode 100644
index 96bf7df..0000000
--- a/gtk-enable-locales-early.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
deleted file mode 100644
index 919931e..0000000
--- a/use-stdint_h.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/e6b2369d9074520382df0633a6a281217376e8c3
More information about the pld-cvs-commit
mailing list