r5667 - in packages/trunk/asc/debian: . patches
Ansgar Burchardt
ansgar-guest at alioth.debian.org
Wed Feb 6 22:09:05 UTC 2008
Author: ansgar-guest
Date: 2008-02-06 22:09:05 +0000 (Wed, 06 Feb 2008)
New Revision: 5667
Added:
packages/trunk/asc/debian/patches/
packages/trunk/asc/debian/patches/gcc-4.3-fixes
packages/trunk/asc/debian/patches/series
Modified:
packages/trunk/asc/debian/changelog
packages/trunk/asc/debian/control
packages/trunk/asc/debian/rules
Log:
* Use quilt for patch management
* Fix build with g++-4.3 (Closes: #417112)
Modified: packages/trunk/asc/debian/changelog
===================================================================
--- packages/trunk/asc/debian/changelog 2008-02-06 20:27:00 UTC (rev 5666)
+++ packages/trunk/asc/debian/changelog 2008-02-06 22:09:05 UTC (rev 5667)
@@ -1,3 +1,10 @@
+asc (2.0.1.0-2) UNRELEASED; urgency=low
+
+ * Use quilt for patch management
+ * Fix build with g++-4.3 (Closes: #417112)
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Wed, 06 Feb 2008 22:20:29 +0100
+
asc (2.0.1.0-1) unstable; urgency=low
[ Eddy Petrișor ]
Modified: packages/trunk/asc/debian/control
===================================================================
--- packages/trunk/asc/debian/control 2008-02-06 20:27:00 UTC (rev 5666)
+++ packages/trunk/asc/debian/control 2008-02-06 22:09:05 UTC (rev 5667)
@@ -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>, Bartosz Fenski <fenio at debian.org>, Alexander Schmehl <tolimar at debian.org>, Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev (>=1.2.7+1.2.8cvs20041007-5.2), libsdl-mixer1.2-dev, libsdl-image1.2-dev (>= 1.2.3-5), libsdl-sound1.2-dev, libsigc++-1.2-dev, libparagui1.0-dev (>= 1.0.4-10), libphysfs-dev, libxt-dev, libartsc0-dev, libesd0-dev, libboost-dev, libboost-regex-dev, libbz2-dev, zip
+Build-Depends: debhelper (>= 5.0.0), quilt, libsdl1.2-dev (>=1.2.7+1.2.8cvs20041007-5.2), libsdl-mixer1.2-dev, libsdl-image1.2-dev (>= 1.2.3-5), libsdl-sound1.2-dev, libsigc++-1.2-dev, libparagui1.0-dev (>= 1.0.4-10), libphysfs-dev, libxt-dev, libartsc0-dev, libesd0-dev, libboost-dev, libboost-regex-dev, libbz2-dev, zip
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/asc/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/asc/?op=log
Added: packages/trunk/asc/debian/patches/gcc-4.3-fixes
===================================================================
--- packages/trunk/asc/debian/patches/gcc-4.3-fixes (rev 0)
+++ packages/trunk/asc/debian/patches/gcc-4.3-fixes 2008-02-06 22:09:05 UTC (rev 5667)
@@ -0,0 +1,250 @@
+Index: asc/source/libs/paragui/src/core/pgfilearchive.cpp
+===================================================================
+--- asc.orig/source/libs/paragui/src/core/pgfilearchive.cpp
++++ asc/source/libs/paragui/src/core/pgfilearchive.cpp
+@@ -36,6 +36,7 @@
+ #include "physfsrwops.h"
+ #include <iostream>
+ #include "paragui.h"
++#include <cstring>
+
+ Uint32 PG_FileArchive::my_instance_count = 0;
+ PG_SurfaceCache PG_FileArchive::my_cache;
+Index: asc/source/libs/loki/Reference/SmallObj.cpp
+===================================================================
+--- asc.orig/source/libs/loki/Reference/SmallObj.cpp
++++ asc/source/libs/loki/Reference/SmallObj.cpp
+@@ -17,6 +17,7 @@
+
+ #include "SmallObj.h"
+ #include <cassert>
++#include <climits>
+ #include <algorithm>
+ #include <functional>
+
+Index: asc/source/sdl/sound.cpp
+===================================================================
+--- asc.orig/source/sdl/sound.cpp
++++ asc/source/sdl/sound.cpp
+@@ -8,6 +8,11 @@
+ ***************************************************************************/
+
+
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include <cstring>
+Index: asc/source/ASCStringHelpers.h
+===================================================================
+--- asc.orig/source/ASCStringHelpers.h
++++ asc/source/ASCStringHelpers.h
+@@ -7,9 +7,9 @@
+ #include <cstdio>
+ #include <memory>
+ #include <string>
+-#include <wchar.h>
+-#include <stdio.h>
+-#include <ctype.h>
++#include <cstring>
++#include <cwchar>
++#include <cctype>
+
+ using std::auto_ptr;
+ using std::string;
+@@ -205,9 +205,9 @@
+ assert ( pS != NULL );
+
+ #ifdef ASC_UNICODE
+- return ::wcslen ( pS );
++ return std::wcslen ( pS );
+ #else
+- return ::strlen ( pS );
++ return std::strlen ( pS );
+ #endif
+ }
+
+@@ -231,9 +231,9 @@
+ assert ( pDest != NULL );
+
+ #ifdef ASC_UNICODE
+- return ::wcscpy ( pDest, pSrc );
++ return std::wcscpy ( pDest, pSrc );
+ #else
+- return ::strcpy ( pDest, pSrc );
++ return std::strcpy ( pDest, pSrc );
+ #endif
+ }
+
+@@ -373,7 +373,7 @@
+ _Strlwr ( l_pS1 );
+ _Strlwr ( l_pS2 );
+
+- return ::wcscmp ( l_pS1, l_pS2 );
++ return std::wcscmp ( l_pS1, l_pS2 );
+ #else
+ return ::strcasecmp ( pS1, pS2 );
+ #endif
+@@ -413,7 +413,7 @@
+ #ifdef ASC_UNICODE
+ return ::vsnwprintf ( buffer, count, format, argptr );
+ #else
+- return ::vsnprintf ( buffer, count, format, argptr );
++ return std::vsnprintf ( buffer, count, format, argptr );
+ #endif
+ }
+
+@@ -441,9 +441,9 @@
+ int nRes = 0;
+
+ #ifdef ASC_UNICODE
+- nRes = ::vwprintf ( format, argptr );
++ nRes = std::vwprintf ( format, argptr );
+ #else
+- nRes = ::vprintf ( format, argptr );
++ nRes = std::vprintf ( format, argptr );
+ #endif
+
+ va_end ( argptr );
+@@ -472,7 +472,7 @@
+ assert ( pSrc != NULL );
+
+ #ifdef ASC_UNICODE
+- return ::mbstowcs( pDest, pSrc, count );
++ return std::mbstowcs( pDest, pSrc, count );
+ #else
+ return std::wcstombs( pDest, pSrc, count );
+ #endif
+Index: asc/source/dialogs/exchangegraphics.cpp
+===================================================================
+--- asc.orig/source/dialogs/exchangegraphics.cpp
++++ asc/source/dialogs/exchangegraphics.cpp
+@@ -15,6 +15,11 @@
+ * *
+ ***************************************************************************/
+
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include "../paradialog.h"
+Index: asc/source/widgets/textrenderer.cpp
+===================================================================
+--- asc.orig/source/widgets/textrenderer.cpp
++++ asc/source/widgets/textrenderer.cpp
+@@ -16,7 +16,11 @@
+ ***************************************************************************/
+
+
+-
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+ #include <pglabel.h>
+ #include <pgimage.h>
+Index: asc/source/sg.cpp
+===================================================================
+--- asc.orig/source/sg.cpp
++++ asc/source/sg.cpp
+@@ -77,6 +77,11 @@
+ #include <algorithm>
+ #include <memory>
+
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include "paradialog.h"
+Index: asc/source/widgets/textrenderer-addons.cpp
+===================================================================
+--- asc.orig/source/widgets/textrenderer-addons.cpp
++++ asc/source/widgets/textrenderer-addons.cpp
+@@ -16,7 +16,11 @@
+ ***************************************************************************/
+
+
+-
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+ #include <pglabel.h>
+ #include <pgimage.h>
+Index: asc/source/fieldimageloader.cpp
+===================================================================
+--- asc.orig/source/fieldimageloader.cpp
++++ asc/source/fieldimageloader.cpp
+@@ -19,6 +19,11 @@
+ #include <algorithm>
+ #include <iostream>
+ #include <SDL_image.h>
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include "global.h"
+Index: asc/source/sgstream.cpp
+===================================================================
+--- asc.orig/source/sgstream.cpp
++++ asc/source/sgstream.cpp
+@@ -36,6 +36,11 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fstream>
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include "global.h"
+Index: asc/source/textfile_evaluation.cpp
+===================================================================
+--- asc.orig/source/textfile_evaluation.cpp
++++ asc/source/textfile_evaluation.cpp
+@@ -36,6 +36,11 @@
+ #include "Windows.h"
+ #endif
+
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+
+Index: asc/source/tools/makegfx.cpp
+===================================================================
+--- asc.orig/source/tools/makegfx.cpp
++++ asc/source/tools/makegfx.cpp
+@@ -10,6 +10,11 @@
+ #include <SDL_image.h>
+ #include <SDL.h>
+
++/* WORKAROUND:
++ * Boost does not #include <climits>, but uses CHAR_BIT, etc. This
++ * causes a build failure on g++-4.3.
++ */
++#include <climits>
+ #include <boost/regex.hpp>
+
+ #include "../basegfx.h"
Added: packages/trunk/asc/debian/patches/series
===================================================================
--- packages/trunk/asc/debian/patches/series (rev 0)
+++ packages/trunk/asc/debian/patches/series 2008-02-06 22:09:05 UTC (rev 5667)
@@ -0,0 +1 @@
+gcc-4.3-fixes
Modified: packages/trunk/asc/debian/rules
===================================================================
--- packages/trunk/asc/debian/rules 2008-02-06 20:27:00 UTC (rev 5666)
+++ packages/trunk/asc/debian/rules 2008-02-06 22:09:05 UTC (rev 5667)
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# rules file for asc (May 2004)
+include /usr/share/quilt/quilt.make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -20,7 +21,7 @@
CFLAGS += -O2
endif
-config.status: configure
+config.status: configure patch
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -40,7 +41,8 @@
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
More information about the Pkg-games-commits
mailing list