Hello community,
here is the log from the commit of package celestia
checked in at Tue Nov 6 22:08:52 CET 2007.
--------
--- celestia/celestia.changes 2007-10-25 07:18:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/celestia/celestia.changes 2007-11-06 19:00:40.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 6 19:00:30 CET 2007 - dmueller@suse.de
+
+- really fix build with gcc 4.3
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ celestia.spec ++++++
--- /var/tmp/diff_new_pack.Bd1768/_old 2007-11-06 22:08:15.000000000 +0100
+++ /var/tmp/diff_new_pack.Bd1768/_new 2007-11-06 22:08:15.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: kdelibs3-devel popt-devel
Summary: OpenGL Space Simulator
Version: 1.4.1
-Release: 4
+Release: 11
License: GPL v2 or later
Group: Productivity/Scientific/Astronomy
Url: http://celestia.sourceforge.net
@@ -91,6 +91,8 @@
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 06 2007 - dmueller@suse.de
+- really fix build with gcc 4.3
* Thu Oct 25 2007 - stbinner@suse.de
- fix build with gcc 4.3
* Mon Oct 22 2007 - stbinner@suse.de
++++++ celestia-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.Bd1768/_old 2007-11-06 22:08:20.000000000 +0100
+++ /var/tmp/diff_new_pack.Bd1768/_new 2007-11-06 22:08:20.000000000 +0100
@@ -1,5 +1,5 @@
---- src/celutil/formatnum.cpp 2007/10/25 04:50:44 1.1
-+++ src/celutil/formatnum.cpp 2007/10/25 04:51:01
+--- src/celutil/formatnum.cpp
++++ src/celutil/formatnum.cpp
@@ -7,6 +7,8 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
@@ -9,8 +9,8 @@
#include <cmath>
#include <cstdio>
#include <string>
---- ./src/celengine/console.cpp 2007/10/25 08:28:53 1.1
-+++ ./src/celengine/console.cpp 2007/10/25 08:29:01
+--- ./src/celengine/console.cpp
++++ ./src/celengine/console.cpp
@@ -10,6 +10,7 @@
#include <cstdarg>
#include <cstdio>
@@ -19,74 +19,103 @@
#include "celutil/utf8.h"
#include "gl.h"
#include "vecgl.h"
---- src/celengine/body.cpp 2007/10/25 08:30:11 1.1
-+++ src/celengine/body.cpp 2007/10/25 08:30:22
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <cstdlib>
-+#include
- // Missing from g++ . . . why???
- // #include <limits>
- #include <cassert>
---- src/celengine/asterism.cpp 2007/10/25 08:30:49 1.1
-+++ src/celengine/asterism.cpp 2007/10/25 08:30:56
-@@ -9,6 +9,8 @@
+--- src/celengine/image.cpp
++++ src/celengine/image.cpp
+@@ -9,5 +9,6 @@
- #include <algorithm>
+ #include <fstream>
++#include <cmath>
-+#include
-+
- #ifndef _WIN32
- #ifndef MACOSX_PB
- #include
---- src/celengine/fragmentprog.cpp 2007/10/25 08:35:15 1.1
-+++ src/celengine/fragmentprog.cpp 2007/10/25 08:35:22
-@@ -10,6 +10,7 @@
+ #ifndef MACOSX
+ #define JPEG_SUPPORT
+--- src/celutil/util.h
++++ src/celutil/util.h
+@@ -17,14 +17,6 @@
#include <iostream>
- #include <fstream>
- #include <string>
-+#include
+ #include <functional>
+
+-#ifndef min
+-#define min(a, b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+-#ifndef max
+-#define max(a, b) ((a) < (b) ? (b) : (a))
+-#endif
+-
+ #ifdef _WIN32
+ #define _(s) s
+ #else
+--- src/celengine/galaxy.cpp
++++ src/celengine/galaxy.cpp
+@@ -312,8 +312,8 @@ void Galaxy::renderGalaxyEllipsoid(const GLContext& context,
+ float discSizeInPixels = pixelSize * getRadius() / offset.length();
+ unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f);
+ unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f);
+- nRings = max(nRings, 100);
+- nSlices = max(nSlices, 100);
++ nRings = max(nRings, 100u);
++ nSlices = max(nSlices, 100u);
+
+ VertexProcessor* vproc = context.getVertexProcessor();
+ if (vproc == NULL)
+--- src/celengine/gl.h
++++ src/celengine/gl.h
+@@ -30,6 +30,7 @@
+ #endif
+
+ #ifndef MACOSX
++#undef GL_ARB_multitexture
+ #define GL_ARB_multitexture
+ #include
+ #undef GL_ARB_multitexture
+--- src/celengine/overlay.cpp
++++ src/celengine/overlay.cpp
+@@ -9,6 +9,7 @@
+
+ #include <cstdarg>
+ #include <cstdio>
++#include <cstring>
+ #include
#include "gl.h"
- #include "glext.h"
- #include "fragmentprog.h"
---- src/celengine/galaxy.cpp 2007/10/25 08:35:57 1.1
-+++ src/celengine/galaxy.cpp 2007/10/25 08:36:07
+ #include "vecgl.h"
+--- src/celengine/stardb.cpp
++++ src/celengine/stardb.cpp
@@ -11,6 +11,7 @@
- #include <algorithm>
+ #include <cstdlib>
#include <cstdio>
#include <cassert>
-+#include
- #include "celestia.h"
++#include <cstring>
+ #include <algorithm>
#include
- #include
---- src/celengine/image.cpp 2007/10/25 08:40:17 1.1
-+++ src/celengine/image.cpp 2007/10/25 08:40:25
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
+ #include
+--- src/celestia/eclipsefinder.cpp
++++ src/celestia/eclipsefinder.cpp
+@@ -12,6 +12,7 @@
- #include <fstream>
-+#include
-
- #ifndef MACOSX
- #define JPEG_SUPPORT
---- src/celengine/location.cpp 2007/10/25 08:41:06 1.1
-+++ src/celengine/location.cpp 2007/10/25 08:41:14
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
+ #include <string>
+ #include <sstream>
++#include <cstring>
+ #include <algorithm>
+ #include <set>
+ #include <cassert>
+--- src/celestia/url.cpp
++++ src/celestia/url.cpp
+@@ -17,6 +17,8 @@
- #include <map>
+ #include <string>
+ #include
++#include <cstring>
++
+ #include "celestiacore.h"
+ #include "celengine/astro.h"
+ #include "url.h"
+--- src/celutil/util.h
++++ src/celutil/util.h
+@@ -20,6 +20,7 @@
+ #ifdef _WIN32
+ #define _(s) s
+ #else
+#include
- #include
- #include
- #include
---- src/celengine/image.cpp 2007/10/25 09:29:21 1.2
-+++ src/celengine/image.cpp 2007/10/25 09:33:21
-@@ -9,6 +9,7 @@
+ #define _(s) gettext(s)
+ #endif
- #include <fstream>
- #include
-+#include <cmath>
-
- #ifndef MACOSX
- #define JPEG_SUPPORT
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org