r5992 - in packages/trunk/boson/debian: . patches

Ansgar Burchardt ansgar-guest at alioth.debian.org
Mon Mar 3 17:12:10 UTC 2008 

Author: ansgar-guest
Date: 2008-03-03 17:12:10 +0000 (Mon, 03 Mar 2008)
New Revision: 5992

Added:
   packages/trunk/boson/debian/patches/fix_gcc-4.3.diff
Modified:
   packages/trunk/boson/debian/changelog
   packages/trunk/boson/debian/copyright
   packages/trunk/boson/debian/patches/series
Log:
* Fix FTBFS with gcc-4.3 (Closes: #454873)
  + new patch `fix_gcc-4.3.diff'
* debian/copyright: refer to GPL-2 (including version)

Modified: packages/trunk/boson/debian/changelog
===================================================================
--- packages/trunk/boson/debian/changelog	2008-03-03 15:28:04 UTC (rev 5991)
+++ packages/trunk/boson/debian/changelog	2008-03-03 17:12:10 UTC (rev 5992)
@@ -17,8 +17,13 @@
   * Remove homepage field from package description
   * Bump standards version to 3.7.3
 
- -- Goneri Le Bouder <goneri at rulezlan.org>  Sat, 26 Jan 2008 02:01:31 +0100
+  [ Ansgar Burchardt ]
+  * Fix FTBFS with gcc-4.3 (Closes: #454873)
+    + new patch `fix_gcc-4.3.diff'
+  * debian/copyright: refer to GPL-2 (including version)
 
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 03 Mar 2008 18:10:04 +0100
+
 boson (0.13-2) unstable; urgency=low
 
   * remove libvorbis-dev from boson dependency (Closes: #385189)

Modified: packages/trunk/boson/debian/copyright
===================================================================
--- packages/trunk/boson/debian/copyright	2008-03-03 15:28:04 UTC (rev 5991)
+++ packages/trunk/boson/debian/copyright	2008-03-03 17:12:10 UTC (rev 5992)
@@ -58,7 +58,7 @@
 	
 
 On Debian systems, the complete text of the GNU General Public License can
-be found in /usr/share/common-licenses/GPL file.
+be found in /usr/share/common-licenses/GPL-2 file.
 
 
 The folder bobmfconverter/mixkit is a copy of mixkit, from

Added: packages/trunk/boson/debian/patches/fix_gcc-4.3.diff
===================================================================
--- packages/trunk/boson/debian/patches/fix_gcc-4.3.diff	                        (rev 0)
+++ packages/trunk/boson/debian/patches/fix_gcc-4.3.diff	2008-03-03 17:12:10 UTC (rev 5992)
@@ -0,0 +1,179 @@
+Index: boson-0.13/ufo/include/ufo/util/urectangle.hpp
+===================================================================
+--- boson-0.13.orig/ufo/include/ufo/util/urectangle.hpp
++++ boson-0.13/ufo/include/ufo/util/urectangle.hpp
+@@ -34,6 +34,8 @@
+ #include "udimension.hpp"
+ #include "uinsets.hpp"
+ 
++#include <cstdlib>
++
+ namespace ufo {
+ 
+ /** @short An abstraction of a rectangle (x, y, width and height).
+Index: boson-0.13/ufo/src/uabstractcontext.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/uabstractcontext.cpp
++++ boson-0.13/ufo/src/uabstractcontext.cpp
+@@ -50,6 +50,7 @@
+ #include "ufo/ukeystroke.hpp"
+ #include "ufo/events/uactionevent.hpp"
+ 
++#include <cstdlib>
+ 
+ using namespace ufo;
+ 
+Index: boson-0.13/ufo/src/uabstractdisplay.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/uabstractdisplay.cpp
++++ boson-0.13/ufo/src/uabstractdisplay.cpp
+@@ -45,6 +45,7 @@
+ #include "ufo/uvolatiledata.hpp"
+ 
+ #include <bitset>
++#include <algorithm>
+ 
+ namespace ufo {
+ 
+Index: boson-0.13/ufo/src/uabstracttoolkit.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/uabstracttoolkit.cpp
++++ boson-0.13/ufo/src/uabstracttoolkit.cpp
+@@ -62,6 +62,9 @@
+ 
+ #include "ufo/uvideodriver.hpp"
+ 
++#include <climits>
++#include <cstring>
++
+ namespace ufo {
+ bool operator<(const UPluginInfo & p1, const UPluginInfo & p2) {
+ 	return ((p1.category < p2.category) || (p1.feature < p2.feature));
+Index: boson-0.13/ufo/src/ubuttongroup.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/ubuttongroup.cpp
++++ boson-0.13/ufo/src/ubuttongroup.cpp
+@@ -31,6 +31,8 @@
+ // special case for radio buttons
+ #include "ufo/widgets/uradiobutton.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ UFO_IMPLEMENT_DYNAMIC_CLASS(UButtonGroup, UObject)
+Index: boson-0.13/ufo/src/ucontextgroup.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/ucontextgroup.cpp
++++ boson-0.13/ufo/src/ucontextgroup.cpp
+@@ -31,6 +31,8 @@
+ #include "ufo/utoolkit.hpp"
+ #include "ufo/uvolatiledata.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ UFO_IMPLEMENT_DYNAMIC_CLASS(UContextGroup, UObject)
+Index: boson-0.13/ufo/src/ukeystroke.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/ukeystroke.cpp
++++ boson-0.13/ufo/src/ukeystroke.cpp
+@@ -30,6 +30,7 @@
+ #include "ufo/events/ukeyevent.hpp"
+ #include "ufo/util/ustring.hpp"
+ 
++#include <algorithm>
+ 
+ using namespace ufo;
+ 
+Index: boson-0.13/ufo/src/umenumanager.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/umenumanager.cpp
++++ boson-0.13/ufo/src/umenumanager.cpp
+@@ -38,6 +38,8 @@
+ #include "ufo/widgets/upopupmenu.hpp"
+ #include "ufo/widgets/urootpane.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ UFO_IMPLEMENT_DYNAMIC_CLASS(UMenuManager, UObject)
+Index: boson-0.13/ufo/src/uobject.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/uobject.cpp
++++ boson-0.13/ufo/src/uobject.cpp
+@@ -30,6 +30,8 @@
+ #include "ufo/signals/ufo_signals.hpp"
+ #include "ufo/ufo_types.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ #ifdef UFO_RTTI
+Index: boson-0.13/ufo/src/ufo_debug.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/ufo_debug.cpp
++++ boson-0.13/ufo/src/ufo_debug.cpp
+@@ -27,6 +27,7 @@
+ 
+ #include "ufo/ufo_global.hpp"
+ 
++#include <cstdlib>
+ #include <cstring>
+ #include <cstdarg>
+ #include <cstdio> // for vsnprintf
+Index: boson-0.13/ufo/src/gl/ugl_driver.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/gl/ugl_driver.cpp
++++ boson-0.13/ufo/src/gl/ugl_driver.cpp
+@@ -29,6 +29,8 @@
+ 
+ #include "ufo/usharedlib.hpp"
+ 
++#include <cstdlib>
++
+ #ifdef UFO_OS_WIN32
+ #define UFO_GL_LIB "OPENGL32.DLL"
+ #else
+Index: boson-0.13/ufo/src/ux/uxdisplay.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/ux/uxdisplay.cpp
++++ boson-0.13/ufo/src/ux/uxdisplay.cpp
+@@ -43,6 +43,8 @@
+ 
+ #include "ufo/gl/ugl_driver.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ UFO_IMPLEMENT_DYNAMIC_CLASS(UXDisplay, UAbstractDisplay)
+Index: boson-0.13/ufo/src/widgets/uwidget.cpp
+===================================================================
+--- boson-0.13.orig/ufo/src/widgets/uwidget.cpp
++++ boson-0.13/ufo/src/widgets/uwidget.cpp
+@@ -69,6 +69,8 @@
+ 
+ #include "ufo/umodel.hpp"
+ 
++#include <algorithm>
++
+ using namespace ufo;
+ 
+ class PaintNotifier
+Index: boson-0.13/boson/programs/mainnoguimain.cpp
+===================================================================
+--- boson-0.13.orig/boson/programs/mainnoguimain.cpp
++++ boson-0.13/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();
+ 

Modified: packages/trunk/boson/debian/patches/series
===================================================================
--- packages/trunk/boson/debian/patches/series	2008-03-03 15:28:04 UTC (rev 5991)
+++ packages/trunk/boson/debian/patches/series	2008-03-03 17:12:10 UTC (rev 5992)
@@ -3,3 +3,4 @@
 fix_UTS_RELEASE_location.diff
 avoid_libpython-detection-error.diff
 bounit_desktop_fix.diff
+fix_gcc-4.3.diff

More information about the Pkg-games-commits mailing list