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

[Gonéri LE BOUDER]

Author: goneri-guest
Date: 2008-03-17 21:50:17 +0000 (Mon, 17 Mar 2008)
New Revision: 6147

Added:
   packages/trunk/boson/debian/patches/fix_glGetString_with_amd64.diff
   packages/trunk/boson/debian/patches/fix_python2.5type_issue.diff
Modified:
   packages/trunk/boson/debian/changelog
   packages/trunk/boson/debian/patches/series
Log:
apply Pabs and Mark Hymers patches


Modified: packages/trunk/boson/debian/changelog
===================================================================
--- packages/trunk/boson/debian/changelog	2008-03-17 21:28:55 UTC (rev 6146)
+++ packages/trunk/boson/debian/changelog	2008-03-17 21:50:17 UTC (rev 6147)
@@ -4,6 +4,8 @@
   * Add patch for boson-bounit.desktop - Add categories and comments
   * changes avoid_libpython-detection-error.diff to use cmake own
     python detection script
+  * Apply Paul Wise patch to fix the segfault with Mesa7 on AMD64
+    thank you Pabs! (Closes: #439973, #450825)
 
   [ Eddy Petrișor ]
   * remove myself from the Uploaders list
@@ -25,8 +27,11 @@
   [ Eddy Petrișor ]
   * fix Vcs-Svn URL to point to svn, not the incomplete ssh location
 
- -- Eddy Petrișor <eddy.petrisor at gmail.com>  Wed, 05 Mar 2008 02:01:35 +0200
+  [ Mark Hymers ]
+  * Fix type issue on 64-bit machines with python2.5 (Closes: #471153)
 
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 17 Mar 2008 22:48:55 +0100
+
 boson (0.13-2) unstable; urgency=low
 
   * remove libvorbis-dev from boson dependency (Closes: #385189)

Added: packages/trunk/boson/debian/patches/fix_glGetString_with_amd64.diff
===================================================================
--- packages/trunk/boson/debian/patches/fix_glGetString_with_amd64.diff	                        (rev 0)
+++ packages/trunk/boson/debian/patches/fix_glGetString_with_amd64.diff	2008-03-17 21:50:17 UTC (rev 6147)
@@ -0,0 +1,17 @@
+Index: boson-0.13/bogl/bogl.cpp
+===================================================================
+--- boson-0.13.orig/bogl/bogl.cpp	2008-03-17 21:59:24.000000000 +0100
++++ boson-0.13/bogl/bogl.cpp	2008-03-17 22:00:29.000000000 +0100
+@@ -45,8 +45,10 @@
+ 
+ QStringList boglGetOpenGLExtensions()
+ {
+- QString extensions = (const char*)glGetString(GL_EXTENSIONS);
+- return QStringList::split(" ", extensions);
++// QString extensions = (const char*)glGetString(GL_EXTENSIONS);
++// return QStringList::split(" ", extensions);
++// patch by Paul Wise to avoid a segfault on AMD64
++  return BoGL::bogl()->OpenGLExtensions();
+ }
+ 
+ QStringList boglGetGLUExtensions()

Added: packages/trunk/boson/debian/patches/fix_python2.5type_issue.diff
===================================================================
--- packages/trunk/boson/debian/patches/fix_python2.5type_issue.diff	                        (rev 0)
+++ packages/trunk/boson/debian/patches/fix_python2.5type_issue.diff	2008-03-17 21:50:17 UTC (rev 6147)
@@ -0,0 +1,20 @@
+--- boson-0.13.orig/boson/gameengine/script/pythonscript.cpp
++++ boson-0.13/boson/gameengine/script/pythonscript.cpp
+@@ -688,7 +688,7 @@
+   //  variables or submodules dict if possible.
+   PyObject* key;
+   PyObject* value;
+-  int pos = 0;
++  Py_Ssize_t pos = 0;
+   while(PyDict_Next(moduledict, &pos, &key, &value))
+   {
+     // Check if value is any of the known types
+@@ -774,7 +774,7 @@
+   boDebug(700) << k_funcinfo << "Loading and merging " << PyDict_Size(submodules) << " submodules" << endl;
+   PyObject* key;
+   PyObject* value;
+-  int pos = 0;
++  Py_Ssize_t pos = 0;
+   while(PyDict_Next(submodules, &pos, &key, &value))
+   {
+     // Check if current module already has module with this name

Modified: packages/trunk/boson/debian/patches/series
===================================================================
--- packages/trunk/boson/debian/patches/series	2008-03-17 21:28:55 UTC (rev 6146)
+++ packages/trunk/boson/debian/patches/series	2008-03-17 21:50:17 UTC (rev 6147)
@@ -1,3 +1,4 @@
+fix_glGetString_with_amd64.diff
 boson_0_13_upstream_fixes.diff
 fix_gcc-4.2.diff
 fix_UTS_RELEASE_location.diff
@@ -4,3 +5,4 @@
 avoid_libpython-detection-error.diff
 bounit_desktop_fix.diff
 fix_gcc-4.3.diff
+fix_type_issue.diff