Hello community, here is the log from the commit of package celestia for openSUSE:Factory checked in at Wed May 4 15:52:05 CEST 2011.
-------- --- KDE/celestia/celestia.changes 2010-11-15 10:50:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/celestia/celestia.changes 2011-05-03 09:38:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 3 07:26:45 UTC 2011 - [email protected] + +- Add celestia-1.6.0-gcc46.patch: don't take address of temporary, + add missing cstddef include to fix compilation with gcc 4.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- celestia-1.6.0-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ celestia.spec ++++++ --- /var/tmp/diff_new_pack.Y8zHL8/_old 2011-05-04 15:51:01.000000000 +0200 +++ /var/tmp/diff_new_pack.Y8zHL8/_new 2011-05-04 15:51:01.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package celestia (Version 1.6.0) +# spec file for package celestia # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -21,7 +21,7 @@ Name: celestia Summary: OpenGL Space Simulator Version: 1.6.0 -Release: 9 +Release: 14 License: GPLv2+ Group: Productivity/Scientific/Astronomy Url: http://celestia.sourceforge.net @@ -39,6 +39,8 @@ Patch2: celestia-1.6.0-config.patch Patch3: celestia-1.6.0-gcc44.patch Patch4: celestia-1.6.0-gcc45.patch +# PATCH-FIX-UPSTREAM celestia-1.6.0-gcc46.patch [email protected] -- Don't take address of temporary, fixes gcc 4.6 compilation +Patch5: celestia-1.6.0-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define kdedir /opt/kde3 @@ -69,6 +71,7 @@ %patch2 %patch3 %patch4 +%patch5 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ celestia-1.6.0-gcc46.patch ++++++ Upstream commit r4753 --- src/celengine/vecgl.h 2009/07/07 04:53:09 4753 +++ src/celengine/vecgl.h 2011/01/24 19:05:54 5127 @@ -89,17 +89,20 @@ inline void glLightDirection(GLenum light, const Vec3f& dir) { - glLightfv(light, GL_POSITION, &(Vec4f(dir.x, dir.y, dir.z, 0.0f).x)); + Vec4f dir4 = Vec4f(dir.x, dir.y, dir.z, 0.0f); + glLightfv(light, GL_POSITION, &(dir4.x)); } inline void glLightPosition(GLenum light, const Point3f& pos) { - glLightfv(light, GL_POSITION, &(Vec4f(pos.x, pos.y, pos.z, 1.0f).x)); + Vec4f pos4 = Vec4f(pos.x, pos.y, pos.z, 1.0f); + glLightfv(light, GL_POSITION, &(pos4.x)); } inline void glLightColor(GLenum light, GLenum which, const Vec3f& color) { - glLightfv(light, which, &(Vec4f(color.x, color.y, color.z, 1.0f).x)); + Vec4f color4 = Vec4f(color.x, color.y, color.z, 1.0f); + glLightfv(light, which, &(color4.x)); } inline void glLightColor(GLenum light, GLenum which, const Vec4f& color) @@ -109,15 +112,14 @@ inline void glLightColor(GLenum light, GLenum which, const Color& color) { - glLightfv(light, which, - &(Vec4f(color.red(), color.green(), color.blue(), color.alpha()).x)); + Vec4f color4 = Vec4f(color.red(), color.green(), color.blue(), color.alpha()); + glLightfv(light, which, &(color4.x)); } inline void glAmbientLightColor(const Color& color) { - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, - &(Vec4f(color.red(), color.green(), color.blue(), - color.alpha()).x)); + Vec4f color4 = Vec4f(color.red(), color.green(), color.blue(), color.alpha()); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &(color4.x)); } #endif // _VECGL_H_ --- src/celengine/frametree.h 2009-06-22 17:44:08.000000000 +0200 +++ src/celengine/frametree.h 2011-05-03 09:32:26.307938481 +0200 @@ -13,6 +13,7 @@ #ifndef _CELENGINE_FRAMETREE_H_ #define _CELENGINE_FRAMETREE_H_ +#include <cstddef> #include <vector> class Star; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
