Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f9f6c12a97d8b7f33ff5c7a340ee5026ba8f7222
commit f9f6c12a97d8b7f33ff5c7a340ee5026ba8f7222 Author: Priyank <priy...@frugalware.org> Date: Fri Jul 24 21:16:50 2009 +0530 celestia-1.6.0-1-i686 * Version bump * updated celestia-1.5.1-gcc43.patch * new patch celestia-1.6.0-gcc44.patch to fix build with gcc44 diff --git a/source/gnome-extra/celestia/FrugalBuild b/source/gnome-extra/celestia/FrugalBuild index 7655252..6ab1010 100644 --- a/source/gnome-extra/celestia/FrugalBuild +++ b/source/gnome-extra/celestia/FrugalBuild @@ -1,23 +1,25 @@ -# Compiling Time: 0.22 SBU +# Compiling Time: 0.60 SBU # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=celestia -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=1 pkgdesc="A real-time space simulation that lets you experience our universe in 3D" +_F_sourceforge_mirror=kent Finclude sourceforge url="http://celestia.org"; -depends=('gtk+2>=2.14.7' 'gtkglext' 'libgnome>=2.24.1' 'libtheora' \ - 'libgnomeui>=2.24.0' 'gconf>=2.24.0' 'libpng' 'libjpeg') +depends=('gtk+2>=2.16.5' 'gtkglext' 'libgnome>=2.26.0' 'libtheora' \ + 'libgnomeui>=2.24.1' 'gconf>=2.26.2' 'libpng' 'libjpeg') groups=('gnome-extra') archs=('i686') _F_gnome_schemas=('/etc/gconf/schemas/celestia.schemas') Finclude gnome-scriptlet -source=(${source/Celestia-linux/celestia} $pkgname-$pkgver-gcc43.patch \ - $pkgname-$pkgver-gnome-desktop.patch) +source=(${source/Celestia-linux/celestia} $pkgname-1.5.1-gcc43.patch \ + $pkgname-1.5.1-gnome-desktop.patch $pkgname-$pkgver-gcc44.patch) Fconfopts="${fconfop...@]} --with-gnome --enable-threading" -sha1sums=('2d6a117daf6a400ab4c47a5a51c13f2ab601e6db' \ - '3cdb190517273cc0321ed78061c6707a42db443a' \ - '797ab4e29a6cd22f8c000874a454b6528149b860') +sha1sums=('72aa9cc2ef0ee1e4d73ed63ca2638a1ed8af9566' \ + '2826a8644dfd61e774f7fc8bcac726961216c79f' \ + '797ab4e29a6cd22f8c000874a454b6528149b860' \ + 'f85bc409498ae7841b555ef2ecb457fd2a22df3a') # optimization OK diff --git a/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch b/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch index 4849f37..8d7c263 100644 --- a/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch +++ b/source/gnome-extra/celestia/celestia-1.5.1-gcc43.patch @@ -60,17 +60,7 @@ diff -Naur celestia-1.5.1/src/celengine/cmdparser.cpp celestia-1.5.1.new/src/cel using namespace std; -diff -Naur celestia-1.5.1/src/celengine/console.cpp celestia-1.5.1.new/src/celengine/console.cpp ---- celestia-1.5.1/src/celengine/console.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/console.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celengine/dds.cpp celestia-1.5.1.new/src/celengine/dds.cpp --- celestia-1.5.1/src/celengine/dds.cpp 2008-04-23 17:17:16.000000000 -0400 +++ celestia-1.5.1.new/src/celengine/dds.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -260,17 +250,7 @@ diff -Naur celestia-1.5.1/src/celengine/parseobject.cpp celestia-1.5.1.new/src/c using namespace std; -diff -Naur celestia-1.5.1/src/celengine/render.cpp celestia-1.5.1.new/src/celengine/render.cpp ---- celestia-1.5.1/src/celengine/render.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/render.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -11,6 +11,7 @@ - #include <cstdio> - #include <cstring> - #include <cassert> -+#include <libintl.h> - - #ifndef _WIN32 - #ifndef TARGET_OS_MAC + diff -Naur celestia-1.5.1/src/celengine/rotationmanager.cpp celestia-1.5.1.new/src/celengine/rotationmanager.cpp --- celestia-1.5.1/src/celengine/rotationmanager.cpp 2008-04-23 17:17:16.000000000 -0400 +++ celestia-1.5.1.new/src/celengine/rotationmanager.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -282,17 +262,7 @@ diff -Naur celestia-1.5.1/src/celengine/rotationmanager.cpp celestia-1.5.1.new/s using namespace std; -diff -Naur celestia-1.5.1/src/celengine/selection.cpp celestia-1.5.1.new/src/celengine/selection.cpp ---- celestia-1.5.1/src/celengine/selection.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/selection.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celengine/shadermanager.cpp celestia-1.5.1.new/src/celengine/shadermanager.cpp --- celestia-1.5.1/src/celengine/shadermanager.cpp 2008-04-23 17:17:16.000000000 -0400 +++ celestia-1.5.1.new/src/celengine/shadermanager.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -315,17 +285,7 @@ diff -Naur celestia-1.5.1/src/celengine/simulation.cpp celestia-1.5.1.new/src/ce #include "simulation.h" using namespace std; -diff -Naur celestia-1.5.1/src/celengine/solarsys.cpp celestia-1.5.1.new/src/celengine/solarsys.cpp ---- celestia-1.5.1/src/celengine/solarsys.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/solarsys.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -30,6 +30,7 @@ - #include "universe.h" - #include "multitexture.h" - #include "parseobject.h" -+#include <libintl.h> - - using namespace std; - + diff -Naur celestia-1.5.1/src/celengine/solarsysxml.cpp celestia-1.5.1.new/src/celengine/solarsysxml.cpp --- celestia-1.5.1/src/celengine/solarsysxml.cpp 2008-04-23 17:17:16.000000000 -0400 +++ celestia-1.5.1.new/src/celengine/solarsysxml.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -346,28 +306,7 @@ diff -Naur celestia-1.5.1/src/celengine/solarsysxml.cpp celestia-1.5.1.new/src/c using namespace std; -diff -Naur celestia-1.5.1/src/celengine/spiceinterface.cpp celestia-1.5.1.new/src/celengine/spiceinterface.cpp ---- celestia-1.5.1/src/celengine/spiceinterface.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/spiceinterface.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -11,6 +11,7 @@ - - #include "SpiceUsr.h" - #include "spiceinterface.h" -+#include <libintl.h> - - - bool -diff -Naur celestia-1.5.1/src/celengine/spiceorbit.cpp celestia-1.5.1.new/src/celengine/spiceorbit.cpp ---- celestia-1.5.1/src/celengine/spiceorbit.cpp 2008-04-23 17:17:16.000000000 -0400 -+++ celestia-1.5.1.new/src/celengine/spiceorbit.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -14,6 +14,7 @@ - #include "SpiceUsr.h" - #include "astro.h" - #include "spiceorbit.h" -+#include <libintl.h> - - using namespace std; - + diff -Naur celestia-1.5.1/src/celengine/stardb.cpp celestia-1.5.1.new/src/celengine/stardb.cpp --- celestia-1.5.1/src/celengine/stardb.cpp 2008-04-23 17:17:16.000000000 -0400 +++ celestia-1.5.1.new/src/celengine/stardb.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -475,19 +414,7 @@ diff -Naur celestia-1.5.1/src/celestia/celestiacore.cpp celestia-1.5.1.new/src/c #ifdef CELX #include <celengine/scriptobject.h> -diff -Naur celestia-1.5.1/src/celestia/celx.cpp celestia-1.5.1.new/src/celestia/celx.cpp ---- celestia-1.5.1/src/celestia/celx.cpp 2008-04-23 17:17:06.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/celx.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -11,7 +11,9 @@ - - #include <cassert> - #include <cstring> -+#include <cstring> - #include <cstdio> -+#include <libintl.h> - #include <map> - #include <celengine/astro.h> - #include <celengine/celestia.h> + diff -Naur celestia-1.5.1/src/celestia/configfile.cpp celestia-1.5.1.new/src/celestia/configfile.cpp --- celestia-1.5.1/src/celestia/configfile.cpp 2008-04-23 17:17:06.000000000 -0400 +++ celestia-1.5.1.new/src/celestia/configfile.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -785,28 +712,7 @@ diff -Naur celestia-1.5.1/src/celestia/kde/kdepreferencesdialog.cpp celestia-1.5 static uint32 FilterOtherLocations = ~(Location::City | Location::Observatory | -diff -Naur celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp celestia-1.5.1.new/src/celestia/kde/kdeuniquecelestia.cpp ---- celestia-1.5.1/src/celestia/kde/kdeuniquecelestia.cpp 2008-04-23 17:17:05.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/kde/kdeuniquecelestia.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -21,6 +21,7 @@ - #include <string> - #include <vector> - #include <klocale.h> -+#include <libintl.h> - - KdeUniqueCelestia::KdeUniqueCelestia() { - -diff -Naur celestia-1.5.1/src/celestia/kde/selectionpopup.cpp celestia-1.5.1.new/src/celestia/kde/selectionpopup.cpp ---- celestia-1.5.1/src/celestia/kde/selectionpopup.cpp 2008-04-23 17:17:05.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/kde/selectionpopup.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celestia/kde/videocapturedlg.cpp celestia-1.5.1.new/src/celestia/kde/videocapturedlg.cpp --- celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp 2008-04-23 17:17:05.000000000 -0400 +++ celestia-1.5.1.new/src/celestia/kde/videocapturedlg.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -818,28 +724,7 @@ diff -Naur celestia-1.5.1/src/celestia/kde/videocapturedlg.cpp celestia-1.5.1.ne VideoCaptureDlg::VideoCaptureDlg(QWidget* p, const QString &dir): accepted(false) -diff -Naur celestia-1.5.1/src/celestia/oggtheoracapture.cpp celestia-1.5.1.new/src/celestia/oggtheoracapture.cpp ---- celestia-1.5.1/src/celestia/oggtheoracapture.cpp 2008-04-23 17:17:06.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/oggtheoracapture.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -62,15 +62,18 @@ - #include <cstdlib> - #include <cstdio> - #include <cmath> -+#include <ctime> - #include <celutil/debug.h> - #include <celutil/util.h> - #include "../celengine/gl.h" - #include <string> -+#include <cstring> - #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.1/src/celestia/scriptmenu.cpp celestia-1.5.1.new/src/celestia/scriptmenu.cpp --- celestia-1.5.1/src/celestia/scriptmenu.cpp 2008-04-23 17:17:06.000000000 -0400 +++ celestia-1.5.1.new/src/celestia/scriptmenu.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -851,22 +736,7 @@ diff -Naur celestia-1.5.1/src/celestia/scriptmenu.cpp celestia-1.5.1.new/src/cel using namespace std; -diff -Naur celestia-1.5.1/src/celestia/url.cpp celestia-1.5.1.new/src/celestia/url.cpp ---- celestia-1.5.1/src/celestia/url.cpp 2008-04-23 17:17:06.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/url.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -16,10 +16,12 @@ - ***************************************************************************/ - - #include <string> -+#include <cstring> - #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.1/src/celestia/wglext.cpp celestia-1.5.1.new/src/celestia/wglext.cpp --- celestia-1.5.1/src/celestia/wglext.cpp 2008-04-23 17:17:06.000000000 -0400 +++ celestia-1.5.1.new/src/celestia/wglext.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -957,17 +827,7 @@ diff -Naur celestia-1.5.1/src/celestia/winmain.cpp celestia-1.5.1.new/src/celest using namespace std; -diff -Naur celestia-1.5.1/src/celestia/winsplash.cpp celestia-1.5.1.new/src/celestia/winsplash.cpp ---- celestia-1.5.1/src/celestia/winsplash.cpp 2008-04-23 17:17:06.000000000 -0400 -+++ celestia-1.5.1.new/src/celestia/winsplash.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -16,6 +16,7 @@ - #include "res/resource.h" - #include "celutil/util.h" - #include <iostream> -+#include <libintl.h> - #include <locale.h> - - using namespace std; + diff -Naur celestia-1.5.1/src/celestia/winstarbrowser.cpp celestia-1.5.1.new/src/celestia/winstarbrowser.cpp --- celestia-1.5.1/src/celestia/winstarbrowser.cpp 2008-04-23 17:17:06.000000000 -0400 +++ celestia-1.5.1.new/src/celestia/winstarbrowser.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -1050,31 +910,7 @@ diff -Naur celestia-1.5.1/src/celutil/filetype.cpp celestia-1.5.1.new/src/celuti using namespace std; -diff -Naur celestia-1.5.1/src/celutil/formatnum.cpp celestia-1.5.1.new/src/celutil/formatnum.cpp ---- celestia-1.5.1/src/celutil/formatnum.cpp 2008-04-23 17:17:19.000000000 -0400 -+++ celestia-1.5.1.new/src/celutil/formatnum.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celutil/utf8.cpp celestia-1.5.1.new/src/celutil/utf8.cpp ---- celestia-1.5.1/src/celutil/utf8.cpp 2008-04-23 17:17:19.000000000 -0400 -+++ celestia-1.5.1.new/src/celutil/utf8.cpp 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celutil/util.cpp celestia-1.5.1.new/src/celutil/util.cpp --- celestia-1.5.1/src/celutil/util.cpp 2008-04-23 17:17:19.000000000 -0400 +++ celestia-1.5.1.new/src/celutil/util.cpp 2008-06-24 09:09:16.000000000 -0400 @@ -1086,23 +922,6 @@ diff -Naur celestia-1.5.1/src/celutil/util.cpp celestia-1.5.1.new/src/celutil/ut using namespace std; -diff -Naur celestia-1.5.1/src/celutil/util.h celestia-1.5.1.new/src/celutil/util.h ---- celestia-1.5.1/src/celutil/util.h 2008-04-23 17:17:19.000000000 -0400 -+++ celestia-1.5.1.new/src/celutil/util.h 2008-06-24 09:09:16.000000000 -0400 -@@ -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.1/src/celutil/windirectory.cpp celestia-1.5.1.new/src/celutil/windirectory.cpp --- celestia-1.5.1/src/celutil/windirectory.cpp 2008-04-23 17:17:19.000000000 -0400 +++ celestia-1.5.1.new/src/celutil/windirectory.cpp 2008-06-24 09:09:16.000000000 -0400 diff --git a/source/gnome-extra/celestia/celestia-1.6.0-gcc44.patch b/source/gnome-extra/celestia/celestia-1.6.0-gcc44.patch new file mode 100644 index 0000000..b566ce2 --- /dev/null +++ b/source/gnome-extra/celestia/celestia-1.6.0-gcc44.patch @@ -0,0 +1,22 @@ +diff -Naur celestia-1.6.0/src/celengine/overlay.h celestia-1.6.0.new/src/celengine/overlay.h +--- celestia-1.6.0/src/celengine/overlay.h 2009-06-22 21:14:08.000000000 +0530 ++++ celestia-1.6.0.new/src/celengine/overlay.h 2009-07-24 20:45:45.000000000 +0530 +@@ -10,6 +10,7 @@ + #ifndef _OVERLAY_H_ + #define _OVERLAY_H_ + ++#include <stdio.h> + #include <string> + #include <iostream> + #include <celtxf/texturefont.h> +diff -Naur celestia-1.6.0/src/celengine/star.cpp celestia-1.6.0.new/src/celengine/star.cpp +--- celestia-1.6.0/src/celengine/star.cpp 2009-06-22 21:14:08.000000000 +0530 ++++ celestia-1.6.0.new/src/celengine/star.cpp 2009-07-24 20:55:15.000000000 +0530 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include <celmath/mathlib.h> ++#include <cstdio> + #include <cstring> + #include <cassert> + #include "celestia.h" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
