Hello community,
here is the log from the commit of package celestia for openSUSE:Factory
checked in at Tue Apr 7 12:45:09 CEST 2009.
--------
--- KDE/celestia/celestia.changes 2008-06-25 19:41:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/celestia/celestia.changes 2009-04-05 11:15:31.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Apr 4 17:28:48 CEST 2009 - coolo@suse.de
+
+- refresh all patches to fix build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ celestia.spec ++++++
--- /var/tmp/diff_new_pack.j21306/_old 2009-04-07 12:42:27.000000000 +0200
+++ /var/tmp/diff_new_pack.j21306/_new 2009-04-07 12:42:27.000000000 +0200
@@ -1,10 +1,17 @@
#
# spec file for package celestia (Version 1.5.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -14,7 +21,7 @@
Name: celestia
Summary: OpenGL Space Simulator
Version: 1.5.1
-Release: 1
+Release: 47
License: GPL v2 or later
Group: Productivity/Scientific/Astronomy
Url: http://celestia.sourceforge.net
@@ -63,7 +70,6 @@
%patch3
%patch4 -p1
%patch5 -p1
-. /etc/opt/kde3/common_options
%build
. /etc/opt/kde3/common_options
@@ -112,6 +118,8 @@
%{_datadir}/pixmaps/*.png
%changelog
+* Sat Apr 04 2009 coolo@suse.de
+- refresh all patches to fix build
* Wed Jun 25 2008 dmueller@suse.de
- merge from the OBS
* Mon May 19 2008 lars@linux-schulserver.de
@@ -124,7 +132,7 @@
+ Fixed bug that caused some stars to be drawn untextured
- added celestia-1.5.1-config.patch to allow ~/.celestia config
- enabled theora, lua and cairo
-* Fri May 16 2008 dmueller@suse.de
+* Thu May 15 2008 dmueller@suse.de
- fix build on x86_64
* Thu Apr 24 2008 stbinner@suse.de
- update to version 1.5, for a list of new features see
++++++ celestia-1.5.1-gcc43.patch ++++++
--- /var/tmp/diff_new_pack.j21306/_old 2009-04-07 12:42:27.000000000 +0200
+++ /var/tmp/diff_new_pack.j21306/_new 2009-04-07 12:42:27.000000000 +0200
@@ -1,4 +1,6 @@
---- src/celutil/formatnum.cpp
+Index: src/celutil/formatnum.cpp
+===================================================================
+--- src/celutil/formatnum.cpp.orig
+++ src/celutil/formatnum.cpp
@@ -7,6 +7,8 @@
// as published by the Free Software Foundation; either version 2
@@ -9,28 +11,40 @@
#include <cmath>
#include <cstdio>
#include <string>
---- ./src/celengine/console.cpp
-+++ ./src/celengine/console.cpp
-@@ -10,6 +10,7 @@
- #include <cstdarg>
- #include <cstdio>
- #include <cassert>
-+#include
- #include "celutil/utf8.h"
- #include "gl.h"
- #include "vecgl.h"
---- src/celengine/image.cpp
+Index: src/celengine/image.cpp
+===================================================================
+--- src/celengine/image.cpp.orig
+++ src/celengine/image.cpp
-@@ -9,5 +9,6 @@
+@@ -8,6 +8,7 @@
+ // of the License, or (at your option) any later version.
#include <fstream>
+#include <cmath>
- #ifndef MACOSX
+ #ifndef TARGET_OS_MAC
#define JPEG_SUPPORT
---- src/celengine/galaxy.cpp
+@@ -66,6 +67,7 @@ extern "C" {
+ #include <iostream>
+ #include <algorithm>
+ #include <cmath>
++#include
+
+ using namespace std;
+
+Index: src/celengine/galaxy.cpp
+===================================================================
+--- src/celengine/galaxy.cpp.orig
+++ src/celengine/galaxy.cpp
-@@ -312,8 +312,8 @@ void Galaxy::renderGalaxyEllipsoid(const GLContext& context,
+@@ -23,6 +23,8 @@
+ #include "vecgl.h"
+ #include "render.h"
+ #include "texture.h"
++#include
++#include
+
+ using namespace std;
+
+@@ -380,8 +382,8 @@ void Galaxy::renderGalaxyEllipsoid(const
float discSizeInPixels = pixelSize * getRadius() / offset.length();
unsigned int nRings = (unsigned int) (discSizeInPixels / 4.0f);
unsigned int nSlices = (unsigned int) (discSizeInPixels / 4.0f);
@@ -41,7 +55,9 @@
VertexProcessor* vproc = context.getVertexProcessor();
if (vproc == NULL)
---- src/celengine/overlay.cpp
+Index: src/celengine/overlay.cpp
+===================================================================
+--- src/celengine/overlay.cpp.orig
+++ src/celengine/overlay.cpp
@@ -9,6 +9,7 @@
@@ -51,7 +67,9 @@
#include
#include "gl.h"
#include "vecgl.h"
---- src/celengine/stardb.cpp
+Index: src/celengine/stardb.cpp
+===================================================================
+--- src/celengine/stardb.cpp.orig
+++ src/celengine/stardb.cpp
@@ -11,6 +11,7 @@
#include <cstdlib>
@@ -61,7 +79,9 @@
#include <algorithm>
#include
#include
---- src/celestia/eclipsefinder.cpp
+Index: src/celestia/eclipsefinder.cpp
+===================================================================
+--- src/celestia/eclipsefinder.cpp.orig
+++ src/celestia/eclipsefinder.cpp
@@ -12,6 +12,7 @@
@@ -71,7 +91,9 @@
#include <algorithm>
#include <set>
#include <cassert>
---- src/celestia/url.cpp
+Index: src/celestia/url.cpp
+===================================================================
+--- src/celestia/url.cpp.orig
+++ src/celestia/url.cpp
@@ -17,6 +17,8 @@
@@ -82,7 +104,9 @@
#include "celestiacore.h"
#include "celengine/astro.h"
#include "url.h"
---- src/celutil/utf8.cpp 1.1
+Index: src/celutil/utf8.cpp
+===================================================================
+--- src/celutil/utf8.cpp.orig
+++ src/celutil/utf8.cpp
@@ -9,6 +9,7 @@
@@ -92,7 +116,9 @@
#include "util.h"
unsigned int WGL4_Normalization_00[256] = {
---- src/celutil/util.cpp 1.1
+Index: src/celutil/util.cpp
+===================================================================
+--- src/celutil/util.cpp.orig
+++ src/celutil/util.cpp
@@ -12,6 +12,7 @@
#include "util.h"
@@ -102,7 +128,9 @@
using namespace std;
---- src/celutil/util.h 1.1
+Index: src/celutil/util.h
+===================================================================
+--- src/celutil/util.h.orig
+++ src/celutil/util.h
@@ -21,14 +21,6 @@
#define COMPILE_TIME_ASSERT(pred) \
@@ -119,7 +147,9 @@
#ifdef _WIN32
#include "libintl.h"
#define _(string) gettext (string)
---- src/celengine/astro.cpp 1.1
+Index: src/celengine/astro.cpp
+===================================================================
+--- src/celengine/astro.cpp.orig
+++ src/celengine/astro.cpp
@@ -16,6 +16,7 @@
#include "celestia.h"
@@ -127,9 +157,11 @@
#include
+#include
- using namespace std;
-
---- src/celengine/body.cpp 1.1
+ #ifndef TARGET_OS_MAC
+ #ifdef __GNUC__
+Index: src/celengine/body.cpp
+===================================================================
+--- src/celengine/body.cpp.orig
+++ src/celengine/body.cpp
@@ -18,6 +18,7 @@
#include "meshmanager.h"
@@ -139,27 +171,9 @@
using namespace std;
---- ./src/celengine/asterism.cpp 1.1
-+++ ./src/celengine/asterism.cpp
-@@ -19,6 +19,7 @@
- #include
- #include "parser.h"
- #include "asterism.h"
-+#include
-
- using namespace std;
-
---- ./src/celengine/dsodb.cpp 1.1
-+++ ./src/celengine/dsodb.cpp
-@@ -28,6 +28,7 @@
- #include "multitexture.h"
- #include "meshmanager.h"
- #include
-+#include
-
- #include
- #include
---- src/celengine/fragmentprog.cpp 1.1
+Index: src/celengine/fragmentprog.cpp
+===================================================================
+--- src/celengine/fragmentprog.cpp.orig
+++ src/celengine/fragmentprog.cpp
@@ -13,6 +13,7 @@
#include "gl.h"
@@ -169,38 +183,9 @@
using namespace std;
---- src/celengine/galaxy.cpp 1.1
-+++ src/celengine/galaxy.cpp
-@@ -23,6 +23,8 @@
- #include "vecgl.h"
- #include "render.h"
- #include "texture.h"
-+#include
-+#include
-
- using namespace std;
-
---- ./src/celengine/image.cpp 1.1
-+++ ./src/celengine/image.cpp
-@@ -66,6 +66,7 @@
- #include <iostream>
- #include <algorithm>
- #include <cmath>
-+#include
-
- using namespace std;
-
---- ./src/celengine/location.cpp 1.1
-+++ ./src/celengine/location.cpp
-@@ -11,6 +11,7 @@
- #include
- #include
- #include
-+#include
-
- using namespace std;
-
---- src/celengine/meshmanager.cpp 1.1
+Index: src/celengine/meshmanager.cpp
+===================================================================
+--- src/celengine/meshmanager.cpp.orig
+++ src/celengine/meshmanager.cpp
@@ -26,6 +26,7 @@
#include "spheremesh.h"
@@ -210,7 +195,9 @@
using namespace std;
---- src/celengine/celestia.h 1.1
+Index: src/celengine/celestia.h
+===================================================================
+--- src/celengine/celestia.h.orig
+++ src/celengine/celestia.h
@@ -35,7 +35,7 @@
#endif /* TARGET_OS_MAC */
@@ -221,7 +208,9 @@
#endif // _CELESTIA_H_
---- src/celengine/vertexprog.cpp 1.1
+Index: src/celengine/vertexprog.cpp
+===================================================================
+--- src/celengine/vertexprog.cpp.orig
+++ src/celengine/vertexprog.cpp
@@ -14,6 +14,7 @@
#include "gl.h"
@@ -231,9 +220,11 @@
using namespace std;
---- src/celengine/render.cpp
+Index: src/celengine/render.cpp
+===================================================================
+--- src/celengine/render.cpp.orig
+++ src/celengine/render.cpp
-@@ -1210,7 +1210,7 @@ static void computeOrbitSectionBoundingVolumes(Renderer::CachedOrbit& orbit)
+@@ -1208,7 +1208,7 @@ static void computeOrbitSectionBoundingV
// Determine the number of trajectory samples to include in each bounding volume; typically,
// the last volume will contain any leftover samples.
@@ -242,7 +233,7 @@
unsigned int samplesPerSection = orbit.trajectory.size() / nSections;
if (samplesPerSection <= 1)
{
-@@ -1230,7 +1230,7 @@ static void computeOrbitSectionBoundingVolumes(Renderer::CachedOrbit& orbit)
+@@ -1228,7 +1228,7 @@ static void computeOrbitSectionBoundingV
Renderer::OrbitSection section;
section.firstSample = samplesPerSection * i;
@@ -251,3 +242,51 @@
// Set the initial axis and origin of the capsule bounding volume; they will be adjusted
// to contain all points in the trajectory. The length of the axis may change, but the
+Index: src/celengine/asterism.cpp
+===================================================================
+--- src/celengine/asterism.cpp.orig
++++ src/celengine/asterism.cpp
+@@ -19,6 +19,7 @@
+ #include
+ #include "parser.h"
+ #include "asterism.h"
++#include
+
+ using namespace std;
+
+Index: src/celengine/console.cpp
+===================================================================
+--- src/celengine/console.cpp.orig
++++ src/celengine/console.cpp
+@@ -10,6 +10,7 @@
+ #include <cstdarg>
+ #include <cstdio>
+ #include <cassert>
++#include
+ #include "celutil/utf8.h"
+ #include "gl.h"
+ #include "vecgl.h"
+Index: src/celengine/dsodb.cpp
+===================================================================
+--- src/celengine/dsodb.cpp.orig
++++ src/celengine/dsodb.cpp
+@@ -28,6 +28,7 @@
+ #include "multitexture.h"
+ #include "meshmanager.h"
+ #include
++#include
+
+ #include
+ #include
+Index: src/celengine/location.cpp
+===================================================================
+--- src/celengine/location.cpp.orig
++++ src/celengine/location.cpp
+@@ -11,6 +11,7 @@
+ #include
+ #include
+ #include
++#include
+
+ using namespace std;
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org