Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (15b1091a115516f92cf78b9e3f7039780eb6bdfc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (15b1091a115516f92cf78b9e3f7039780eb6bdfc)
  • Date: Fri, 11 Jul 2008 16:57:43 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

science/celestia/BUILD | 1
science/celestia/DEPENDS | 9 ++++++--
science/celestia/DETAILS | 6 ++---
science/celestia/HISTORY | 15 +++++++++++++
science/celestia/PRE_BUILD | 17 ---------------
science/celestia/celestia-1.4.1-gcc-4.1.patch | 28
--------------------------
science/celestia/celestia-1.5.1.tar.gz.sig |binary
science/celestia/gcc43.patch.bz2 |binary
science/stellarium/HISTORY | 5 ++++
science/stellarium/PRE_BUILD | 2 +
science/stellarium/gcc43.patch | 12 +++++++++++
11 files changed, 45 insertions(+), 50 deletions(-)

New commits:
commit 15b1091a115516f92cf78b9e3f7039780eb6bdfc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

stellarium: Fix compilation with gcc 4.3 from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=462702

commit 534f0b18b69120133e59cd9019b409ac1ef3138e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

celestia: Updated to 1.5.1, gcc 4.3 patch from
https://bugs.gentoo.org/show_bug.cgi?id=217758

diff --git a/science/celestia/BUILD b/science/celestia/BUILD
index b1a9735..c01f321 100755
--- a/science/celestia/BUILD
+++ b/science/celestia/BUILD
@@ -1,7 +1,6 @@
OPTS="$CELESTIA_XINERAMA \
$CELESTIA_FINAL \
--with-gconf-schema-file-dir=$INSTALL_ROOT/etc/gconf/schemas \
- --with-included-gettext \
--disable-debug \
$OPTS" &&
#
diff --git a/science/celestia/DEPENDS b/science/celestia/DEPENDS
index 81da9c4..9863a86 100755
--- a/science/celestia/DEPENDS
+++ b/science/celestia/DEPENDS
@@ -13,7 +13,7 @@ elif [ "$CELESTIA_UI" == "gtk+2" ]; then
depends gtkglext
elif [ "$CELESTIA_UI" == "gnome2" ]; then
depends atk &&
- depends cairo &&
+ depends cairo '--enable-cairo' &&
depends gconf2 &&
depends glib2 &&
depends gnome-keyring &&
@@ -40,4 +40,9 @@ fi
optional_depends lua \
'--with-lua' \
'--without-lua' \
- 'for Extension Language support'
+ 'for Extension Language support' &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support'
diff --git a/science/celestia/DETAILS b/science/celestia/DETAILS
index 66caee3..6c35ac4 100755
--- a/science/celestia/DETAILS
+++ b/science/celestia/DETAILS
@@ -1,13 +1,13 @@
SPELL=celestia
- VERSION=1.4.1
+ VERSION=1.5.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH[0]=sha512:82165e4488cb87cbd6d4813c1351ef2b26893e6e7a23bc24d2a668dbcbe18a3cbfda5dccd2a0bc1e3db5e4e0366c3f6618d750f962e2cfd0d41c105453e18465
+#
SOURCE_HASH[0]=sha512:82165e4488cb87cbd6d4813c1351ef2b26893e6e7a23bc24d2a668dbcbe18a3cbfda5dccd2a0bc1e3db5e4e0366c3f6618d750f962e2cfd0d41c105453e18465
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=GPL
WEB_SITE=http://www.shatters.net/celestia/
ENTERED=20030503
- UPDATED=20060429
SHORT="Real-time space simulation"
cat << EOF
Celestia is a free real-time space simulation that lets you experience
diff --git a/science/celestia/HISTORY b/science/celestia/HISTORY
index 1032b16..0b4c27d 100644
--- a/science/celestia/HISTORY
+++ b/science/celestia/HISTORY
@@ -1,3 +1,18 @@
+2008-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.5.1
+ Removed UPDATED
+ * DEPENDS: Optionally depend on gettext
+ libtheora support is currently broken
+ Pass --enable flags for cairo
+ * PRE_BUILD: CFLAGS are now proper and gcc 4.1 patch is
+ no longer needed
+ Apply gcc 4.3 patch
+ * BUILD: No longer accepts --with-included-gettext
+ * celestia-1.4.1-gcc-4.1.patch: Removed
+ * gcc43.patch.bz2: Added from
+ https://bugs.gentoo.org/show_bug.cgi?id=217758
+ Updated to celestia 1.5.1
+
2007-07-15 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
* BUILD: added --datarootdir & --datadir to OPTS to circument
a configure bug.
diff --git a/science/celestia/PRE_BUILD b/science/celestia/PRE_BUILD
index e68e1e4..7641546 100755
--- a/science/celestia/PRE_BUILD
+++ b/science/celestia/PRE_BUILD
@@ -1,19 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-#
-# Fix CFLAGS/CXXFLAGS
-#
-sedit "s:CFLAGS=\"-O2 -Wall -ffast-math
-fexpensive-optimizations:CFLAGS=\"$CFLAGS:" configure.in &&
-sedit "s:CXXFLAGS=\"-O2 -Wall -ffast-math
-fexpensive-optimizations:CXXFLAGS=\"$CXXFLAGS:" configure.in &&
-
-
-#
-# Remake ./configure with our changes
-#
-rm -f configure &&
-autoconf &&
-
-patch -p0 < ${SCRIPT_DIRECTORY}/celestia-1.4.1-gcc-4.1.patch
-
-
+bzcat $SCRIPT_DIRECTORY/gcc43.patch.bz2 | patch -p1
diff --git a/science/celestia/celestia-1.4.1-gcc-4.1.patch
b/science/celestia/celestia-1.4.1-gcc-4.1.patch
deleted file mode 100644
index 515b429..0000000
--- a/science/celestia/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/science/celestia/celestia-1.5.1.tar.gz.sig
b/science/celestia/celestia-1.5.1.tar.gz.sig
new file mode 100644
index 0000000..da9fcca
Binary files /dev/null and b/science/celestia/celestia-1.5.1.tar.gz.sig differ
diff --git a/science/celestia/gcc43.patch.bz2
b/science/celestia/gcc43.patch.bz2
new file mode 100644
index 0000000..1409f7e
Binary files /dev/null and b/science/celestia/gcc43.patch.bz2 differ
diff --git a/science/stellarium/HISTORY b/science/stellarium/HISTORY
index 84f4b50..6505b2a 100644
--- a/science/stellarium/HISTORY
+++ b/science/stellarium/HISTORY
@@ -1,3 +1,8 @@
+2008-07-11 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc 4.3 patch
+ * gcc43.patch: Patch to fix compilation with gcc 4.3 from
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=462702
+
2008-02-20 Dale E. Edmons <linuxfan AT sourcemage.org>
* DETAILS: Updated to 0.9.1: Website to www.stellarium.org.
Added sha512sum.
diff --git a/science/stellarium/PRE_BUILD b/science/stellarium/PRE_BUILD
new file mode 100755
index 0000000..9f68226
--- /dev/null
+++ b/science/stellarium/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch $SOURCE_DIRECTORY/src/StringArray.cpp $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/science/stellarium/gcc43.patch b/science/stellarium/gcc43.patch
new file mode 100644
index 0000000..e3b80b6
--- /dev/null
+++ b/science/stellarium/gcc43.patch
@@ -0,0 +1,12 @@
+Index: stellarium-0.9.1/src/StringArray.cpp
+===================================================================
+--- stellarium-0.9.1.orig/src/StringArray.cpp 2008-03-21 15:17:42.000000000
-0300
++++ stellarium-0.9.1/src/StringArray.cpp 2008-03-21 15:17:53.000000000
-0300
+@@ -22,6 +22,7 @@
+ #include <list>
+ #include <iostream>
+ #include <QFile>
++#include <cstdlib>
+
+ using namespace std;
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (15b1091a115516f92cf78b9e3f7039780eb6bdfc), Eric Sandall, 07/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page