diff options
Diffstat (limited to 'sci-astronomy/celestia/files')
9 files changed, 30 insertions, 397 deletions
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch b/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch deleted file mode 100644 index d7287c69680f..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-3dsmodels.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- models/Makefile.am 2006-02-02 04:12:26.000000000 +0000 -+++ models/Makefile.am.new 2007-02-12 14:20:19.000000000 +0000 -@@ -3,8 +3,8 @@ - pkgdata_DATA = \ - $(wildcard *.cms) \ - $(wildcard *.cmod) \ -- $(wildcard *.pts) -+ $(wildcard *.pts) \ -+ $(wildcard *.3ds) - - EXTRA_DIST = \ -- $(pkgdata_DATA) \ -- $(wildcard *.3ds) -+ $(pkgdata_DATA) diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-gcc-4.1.patch b/sci-astronomy/celestia/files/celestia-1.4.1-gcc-4.1.patch deleted file mode 100644 index 515b429fc2f1..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-gcc-4.1.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/celengine/star.h.old 2006-03-06 20:29:28.000000000 -0600 -+++ src/celengine/star.h 2006-03-06 20:30:26.000000000 -0600 -@@ -30,7 +30,7 @@ class StarDetails - // orbits and StarDetails objects. Currently, it's assumed that they - // have lifetimes that continue until program termination. - public: -- StarDetails::StarDetails(); -+ StarDetails(); - - inline float getRadius() const; - inline float getTemperature() const; ---- src/celengine/command.h.old 2006-03-06 20:29:47.000000000 -0600 -+++ src/celengine/command.h 2006-03-06 20:30:35.000000000 -0600 -@@ -94,10 +94,10 @@ class CommandGoto : public Instantaneous - class CommandGotoLongLat : public InstantaneousCommand - { - public: -- CommandGotoLongLat::CommandGotoLongLat(double t, -- double dist, -- float _longitude, float _latitude, -- Vec3f _up); -+ CommandGotoLongLat(double t, -+ double dist, -+ float _longitude, float _latitude, -+ Vec3f _up); - ~CommandGotoLongLat(); - void process(ExecutionEnvironment&); - diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-gnome-desktop.patch b/sci-astronomy/celestia/files/celestia-1.4.1-gnome-desktop.patch deleted file mode 100644 index 87cfbc927489..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-gnome-desktop.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/celestia/gtk/data/celestia.desktop~ 2007-08-25 17:45:09.000000000 +0200 -+++ src/celestia/gtk/data/celestia.desktop 2007-08-25 17:45:09.000000000 +0200 -@@ -1,12 +1,11 @@ - [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=Space 3D Simulator -+Comment[es]=Simulador 3D del Espacio - StartupNotify=true --Categories=Astronomy;Science;Application; -+Categories=Education;Science;Astronomy; diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch b/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch deleted file mode 100644 index 415c3a982cc6..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-kde-datadir.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nur ../celestia-1.4.1.orig/Makefile.am ./Makefile.am ---- ../celestia-1.4.1.orig/Makefile.am 2006-02-03 18:04:33.000000000 +0000 -+++ ./Makefile.am 2007-02-12 19:49:21.000000000 +0000 -@@ -66,11 +65,11 @@ - ) - - install-data-hook: -- if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ -- mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \ -- rmdir $(kde_datadir)/@PACKAGE@ ; \ -+ if [ -n "$(kde_datadir)" -a "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ -+ mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \ -+ rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \ - fi -- if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ -- ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \ -+ if [ -n "$(kde_datadir)" -a "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \ -+ ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \ - fi - -diff -Nur ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am ./src/celestia/kde/data/Makefile.am ---- ../celestia-1.4.1.orig/src/celestia/kde/data/Makefile.am 2006-01-07 11:15:48.000000000 +0000 -+++ ./src/celestia/kde/data/Makefile.am 2007-02-12 19:26:45.000000000 +0000 -@@ -14,7 +14,7 @@ - mimedir = $(kde_mimedir)/application - mime_DATA = x-celestia-script.desktop - --appsdir = $(kde_appsdir)/Edutainment/Science -+appsdir = $(datadir)/applications/kde - apps_DATA = celestia.desktop - - KDE_ICON = celestia diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-kde-desktop.patch b/sci-astronomy/celestia/files/celestia-1.4.1-kde-desktop.patch deleted file mode 100644 index 59fb10425e48..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-kde-desktop.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/celestia/kde/data/celestia.desktop.orig 2007-03-07 19:34:36.000000000 +0000 -+++ src/celestia/kde/data/celestia.desktop 2007-03-07 19:46:41.000000000 +0000 -@@ -1,8 +1,10 @@ - [Desktop Entry] -+Encoding=UTF-8 - Name=Celestia --Comment=Celestia -+Comment=Space 3D Simulator - Exec=celestia %f - Terminal=false - Icon=celestia.png - MimeType=application/x-celestia-script - Type=Application -+Categories=Qt;KDE;Science; diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch b/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch deleted file mode 100644 index f2340dd2ce72..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-locale.patch +++ /dev/null @@ -1,203 +0,0 @@ ---- po/Makefile.in.in 2005-07-19 21:18:52.000000000 +0100 -+++ po/Makefile.in.in.new 2007-02-12 17:51:55.000000000 +0000 -@@ -1,5 +1,5 @@ - # Makefile for PO directory in any package using GNU gettext. --# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu> - # - # This file can be copied and used freely without restrictions. It can - # be used in projects which are not available under the GNU General Public -@@ -8,10 +8,11 @@ - # Please note that the actual code of GNU gettext is covered by the GNU - # General Public License and is *not* in the public domain. - # --# Origin: gettext-0.14 -+# Origin: gettext-0.15 - - PACKAGE = @PACKAGE@ - VERSION = @VERSION@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - - SHELL = /bin/sh - @SET_MAKE@ -@@ -22,18 +23,28 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+datarootdir = @datarootdir@ - datadir = @datadir@ - localedir = $(datadir)/locale - gettextsrcdir = $(datadir)/gettext/po - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+mkinstalldirs = $(SHELL) @install_sh@ -d -+mkdir_p = @mkdir_p@ - --GMSGFMT = @GMSGFMT@ --MSGFMT = @MSGFMT@ --XGETTEXT = @XGETTEXT@ -+GMSGFMT_ = @GMSGFMT@ -+GMSGFMT_no = @GMSGFMT@ -+GMSGFMT_yes = @GMSGFMT_015@ -+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) -+MSGFMT_ = @MSGFMT@ -+MSGFMT_no = @MSGFMT@ -+MSGFMT_yes = @MSGFMT_015@ -+MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) -+XGETTEXT_ = @XGETTEXT@ -+XGETTEXT_no = @XGETTEXT@ -+XGETTEXT_yes = @XGETTEXT_015@ -+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) - MSGMERGE = msgmerge - MSGMERGE_UPDATE = @MSGMERGE@ --update - MSGINIT = msginit -@@ -46,7 +57,7 @@ - DUMMYPOFILES = @DUMMYPOFILES@ - DISTFILES.common = Makefile.in.in remove-potcdate.sin \ - $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) --DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ -+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ - $(POFILES) $(GMOFILES) \ - $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) - -@@ -79,6 +90,12 @@ - all-yes: stamp-po - all-no: - -+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no -+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because -+# we don't want to bother translators with empty POT files). We assume that -+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -+# In this case, stamp-po is a nop (i.e. a phony target). -+ - # stamp-po is a timestamp denoting the last time at which the CATALOGS have - # been loosely updated. Its purpose is that when a developer or translator - # checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -@@ -88,10 +105,13 @@ - # $(POFILES) has been designed to not touch files that don't need to be - # changed. - stamp-po: $(srcdir)/$(DOMAIN).pot -- test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) -- @echo "touch stamp-po" -- @echo timestamp > stamp-poT -- @mv stamp-poT stamp-po -+ test ! -f $(srcdir)/$(DOMAIN).pot || \ -+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) -+ @test ! -f $(srcdir)/$(DOMAIN).pot || { \ -+ echo "touch stamp-po" && \ -+ echo timestamp > stamp-poT && \ -+ mv stamp-poT stamp-po; \ -+ } - - # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', - # otherwise packages like GCC can not be built if only parts of the source -@@ -100,11 +120,16 @@ - # This target rebuilds $(DOMAIN).pot; it is an expensive operation. - # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. - $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed -+ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ -+ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ -+ else \ -+ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ -+ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ -- --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' -+ --msgid-bugs-address="$$msgid_bugs_address" - test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ -@@ -143,7 +168,7 @@ - install-exec: - install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ -@@ -156,13 +181,13 @@ - fi - install-data-no: all - install-data-yes: all -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -@@ -202,19 +227,19 @@ - installdirs-exec: - installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi - installdirs-data-no: - installdirs-data-yes: -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -@@ -289,11 +314,14 @@ - $(MAKE) update-po - @$(MAKE) dist2 - # This is a separate target because 'update-po' must be executed before. --dist2: $(DISTFILES) -+dist2: stamp-po $(DISTFILES) - dists="$(DISTFILES)"; \ - if test "$(PACKAGE)" = "gettext-tools"; then \ - dists="$$dists Makevars.template"; \ - fi; \ -+ if test -f $(srcdir)/$(DOMAIN).pot; then \ -+ dists="$$dists $(DOMAIN).pot stamp-po"; \ -+ fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ -@@ -305,9 +333,9 @@ - if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ - for file in $$dists; do \ - if test -f $$file; then \ -- cp -p $$file $(distdir); \ -+ cp -p $$file $(distdir) || exit 1; \ - else \ -- cp -p $(srcdir)/$$file $(distdir); \ -+ cp -p $(srcdir)/$$file $(distdir) || exit 1; \ - fi; \ - done - -@@ -354,10 +382,9 @@ - update-gmo: Makefile $(GMOFILES) - @: - --Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ -+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ - cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ -- $(SHELL) ./config.status -+ && $(SHELL) ./config.status $(subdir)/$@.in po-directories - - force: - diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch b/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch deleted file mode 100644 index e3933a0d6c7f..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-lua51.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Nur ../celestia-1.4.1/configure.in ./configure.in ---- ../celestia-1.4.1/configure.in 2006-02-03 18:09:54.000000000 +0000 -+++ ./configure.in 2007-02-12 16:27:42.000000000 +0000 -@@ -383,7 +383,7 @@ - AC_MSG_CHECKING([whether to enable Celestia Extension Language]) - if (test "$enable_lua" != "no"); then - CXXFLAGS="$CXXFLAGS -DCELX" -- LDFLAGS="$LDFLAGS -llualib -llua" -+ LDFLAGS="$LDFLAGS -llua" - - if (test "$lua_includes" != "no"); then - CXXFLAGS="$CXXFLAGS -I$lua_includes" -diff -Nur ../celestia-1.4.1/src/celestia/celx.cpp ./src/celestia/celx.cpp ---- ../celestia-1.4.1/src/celestia/celx.cpp 2006-01-07 00:01:51.000000000 +0000 -+++ ./src/celestia/celx.cpp 2007-02-12 16:27:42.000000000 +0000 -@@ -32,9 +32,7 @@ - - #include "celx.h" - #include "celestiacore.h" --extern "C" { --#include "lualib.h" --} -+#include "lua.hpp" - - using namespace std; - -@@ -532,6 +530,8 @@ - - status = lua_resume(co, narg); - if (status == 0) -+ return 0; -+ else if (status == LUA_YIELD) - { - int nres = lua_gettop(co); - #if 0 -@@ -543,7 +543,7 @@ - } - else - { -- lua_xmove(co, L, 1); // move error message -+ lua_xmove(co, L, -1); // move error message - return -1; // error flag - } - } -@@ -598,7 +598,7 @@ - int stackTop = lua_gettop(costate); - if (strcmp(c_p, "y") == 0) - { -- lua_iolibopen(costate); -+ luaL_openlibs(costate); - ioMode = IOAllowed; - } - else -@@ -713,7 +713,8 @@ - // no other errors, and execution terminates normally. There - // should be a better way to figure out whether the script ended - // normally . . . -- if (strcmp(errorMessage, "cannot resume dead coroutine") != 0) -+ if (errorMessage -+ && strcmp(errorMessage, "cannot resume dead coroutine") != 0) - { - cout << "Error: " << errorMessage << '\n'; - CelestiaCore* appCore = getAppCore(co); -@@ -4577,10 +4578,7 @@ - initMaps(); - - // Import the base and math libraries -- lua_baselibopen(state); -- lua_mathlibopen(state); -- lua_tablibopen(state); -- lua_strlibopen(state); -+ luaL_openlibs(state); - - // Add an easy to use wait function, so that script writers can - // live in ignorance of coroutines. There will probably be a significant diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch b/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch deleted file mode 100644 index 3ff59b31686a..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.4.1-strictalias.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- celestia-1.4.1/src/celengine/modelfile.cpp.strictalias 2006-11-22 14:04:15.000000000 +0100 -+++ celestia-1.4.1/src/celengine/modelfile.cpp 2006-11-22 14:01:27.000000000 +0100 -@@ -1080,7 +1080,9 @@ - static float readFloat(istream& in) - { - int i = readUint(in); -- return *((float*) &i); -+ float f; -+ memcpy(&f, &i, sizeof(float)); -+ return f; - } - - diff --git a/sci-astronomy/celestia/files/celestia-1.5.1-gcc44.patch b/sci-astronomy/celestia/files/celestia-1.5.1-gcc44.patch new file mode 100644 index 000000000000..6f484484f777 --- /dev/null +++ b/sci-astronomy/celestia/files/celestia-1.5.1-gcc44.patch @@ -0,0 +1,30 @@ +diff -NrU5 celestia-1.5.1.orig/src/celengine/overlay.h celestia-1.5.1/src/celengine/overlay.h +--- celestia-1.5.1.orig/src/celengine/overlay.h 2009-05-17 15:01:34.000000000 -0600 ++++ celestia-1.5.1/src/celengine/overlay.h 2009-05-17 15:02:56.000000000 -0600 +@@ -9,10 +9,11 @@ + + #ifndef _OVERLAY_H_ + #define _OVERLAY_H_ + + #include <string> ++#include <cstdio> + #include <iostream> + #include <celtxf/texturefont.h> + + + class Overlay; +diff -NrU5 celestia-1.5.1.orig/src/celengine/star.cpp celestia-1.5.1/src/celengine/star.cpp +--- celestia-1.5.1.orig/src/celengine/star.cpp 2009-05-17 15:01:34.000000000 -0600 ++++ celestia-1.5.1/src/celengine/star.cpp 2009-05-17 15:03:43.000000000 -0600 +@@ -7,10 +7,11 @@ + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + + #include <celmath/mathlib.h> + #include <cstring> ++#include <cstdio> + #include <cassert> + #include "celestia.h" + #include "astro.h" + #include "orbit.h" + #include "star.h" |