File boson-gcc-4.3.patch of Package boson

Overview Repositories Revisions Requests Users Attributes Meta

File boson-gcc-4.3.patch of Package boson

--- code/bobmfconverter/libgfx/raster-jpeg.cxx
+++ code/bobmfconverter/libgfx/raster-jpeg.cxx
@@ -9,7 +9,9 @@
 
  ************************************************************************/
 
+#ifndef  QT_CLEAN_NAMESPACE
 #define QT_CLEAN_NAMESPACE
+#endif
 
 #include <gfx/gfx.h>
 #include <gfx/raster.h>
--- code/boson/boufo/bosonfont/bosonglfont.cpp
+++ code/boson/boufo/bosonfont/bosonglfont.cpp
@@ -17,7 +17,9 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef QT_CLEAN_NAMESPACE
 #define QT_CLEAN_NAMESPACE // we don't use QT-1 syntax anyway. if we don't define this INT32 in qnamespace.h conflicts with the one in Xmd.h included by **nvidia** glx.h
+#endif
 #include "bosonglfont.h"
 
 #include "../../bomemory/bodummymemory.h"
--- code/boson/boufo/bosonfont/fntTXF.cpp
+++ code/boson/boufo/bosonfont/fntTXF.cpp
@@ -21,7 +21,9 @@
      $Id: fntTXF.cpp 7248 2006-02-21 23:12:21Z abmann $
 */
 
+#ifndef QT_CLEAN_NAMESPACE
 #define QT_CLEAN_NAMESPACE
+#endif
 
 #include "fntLocal.h"
 #include "../../bomemory/bodummymemory.h"
--- code/boson/programs/mainnoguimain.cpp
+++ code/boson/programs/mainnoguimain.cpp
@@ -57,7 +57,7 @@
 
 static bool parseArgs(MainNoGUIStartOptions* options, KCmdLineArgs* args);
 static bool parseAddComputerArgs(MainNoGUIStartOptions* options, KCmdLineArgs* args);
-static bool parsePlayFieldArgs(MainNoGUIStartOptions* args, KCmdLineArgs* args);
+static bool parsePlayFieldArgs(MainNoGUIStartOptions* options, KCmdLineArgs* args);
 
 static void postBosonConfigInit();
 
--- code/ufo/include/ufo/util/urectangle.hpp
+++ code/ufo/include/ufo/util/urectangle.hpp
@@ -34,6 +34,15 @@
 #include "udimension.hpp"
 #include "uinsets.hpp"
 
+namespace std {
+
+template <typename Type>
+inline Type abs(const Type & a) {
+        return a > 0 ? a : -a;
+}
+
+} // namespace std
+
 namespace ufo {
 
 /** @short An abstraction of a rectangle (x, y, width and height).
--- code/ufo/src/gl/ugl_driver.cpp
+++ code/ufo/src/gl/ugl_driver.cpp
@@ -25,6 +25,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <stdlib.h>
+
 #include "ufo/gl/ugl_driver.hpp"
 
 #include "ufo/usharedlib.hpp"
--- code/ufo/src/uabstractdisplay.cpp
+++ code/ufo/src/uabstractdisplay.cpp
@@ -25,6 +25,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
+/*not sure*/
 #include "ufo/uabstractdisplay.hpp"
 
 #include "ufo/ucontext.hpp"
--- code/ufo/src/uabstracttoolkit.cpp
+++ code/ufo/src/uabstracttoolkit.cpp
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
 #include "ufo/uabstracttoolkit.hpp"
 
 #include "ufo/uversioninfo.hpp"
--- code/ufo/src/ubuttongroup.cpp
+++ code/ufo/src/ubuttongroup.cpp
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
 #include "ufo/ubuttongroup.hpp"
 
 #include "ufo/widgets/ubutton.hpp"
--- code/ufo/src/ucontextgroup.cpp
+++ code/ufo/src/ucontextgroup.cpp
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
 #include "ufo/ucontextgroup.hpp"
 
 #include "ufo/ucontext.hpp"
--- code/ufo/src/ufo_debug.cpp
+++ code/ufo/src/ufo_debug.cpp
@@ -27,6 +27,7 @@
 
 #include "ufo/ufo_global.hpp"
 
+#include <stdlib.h>
 #include <cstring>
 #include <cstdarg>
 #include <cstdio> // for vsnprintf
--- code/ufo/src/umenumanager.cpp
+++ code/ufo/src/umenumanager.cpp
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
 #include "ufo/umenumanager.hpp"
 
 #include "ufo/widgets/umenuitem.hpp"
--- code/ufo/src/uobject.cpp
+++ code/ufo/src/uobject.cpp
@@ -25,6 +25,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
+/* not sure*/
 #include "ufo/uobject.hpp"
 
 #include "ufo/signals/ufo_signals.hpp"
--- code/ufo/src/ux/uxdisplay.cpp
+++ code/ufo/src/ux/uxdisplay.cpp
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
 #include "ufo/ux/uxdisplay.hpp"
 
 #include "ufo/ux/uxcontext.hpp"
--- code/ufo/src/widgets/uwidget.cpp
+++ code/ufo/src/widgets/uwidget.cpp
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
  ***************************************************************************/
 
+#include <algorithm>
 #include "ufo/widgets/uwidget.hpp"
 
 // headers in top_dir

Places

File boson-gcc-4.3.patch of Package boson

Places