tag 369090 patch
thanks dude
On Sat, May 27, 2006, Martin Michlmayr wrote:
> Package: glob2
> Version: 0.8.16-2
> Severity: serious
>
> This package fails to build from source with:
>
> powerpc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I../..
> -I/usr/include/freetype2 -I/usr/include/SDL -D_REENTRANT -I./../include/
> -I/usr/include/SDL -D_REENTRANT -Wall -g -c SDL_ttf.c
> SDL_ttf.c:46:38: error: freetype/internal/ftobjs.h: No such file or directory
> SDL_ttf.c: In function ‘TTF_OpenFontIndexRW’:
> SDL_ttf.c:273: error: dereferencing pointer to incomplete type
> make[4]: *** [SDL_ttf.o] Error 1
> make[4]: Leaving directory `/home/tbm/src/test/glob2-0.8.16/libgag/src'
Attached is a patch that addresses the FTBFS. It is included in the NMU
that has just been uploaded, as part of the 0-day NMU policy.
I hope this helps,
--
adn
Mohammed Adnène Trojette
diff -u glob2-0.8.16/debian/changelog glob2-0.8.16/debian/changelog
--- glob2-0.8.16/debian/changelog
+++ glob2-0.8.16/debian/changelog
@@ -1,3 +1,13 @@
+glob2 (0.8.16-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove include of obsolete internals (closes: #369090).
+ * GCC 4.1 qualification.
+ + Include patch from Martin Michlmayr (closes: #357552).
+ * Bump Standards-Version (no changes needed).
+
+ -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Mon, 5 Jun 2006 20:12:54
+0200
+
glob2 (0.8.16-2) unstable; urgency=low
* A problem in my local tree caused a missing icon in the 0.8.16-1 release,
diff -u glob2-0.8.16/debian/control glob2-0.8.16/debian/control
--- glob2-0.8.16/debian/control
+++ glob2-0.8.16/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: David Martínez Moreno <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev (>=1.2.0),
libsdl-image1.2-dev (>=1.2.0), libsdl-net1.2-dev (>=1.2.0), libglu1-xorg-dev |
libglu-dev, libvorbis-dev, libspeex-dev, libfreetype6-dev
-Standards-Version: 3.6.2.1
+Standards-Version: 3.7.2
Package: glob2
Architecture: any
diff -u glob2-0.8.16/config.sub glob2-0.8.16/config.sub
--- glob2-0.8.16/config.sub
+++ glob2-0.8.16/config.sub
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-07-08'
+timestamp='2006-02-23'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +119,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* |
uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* |
rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -171,6 +172,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +192,10 @@
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -239,7 +248,7 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore
\
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -257,8 +266,9 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | ms1 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
| or32 \
| pdp10 | pdp11 | pj | pjl \
@@ -286,6 +296,9 @@
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -336,8 +349,9 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
- | ms1-* \
+ | mt-* \
| msp430-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -696,6 +710,9 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -803,6 +820,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -859,6 +882,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -1174,21 +1201,23 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd*
\
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* |
-mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku*)
+ | -skyos* | -haiku* | -rdos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff -u glob2-0.8.16/config.guess glob2-0.8.16/config.guess
--- glob2-0.8.16/config.guess
+++ glob2-0.8.16/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-08-03'
+timestamp='2006-02-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) &&
exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15
;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n
"$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp)
; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating
insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
;
@@ -206,6 +206,9 @@
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
@@ -764,7 +767,12 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'`
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e
's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed
-e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -772,6 +780,9 @@
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS_NT-*:*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -779,8 +790,11 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ x86:Interix*:[345]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[345]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -851,7 +865,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +888,11 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -919,6 +941,9 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
@@ -964,7 +989,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
LIBC=gnu
#else
LIBC=gnuaout
@@ -974,7 +999,11 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1185,7 +1214,6 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1264,6 +1292,9 @@
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/
.*$//'
exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
only in patch2:
unchanged:
--- glob2-0.8.16.orig/src/IRC.h
+++ glob2-0.8.16/src/IRC.h
@@ -69,7 +69,7 @@
char diffusion[IRC_CHANNEL_SIZE+1];
char message[IRC_MESSAGE_SIZE+1];
- ChatMessage::ChatMessage() { source[0]=0; diffusion[0]=0;
message[0]=0; }
+ ChatMessage() { source[0]=0; diffusion[0]=0; message[0]=0; }
};
struct InfoMessage
@@ -79,7 +79,7 @@
char diffusion[IRC_CHANNEL_SIZE+1];
char message[IRC_MESSAGE_SIZE+1];
- InfoMessage::InfoMessage(InfoMessageType t) { type=t;
source[0]=0; diffusion[0]=0; message[0]=0; }
+ InfoMessage(InfoMessageType t) { type=t; source[0]=0;
diffusion[0]=0; message[0]=0; }
};
protected:
only in patch2:
unchanged:
--- glob2-0.8.16.orig/src/GameGUILoadSave.cpp
+++ glob2-0.8.16/src/GameGUILoadSave.cpp
@@ -31,7 +31,7 @@
{
public:
- FuncFileList::FuncFileList(int x, int y, int w, int h, Uint32 hAlign,
Uint32 vAlign, const char *font,
+ FuncFileList(int x, int y, int w, int h, Uint32 hAlign, Uint32 vAlign,
const char *font,
const char *dir, const char *extension, const bool recurse,
std::string (*filenameToNameFunc)(const char *filename),
std::string (*nameToFilenameFunc)(const char *dir, const char
*name, const char *extension))
@@ -41,16 +41,16 @@
this->generateList();
}
- FuncFileList::~FuncFileList()
+ ~FuncFileList()
{}
private:
- std::string FuncFileList::fileToList(const char* fileName) const
+ std::string fileToList(const char* fileName) const
{
return filenameToNameFunc(fullName(fileName).c_str());
}
- std::string FuncFileList::listToFile(const char* listName) const
+ std::string listToFile(const char* listName) const
{
return nameToFilenameFunc(fullDir().c_str(), listName,
extension.c_str());
}
only in patch2:
unchanged:
--- glob2-0.8.16.orig/src/EndGameScreen.h
+++ glob2-0.8.16/src/EndGameScreen.h
@@ -65,7 +65,7 @@
protected:
//! resort players
- void EndGameScreen::sortAndSet(EndOfGameStat::Type type);
+ void sortAndSet(EndOfGameStat::Type type);
public:
EndGameScreen(GameGUI *gui);
only in patch2:
unchanged:
--- glob2-0.8.16.orig/libgag/src/SDL_ttf.c
+++ glob2-0.8.16/libgag/src/SDL_ttf.c
@@ -43,7 +43,6 @@
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#include FT_TRUETYPE_IDS_H
-#include <freetype/internal/ftobjs.h>
#ifndef FT_OPEN_STREAM
#define FT_OPEN_STREAM ft_open_stream
@@ -270,7 +269,7 @@
}
memset(stream, 0, sizeof(*stream));
- stream->memory = library->memory;
+ stream->memory = NULL;
stream->read = RWread;
stream->descriptor.pointer = src;
stream->pos = (unsigned long)position;
