freecad/gcc46.patch

   1 diff -Naur FreeCAD-0.11.4422.orig//src/Gui/Application.cpp FreeCAD-0.11.4422/src/Gui/Application.cpp
   2 --- FreeCAD-0.11.4422.orig//src/Gui/Application.cpp     2011-05-01 18:27:04.766233275 +0200
   3 +++ FreeCAD-0.11.4422/src/Gui/Application.cpp   2011-05-01 21:49:10.363876605 +0200
   4 @@ -1318,14 +1318,20 @@
   5  }
   6  #endif
   7
   8 +// To fix bug #0000345 move Q_INIT_RESOURCE() outside initApplication()
   9 +static void init_resources()
  10 +{
  11 +    // init resources
  12 +    Q_INIT_RESOURCE(resource);
  13 +    Q_INIT_RESOURCE(translation);
  14 +}
  15 +
  16  void Application::initApplication(void)
  17  {
  18      try {
  19          initTypes();
  20          new Base::ScriptProducer( "FreeCADGuiInit", FreeCADGuiInit );
  21          // add resources
  22 -        Q_INIT_RESOURCE(resource);
  23 -        Q_INIT_RESOURCE(translation);
  24          old_qtmsg_handler = qInstallMsgHandler(messageHandler);
  25      }
  26      catch (...) {
  27 diff -Naur FreeCAD-0.11.4422.orig//src/Gui/MDIView.cpp FreeCAD-0.11.4422/src/Gui/MDIView.cpp
  28 --- FreeCAD-0.11.4422.orig//src/Gui/MDIView.cpp 2011-05-01 18:27:04.766233275 +0200
  29 +++ FreeCAD-0.11.4422/src/Gui/MDIView.cpp       2011-05-01 18:29:27.672125752 +0200
  30 @@ -207,6 +207,11 @@
  31      }
  32  }
  33
  34 +#if defined(Q_WS_X11)
  35 +// To fix bug #0000345 move function declaration to here
  36 +                    extern void qt_x11_wait_for_window_manager( QWidget* w ); // defined in qwidget_x11.cpp
  37 +#endif
  38 +
  39  void MDIView::setCurrentViewMode(ViewMode mode)
  40  {
  41      switch (mode) {
  42 @@ -246,7 +251,7 @@
  43                          showNormal();
  44
  45  #if defined(Q_WS_X11)
  46 -                    extern void qt_x11_wait_for_window_manager( QWidget* w ); // defined in qwidget_x11.cpp
  47 +                    //extern void qt_x11_wait_for_window_manager( QWidget* w ); // defined in qwidget_x11.cpp
  48                      qt_x11_wait_for_window_manager(this);
  49  #endif
  50                      activateWindow();
  51 diff -Naur FreeCAD-0.11.4422.orig//src/Mod/Mesh/App/Core/MeshIO.cpp FreeCAD-0.11.4422/src/Mod/Mesh/App/Core/MeshIO.cpp
  52 --- FreeCAD-0.11.4422.orig//src/Mod/Mesh/App/Core/MeshIO.cpp    2011-05-01 18:26:51.899636311 +0200
  53 +++ FreeCAD-0.11.4422/src/Mod/Mesh/App/Core/MeshIO.cpp  2011-05-01 18:31:42.804727010 +0200
  54 @@ -1412,9 +1412,11 @@
  55      while (clIter < clEnd) {
  56          pclFacet = &(*clIter);
  57          // normal
  58 -        rstrOut.write((const char*)&(pclFacet->GetNormal().x), sizeof(float));
  59 -        rstrOut.write((const char*)&(pclFacet->GetNormal().y), sizeof(float));
  60 -        rstrOut.write((const char*)&(pclFacet->GetNormal().z), sizeof(float));
  61 +        Base::Vector3f normal = pclFacet->GetNormal();
  62 +        rstrOut.write((const char*)&(normal.x), sizeof(float));
  63 +        rstrOut.write((const char*)&(normal.y), sizeof(float));
  64 +        rstrOut.write((const char*)&(normal.z), sizeof(float));
  65 +
  66
  67          // vertices
  68          for (i = 0; i < 3; i++) {
  69 diff -Naur FreeCAD-0.11.4422.orig//src/zipios++/directory.h FreeCAD-0.11.4422/src/zipios++/directory.h
  70 --- FreeCAD-0.11.4422.orig//src/zipios++/directory.h    2011-05-01 18:26:59.209596709 +0200
  71 +++ FreeCAD-0.11.4422/src/zipios++/directory.h  2011-05-01 18:32:32.504457764 +0200
  72 @@ -31,6 +31,7 @@
  73  #include <string>
  74  #include <ctime>
  75  #include <stdexcept>
  76 +#include <cstddef>
  77
  78  // #include <boost.h>  Contents of boost.h
  79