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

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-06-19 13:54:26 +0000 (Tue, 19 Jun 2007)
New Revision: 2987

Added:
   packages/trunk/boson/debian/patches/fix_gcc-4.2.diff
Modified:
   packages/trunk/boson/debian/changelog
   packages/trunk/boson/debian/control
   packages/trunk/boson/debian/patches/series
Log:
+  * apply patch by Martin Michlmayr to fix a FTBFS with gcc 4.2
+    (Closes: #409512)
+  * build depends on libqt >= 3:3.3.7-5 to avoid a FTBFS with gcc 4.2


Modified: packages/trunk/boson/debian/changelog
===================================================================
--- packages/trunk/boson/debian/changelog	2007-06-19 13:35:10 UTC (rev 2986)
+++ packages/trunk/boson/debian/changelog	2007-06-19 13:54:26 UTC (rev 2987)
@@ -1,8 +1,11 @@
 boson (0.13-2) unstable; urgency=low
 
-  * remove libvorbis-dev from boson dependency (Closes: #385189) 
+  * remove libvorbis-dev from boson dependency (Closes: #385189)
+  * apply patch by Martin Michlmayr to fix a FTBFS with gcc 4.2
+    (Closes: #409512)
+  * build depends on libqt >= 3:3.3.7-5 to avoid a FTBFS with gcc 4.2
 
- -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun,  3 Jun 2007 00:25:38 +0200
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Tue, 19 Jun 2007 15:39:07 +0200
 
 boson (0.13-1) experimental; urgency=low
 

Modified: packages/trunk/boson/debian/control
===================================================================
--- packages/trunk/boson/debian/control	2007-06-19 13:35:10 UTC (rev 2986)
+++ packages/trunk/boson/debian/control	2007-06-19 13:54:26 UTC (rev 2987)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Alexander Schmehl <tolimar at debian.org>, Eddy Petrișor <eddy.petrisor at gmail.com>
-Build-Depends: debhelper (>> 5.0.0), libkdegames-dev, wml, libqt3-mt-dev,
- kdelibs4-dev, lib3ds-dev, docbook-to-man, kdemultimedia-dev, xutils,
- python-dev, libtool, libopenal-dev, libalut-dev, cmake (>= 2.4.2),
+Build-Depends: debhelper (>> 5.0.0), libkdegames-dev, wml, libqt3-mt-dev
+ (>= 3:3.3.7-5),  kdelibs4-dev, lib3ds-dev, docbook-to-man, kdemultimedia-dev,
+ xutils, python-dev, libtool, libopenal-dev, libalut-dev, cmake (>= 2.4.2),
  binutils (>= 2.14.90.0.7), quilt
 Standards-Version: 3.7.2
 

Added: packages/trunk/boson/debian/patches/fix_gcc-4.2.diff
===================================================================
--- packages/trunk/boson/debian/patches/fix_gcc-4.2.diff	                        (rev 0)
+++ packages/trunk/boson/debian/patches/fix_gcc-4.2.diff	2007-06-19 13:54:26 UTC (rev 2987)
@@ -0,0 +1,26 @@
+Index: boson-0.13/bogl/gl/bogl_2_0_decl_p.h
+===================================================================
+--- boson-0.13.orig/bogl/gl/bogl_2_0_decl_p.h	2007-05-14 00:25:49.000000000 +0200
++++ boson-0.13/bogl/gl/bogl_2_0_decl_p.h	2007-05-14 00:26:03.000000000 +0200
+@@ -290,7 +290,7 @@
+ 	typedef GLvoid (*_glShaderSource)(GLuint, GLsizei, const GLchar**, const GLint*);
+ 	typedef GLvoid (*_glCompileShader)(GLuint);
+ 	typedef GLvoid (*_glDeleteShader)(GLuint);
+-	typedef GLuint (*_glCreateProgram)();
++	typedef GLuint (*_glCreateProgram)(void);
+ 	typedef GLvoid (*_glAttachShader)(GLuint, GLuint);
+ 	typedef GLvoid (*_glDetachShader)(GLuint, GLuint);
+ 	typedef GLvoid (*_glLinkProgram)(GLuint);
+Index: boson-0.13/bogl/gl/extensions/arb_shader_objects_decl_p.h
+===================================================================
+--- boson-0.13.orig/bogl/gl/extensions/arb_shader_objects_decl_p.h	2007-05-14 00:22:44.000000000 +0200
++++ boson-0.13/bogl/gl/extensions/arb_shader_objects_decl_p.h	2007-05-14 00:25:13.000000000 +0200
+@@ -37,7 +37,7 @@
+ 	typedef GLhandleARB (*_glCreateShaderObjectARB) (GLenum);
+ 	typedef GLvoid (*_glShaderSourceARB) (GLhandleARB, GLsizei, const GLcharARB**, const GLint*);
+ 	typedef GLvoid (*_glCompileShaderARB) (GLhandleARB);
+-	typedef GLhandleARB (*_glCreateProgramObjectARB) ();
++	typedef GLhandleARB (*_glCreateProgramObjectARB) (void);
+ 	typedef GLvoid (*_glAttachObjectARB) (GLhandleARB, GLhandleARB);
+ 	typedef GLvoid (*_glLinkProgramARB) (GLhandleARB);
+ 	typedef GLvoid (*_glUseProgramObjectARB) (GLhandleARB);

Modified: packages/trunk/boson/debian/patches/series
===================================================================
--- packages/trunk/boson/debian/patches/series	2007-06-19 13:35:10 UTC (rev 2986)
+++ packages/trunk/boson/debian/patches/series	2007-06-19 13:54:26 UTC (rev 2987)
@@ -1 +1,2 @@
 boson_0_13_upstream_fixes.diff
+fix_gcc-4.2.diff