r6226 - in packages/trunk/clanlib/debian: . patches

[Barry deFreese]

Author: bddebian-guest
Date: 2008-03-19 18:27:30 +0000 (Wed, 19 Mar 2008)
New Revision: 6226

Added:
   packages/trunk/clanlib/debian/patches/305_gcc43.diff
Modified:
   packages/trunk/clanlib/debian/changelog
   packages/trunk/clanlib/debian/control
   packages/trunk/clanlib/debian/patches/series
Log:
305_gcc43.diff - New patch to build with gcc-4.3.


Modified: packages/trunk/clanlib/debian/changelog
===================================================================
--- packages/trunk/clanlib/debian/changelog	2008-03-19 17:35:35 UTC (rev 6225)
+++ packages/trunk/clanlib/debian/changelog	2008-03-19 18:27:30 UTC (rev 6226)
@@ -3,6 +3,7 @@
   [ Sam Hocevar ]
   * New upstream release (Closes: #188449, #299524, #383972).
     + Clanlib no longer ships lua. (Closes: #467577, #467578).
+      + Removed all lua build-deps and deps.
   * Set maintainer to the Games team (Closes: #414533).
   * Use quilt for patch management.
   * debian/control:
@@ -31,8 +32,7 @@
   * Remove root / from .install files.
   * Add build-dependencies: libxmu-dev, libxi-dev, xsltproc, libsdl1.2-dev, 
     + libsdl-gfx1.2-dev, libasound2-dev.
-  * Add build-dep for libsdl1.2-dev and libsdl-gfx1.2-dev.
-  * Add build-dep for xsltproc.
+  * 305_gcc43.diff - Build with gcc-4.3. (Closes: #454818).
   * Bump Standards Version to 3.7.3. (No changes needed).
   * Add myself to uploaders.
 

Modified: packages/trunk/clanlib/debian/control
===================================================================
--- packages/trunk/clanlib/debian/control	2008-03-19 17:35:35 UTC (rev 6225)
+++ packages/trunk/clanlib/debian/control	2008-03-19 18:27:30 UTC (rev 6226)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake1.9, bzip2, hermes1-dev, libesd0-dev, libfreetype6-dev, libglu1-xorg-dev | libgl-dev, libjpeg62-dev, liblualib40-dev, libtolua-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
+Build-Depends: debhelper (>= 5.0), quilt, autoconf, automake1.9, bzip2, hermes1-dev, libesd0-dev, libfreetype6-dev, libglu1-xorg-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-3), libxt-dev, libxxf86vm-dev, pkg-config, zlib1g-dev, libxmu-dev, libxi-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, xsltproc, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386]
 Build-Conflicts: libutahglx-dev
 Standards-Version: 3.7.3
 Homepage: http://www.clanlib.org/
@@ -55,7 +55,7 @@
 Section: libdevel
 Architecture: any
 Depends: libclanapp-0.8-1, libclansdl-0.8-1
-Recommends: hermes1-dev, libfreetype6-dev, libglu1-xorg-dev | xlibmesa-dev | libgl-dev, libjpeg62-dev, liblua40-dev, liblualib40-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev, tolua-dev
+Recommends: hermes1-dev, libfreetype6-dev, libglu1-xorg-dev | xlibmesa-dev | libgl-dev, libjpeg62-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev
 Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3), clanlib-dev
 Provides: clanlib-dev
 Replaces: clanlib-dev

Added: packages/trunk/clanlib/debian/patches/305_gcc43.diff
===================================================================
--- packages/trunk/clanlib/debian/patches/305_gcc43.diff	                        (rev 0)
+++ packages/trunk/clanlib/debian/patches/305_gcc43.diff	2008-03-19 18:27:30 UTC (rev 6226)
@@ -0,0 +1,19 @@
+diff -urN ClanLib-0.8.1.orig/Sources/GL/opengl.cpp ClanLib-0.8.1/Sources/GL/opengl.cpp
+--- ClanLib-0.8.1.orig/Sources/GL/opengl.cpp	2006-10-26 21:55:01.000000000 -0400
++++ ClanLib-0.8.1/Sources/GL/opengl.cpp	2008-03-19 14:25:18.000000000 -0400
+@@ -51,6 +51,8 @@
+ #endif
+ #endif
+ 
++#include <cstring>
++
+ std::vector<std::string> CL_OpenGL::m_ignored_gl_extension;
+ 
+ CL_ProcAddress *CL_OpenGL::get_proc_address(const std::string& function_name)
+@@ -414,4 +416,4 @@
+ #endif
+ 	
+ 	m_ignored_gl_extension.push_back(extension_name);
+-}
+\ No newline at end of file
++}

Modified: packages/trunk/clanlib/debian/patches/series
===================================================================
--- packages/trunk/clanlib/debian/patches/series	2008-03-19 17:35:35 UTC (rev 6225)
+++ packages/trunk/clanlib/debian/patches/series	2008-03-19 18:27:30 UTC (rev 6226)
@@ -2,3 +2,4 @@
 010_full_linking.diff
 200_kfreebsd.diff
 300_rebootstrap.diff
+305_gcc43.diff