earth3d/earth3d-1.0.5-gcc44.diff

   1 diff -Naur earth3d.old/draw/drawSceneObjectQuad.cpp earth3d/draw/drawSceneObjectQuad.cpp
   2 --- earth3d.old/draw/drawSceneObjectQuad.cpp    2008-12-24 16:37:08.000000000 -0600
   3 +++ earth3d/draw/drawSceneObjectQuad.cpp        2008-12-24 16:37:20.000000000 -0600
   4 @@ -1,4 +1,5 @@
   5  #include "drawSceneObjectQuad.h"
   6 +#include <cstdlib>
   7
   8  DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene)
   9    : DrawSceneObject(scene) {
  10 diff -Naur earth3d.old/draw/drawSceneObjectRotatequaternion.cpp earth3d/draw/drawSceneObjectRotatequaternion.cpp
  11 --- earth3d.old/draw/drawSceneObjectRotatequaternion.cpp        2008-12-24 16:37:08.000000000 -0600
  12 +++ earth3d/draw/drawSceneObjectRotatequaternion.cpp    2008-12-24 16:37:20.000000000 -0600
  13 @@ -1,4 +1,5 @@
  14  #include "drawSceneObjectRotatequaternion.h"
  15 +#include <cstdlib>
  16
  17  DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(DrawScene *scene)
  18    : DrawSceneObjectTransform(scene) {
  19 diff -Naur earth3d.old/draw/drawSceneObjectScale.cpp earth3d/draw/drawSceneObjectScale.cpp
  20 --- earth3d.old/draw/drawSceneObjectScale.cpp   2008-12-24 16:37:08.000000000 -0600
  21 +++ earth3d/draw/drawSceneObjectScale.cpp       2008-12-24 16:37:20.000000000 -0600
  22 @@ -1,4 +1,5 @@
  23  #include "drawSceneObjectScale.h"
  24 +#include <cstdlib>
  25
  26  DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene)
  27    : DrawSceneObjectTransform(scene) {
  28 diff -Naur earth3d.old/draw/drawSceneObjectTranslate.cpp earth3d/draw/drawSceneObjectTranslate.cpp
  29 --- earth3d.old/draw/drawSceneObjectTranslate.cpp       2008-12-24 16:37:08.000000000 -0600
  30 +++ earth3d/draw/drawSceneObjectTranslate.cpp   2008-12-24 16:37:20.000000000 -0600
  31 @@ -1,4 +1,5 @@
  32  #include "drawSceneObjectTranslate.h"
  33 +#include <cstdlib>
  34
  35  DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene)
  36    : DrawSceneObjectTransform(scene) {
  37 diff -Naur earth3d.old/draw/drawSceneObjectTriangle.cpp earth3d/draw/drawSceneObjectTriangle.cpp
  38 --- earth3d.old/draw/drawSceneObjectTriangle.cpp        2008-12-24 16:37:08.000000000 -0600
  39 +++ earth3d/draw/drawSceneObjectTriangle.cpp    2008-12-24 16:37:20.000000000 -0600
  40 @@ -1,4 +1,5 @@
  41  #include "drawSceneObjectTriangle.h"
  42 +#include <cstdlib>
  43
  44  DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene)
  45    : DrawSceneObject(scene) {
  46 diff -Naur earth3d.old/draw/treeDrawFactory.cpp earth3d/draw/treeDrawFactory.cpp
  47 --- earth3d.old/draw/treeDrawFactory.cpp        2008-12-24 16:37:08.000000000 -0600
  48 +++ earth3d/draw/treeDrawFactory.cpp    2008-12-24 16:37:20.000000000 -0600
  49 @@ -1,4 +1,5 @@
  50  #include "treeDrawFactory.h"
  51 +#include <cstdlib>
  52  #include <qtextstream.h>
  53  #include <qdom.h>
  54  #include "treeDraw.h"
  55 diff -Naur earth3d.old/draw/treeDrawPOI.cpp earth3d/draw/treeDrawPOI.cpp
  56 --- earth3d.old/draw/treeDrawPOI.cpp    2008-12-24 16:37:08.000000000 -0600
  57 +++ earth3d/draw/treeDrawPOI.cpp        2008-12-24 16:37:20.000000000 -0600
  58 @@ -1,5 +1,6 @@
  59  #define GL_GLEXT_PROTOTYPES
  60  #include "treeDrawPOI.h"
  61 +#include <cstdlib>
  62  #include <stdio.h>
  63  #include <GL/glext.h>
  64  #include "treeDrawPOISign.h"
  65 diff -Naur earth3d.old/formview.ui earth3d/formview.ui
  66 --- earth3d.old/formview.ui     2008-12-24 16:37:08.000000000 -0600
  67 +++ earth3d/formview.ui 2008-12-24 16:37:20.000000000 -0600
  68 @@ -514,6 +514,6 @@
  69  <pixmapinproject/>
  70  <layoutdefaults spacing="6" margin="11"/>
  71  <includehints>
  72 -    <includehint>gltestwidget.h</includehint>
  73 +    <includehint>gltest.h</includehint>
  74  </includehints>
  75  </UI>
  76 diff -Naur earth3d.old/formview.ui.h earth3d/formview.ui.h
  77 --- earth3d.old/formview.ui.h   2008-12-24 16:37:08.000000000 -0600
  78 +++ earth3d/formview.ui.h       2008-12-24 16:37:20.000000000 -0600
  79 @@ -9,8 +9,7 @@
  80  ** place of a destructor.
  81  *****************************************************************************/
  82
  83 -#include <iostream>
  84 -
  85 +#include <cstdlib>
  86  #include "connectNetworkService.h"
  87  #include "serviceFoundLister.h"
  88  #include <vector>
  89 @@ -48,6 +47,7 @@
  90  #include "earth.h"
  91  #include "moveToPositionEvent.h"
  92  #include "serviceListDownload.h"
  93 +#include "gltest.h"
  94
  95  FormStatus *fstatus;
  96  FormInfo *forminfo;
  97 diff -Naur earth3d.old/geometry/geometry2d3dFactory.cpp earth3d/geometry/geometry2d3dFactory.cpp
  98 --- earth3d.old/geometry/geometry2d3dFactory.cpp        2008-12-24 16:37:08.000000000 -0600
  99 +++ earth3d/geometry/geometry2d3dFactory.cpp    2008-12-24 16:37:20.000000000 -0600
 100 @@ -1,4 +1,5 @@
 101  #include "geometry2d3dFactory.h"
 102 +#include <cstdlib>
 103
 104  Geometry2D3DFactory::Geometry2D3DFactory() {
 105  }
 106 diff -Naur earth3d.old/listViewServiceItem.cpp earth3d/listViewServiceItem.cpp
 107 --- earth3d.old/listViewServiceItem.cpp 2008-12-24 16:37:08.000000000 -0600
 108 +++ earth3d/listViewServiceItem.cpp     2008-12-24 16:37:20.000000000 -0600
 109 @@ -1,4 +1,5 @@
 110  #include "listViewServiceItem.h"
 111 +#include <cstdlib>
 112  #include <qdom.h>
 113  #include <qpixmap.h>
 114
 115 diff -Naur earth3d.old/network/serviceFoundLister.cpp earth3d/network/serviceFoundLister.cpp
 116 --- earth3d.old/network/serviceFoundLister.cpp  2008-12-24 16:37:08.000000000 -0600
 117 +++ earth3d/network/serviceFoundLister.cpp      2008-12-24 16:37:20.000000000 -0600
 118 @@ -1,4 +1,5 @@
 119  #include "serviceFoundLister.h"
 120 +#include <cstdlib>
 121  #include <iostream>
 122  #include "listViewServiceItem.h"
 123  #include <qdom.h>
 124 diff -Naur earth3d.old/network/urlDownload.cpp earth3d/network/urlDownload.cpp
 125 --- earth3d.old/network/urlDownload.cpp 2008-12-24 16:37:08.000000000 -0600
 126 +++ earth3d/network/urlDownload.cpp     2008-12-24 16:37:20.000000000 -0600
 127 @@ -1,5 +1,6 @@
 128  #include "urlDownload.h"
 129  #include "urlTools.h"
 130 +#include <cstdlib>
 131  #include <string.h>
 132  #include <iostream>
 133  #include <qnetwork.h>
 134 @@ -12,7 +13,10 @@
 135  #include "downloadFinishedEvent.h"
 136
 137  #ifndef WIN32
 138 -#include <alloc.h>
 139 +#include <bits/c++config.h>
 140 +#include <bits/allocator.h>
 141 +
 142 +using std::allocator;
 143  #endif
 144
 145  using namespace std;
 146 diff -Naur earth3d.old/network/urlTools.cpp earth3d/network/urlTools.cpp
 147 --- earth3d.old/network/urlTools.cpp    2008-12-24 16:37:08.000000000 -0600
 148 +++ earth3d/network/urlTools.cpp        2008-12-24 16:37:20.000000000 -0600
 149 @@ -1,4 +1,5 @@
 150  #include "urlTools.h"
 151 +#include <cstdlib>
 152  #include <qdom.h>
 153  #include <qtextstream.h>
 154  #include <iostream>
 155 diff -Naur earth3d.old/earth3d.pro earth3d/earth3d.pro
 156 --- earth3d.old/earth3d.pro     2008-12-24 16:37:08.000000000 -0600
 157 +++ earth3d/earth3d.pro 2008-12-24 16:39:24.000000000 -0600
 158 @@ -19,7 +19,7 @@
 159    OBJECTS_DIR = .obj
 160  !mac {
 161    DEFINES      += LINUX
 162 -#  LIBS += -ljsw
 163 +  LIBS += -lpng12
 164  #  QMAKE_CXXFLAGS_RELEASE += -march=pentium4 -O2 -pipe -fomit-frame-pointer
 165  #  QMAKE_CXXFLAGS_RELEASE += -march=athlon-xp -O2 -pipe -fomit-frame-pointer
 166  #  QMAKE_CXXFLAGS_RELEASE += -march=pentium3 -O2 -pipe -fomit-frame-pointer
 167 @@ -69,7 +69,19 @@
 168
 169  # LIBS += -lglut
 170  # DEFINES      += STATISTIC_NODECOUNT
 171 -INCLUDEPATH    += /usr/include/libxml2/libxml /usr/include/libxml2 ../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/ /sw/include/libxml2 geometry/ network/ draw/ tree/ ./
 172 +INCLUDEPATH    += /usr/include/libpng12 /usr/include/libxml2/libxml /usr/include/libxml2 ../../network/rubyAgents/c ../../dataserver /sw/include /usr/include/X11 /sw/include/libxml2 geometry/ network/ draw/ tree/ ./
 173 +
 174 +man.files = earth3d.1
 175 +pix.files = images/earth_rotate_icon.png
 176 +app.files = earth3d.desktop
 177 +
 178 +man.path  = /usr/share/man/man1
 179 +pix.path  = /usr/share/pixmaps
 180 +app.path  = /usr/share/applications
 181 +
 182 +TARGET    = earth3d
 183 +DESTDIR   = $(INSTALL_ROOT)/usr/bin
 184 +INSTALLS += man pix app
 185
 186  HEADERS        += network/qServiceLib.h \
 187         network/connectNetworkService.h \
 188 diff -Naur earth3d.old/earth3d.desktop earth3d/earth3d.desktop
 189 --- earth3d.old/earth3d.desktop 1969-12-31 18:00:00.000000000 -0600
 190 +++ earth3d/earth3d.desktop     2008-12-24 16:37:20.000000000 -0600
 191 @@ -0,0 +1,9 @@
 192 +[Desktop Entry]
 193 +Type=Application
 194 +Version=1.0
 195 +Name=Earth3D
 196 +Comment=A 3D model of the planet
 197 +TryExec=/usr/bin/earth3d
 198 +Exec=earth3d
 199 +Icon=earth_rotate_icon
 200 +Categories=Network;