diff options
Diffstat (limited to 'Build/source/libs')
19 files changed, 156 insertions, 16 deletions
diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 5dfb805aa19..4b4133b1e9e 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS): Add -DNONDLL. + 2010-01-11 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac, Makefile.am: Use libfreetype. diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am index 3de2e7a401c..f09f4bc0b1b 100644 --- a/Build/source/libs/gd/Makefile.am +++ b/Build/source/libs/gd/Makefile.am @@ -43,6 +43,8 @@ SUBDIRS = include INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) +AM_CPPFLAGS = -DNONDLL + noinst_LIBRARIES=libgd.a nodist_libgd_a_SOURCES = \ diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index d2e4e198a47..47564293133 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -278,6 +278,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(GD_TREE) $(GD_TREE)-PATCHES SUBDIRS = include INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(FREETYPE2_INCLUDES) +AM_CPPFLAGS = -DNONDLL noinst_LIBRARIES = libgd.a nodist_libgd_a_SOURCES = \ $(GD_TREE)/gd.c \ diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog index a7dc9945a3d..8998fd069cc 100644 --- a/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-SIZEOF_WCHAR_T (new): MinGW32 fix. + * patch-04-math_h-WIN32 (new): #include <math.h> also for WIN32. + 2009-10-20 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-virtual (new): Declare destructors as virtual to diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T new file mode 100644 index 00000000000..86ff5fdc3c2 --- /dev/null +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-03-SIZEOF_WCHAR_T @@ -0,0 +1,17 @@ +diff -ur engine-2.3.1.orig/src/font/FileFont.cpp engine-2.3.1/src/font/FileFont.cpp +--- engine-2.3.1.orig/src/font/FileFont.cpp 2009-01-21 23:36:42.000000000 +0100 ++++ engine-2.3.1/src/font/FileFont.cpp 2010-02-19 23:30:05.299876675 +0100 +@@ -208,10 +208,10 @@ + } + // } + #else +- m_stuFaceName.assign(rgchwFace); ++ // m_stuFaceName.assign(rgchwFace); + // VS 2005 needs this: +- //for (int cch16 = 0; cch16 < cchw; cch16++) +- // m_stuFaceName.push_back(rgchwFace[cch16]); ++ for (int cch16 = 0; cch16 < cchw; cch16++) ++ m_stuFaceName.push_back(rgchwFace[cch16]); + #endif + pTable = readTable(ktiHead, lSize); + if (!m_fIsValid || !pTable) diff --git a/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32 b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32 new file mode 100644 index 00000000000..3f84de21aa7 --- /dev/null +++ b/Build/source/libs/graphite/engine-2.3.1-PATCHES/patch-04-math_h-WIN32 @@ -0,0 +1,13 @@ +diff -ur engine-2.3.1.orig/src/segment/GrTableManager.cpp engine-2.3.1/src/segment/GrTableManager.cpp +--- engine-2.3.1.orig/src/segment/GrTableManager.cpp 2009-01-28 03:01:29.000000000 +0100 ++++ engine-2.3.1/src/segment/GrTableManager.cpp 2010-02-21 17:51:33.772814394 +0100 +@@ -25,8 +25,8 @@ + DEFINE_THIS_FILE + #ifndef _WIN32 + #include <stdlib.h> +-#include <math.h> + #endif ++#include <math.h> + + //:>******************************************************************************************** + //:> Forward declarations diff --git a/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp b/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp index 4600b788ed2..4e5f2a62578 100644 --- a/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp +++ b/Build/source/libs/graphite/engine-2.3.1/src/font/FileFont.cpp @@ -208,10 +208,10 @@ FileFont::initializeFromFace() } // } #else - m_stuFaceName.assign(rgchwFace); + // m_stuFaceName.assign(rgchwFace); // VS 2005 needs this: - //for (int cch16 = 0; cch16 < cchw; cch16++) - // m_stuFaceName.push_back(rgchwFace[cch16]); + for (int cch16 = 0; cch16 < cchw; cch16++) + m_stuFaceName.push_back(rgchwFace[cch16]); #endif pTable = readTable(ktiHead, lSize); if (!m_fIsValid || !pTable) diff --git a/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp b/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp index ff675adb0ad..e01dcf13c7b 100644 --- a/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp +++ b/Build/source/libs/graphite/engine-2.3.1/src/segment/GrTableManager.cpp @@ -25,8 +25,8 @@ Description: DEFINE_THIS_FILE #ifndef _WIN32 #include <stdlib.h> -#include <math.h> #endif +#include <math.h> //:>******************************************************************************************** //:> Forward declarations diff --git a/Build/source/libs/obsdcompat/ChangeLog b/Build/source/libs/obsdcompat/ChangeLog index d7a2bd06abd..22b95a1bed4 100644 --- a/Build/source/libs/obsdcompat/ChangeLog +++ b/Build/source/libs/obsdcompat/ChangeLog @@ -1,3 +1,8 @@ +2010-02-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * includes.h [__MINGW32__]: Temporarily #define eof as macro + while #including <fcntl.h>. + 2009-05-09 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Don't check LLONG_MAX twice, otherwise may use diff --git a/Build/source/libs/obsdcompat/includes.h b/Build/source/libs/obsdcompat/includes.h index 32e2b64c2e2..2a3b1539ab5 100644 --- a/Build/source/libs/obsdcompat/includes.h +++ b/Build/source/libs/obsdcompat/includes.h @@ -34,7 +34,21 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #include <stdio.h> #include <ctype.h> #include <errno.h> +#ifdef __MINGW32__ +/* In mingw32, the eof() function is part of the !_NO_OLDNAMES section + of <io.h>, that is read in automatically via <fcntl.h>. We cannot + allow that because web2c/lib/eofeoln.c defines a private, + incompatible function named eof(). + But many of the other things defined via !_NO_OLDNAMES are needed, + so #define _NO_OLDNAMES cannot be used. So, temporarily define eof + as a macro. +*/ +#define eof saved_eof #include <fcntl.h> /* For O_NONBLOCK */ +#undef eof +#else +#include <fcntl.h> /* For O_NONBLOCK */ +#endif #include <stdlib.h> #include <string.h> #include <stdarg.h> diff --git a/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/ChangeLog b/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/ChangeLog index 027432f275e..96bf45444a4 100644 --- a/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/ChangeLog +++ b/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-02-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-case-sensitive (new): #include <windows.h> instead + of <Windows.h> for, e.g., Linux => MinGW32 cross compilation. + 2009-10-18 Peter Breitenlohner <peb@mppmu.mpg.de> Reconstruct TL TECkit sources from distributed tarball. diff --git a/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/patch-04-case-sensitive b/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/patch-04-case-sensitive new file mode 100644 index 00000000000..1260a168a8f --- /dev/null +++ b/Build/source/libs/teckit/TECkit-2.5.1-PATCHES/patch-04-case-sensitive @@ -0,0 +1,36 @@ +diff -ur TECkit-2.5.1.orig/source/Engine.cpp TECkit-2.5.1/source/Engine.cpp +--- TECkit-2.5.1.orig/source/Engine.cpp 2009-10-01 22:17:12.000000000 +0200 ++++ TECkit-2.5.1/source/Engine.cpp 2010-02-19 23:07:46.220357097 +0100 +@@ -50,7 +50,7 @@ + # define WIN32_LEAN_AND_MEAN + # define NOSERVICE + # define NOMCX +-# include <Windows.h> ++# include <windows.h> + + BOOL WINAPI + DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) +diff -ur TECkit-2.5.1.orig/source/Sample-tools/version_defs.h TECkit-2.5.1/source/Sample-tools/version_defs.h +--- TECkit-2.5.1.orig/source/Sample-tools/version_defs.h 2008-04-07 16:21:12.000000000 +0200 ++++ TECkit-2.5.1/source/Sample-tools/version_defs.h 2010-02-19 23:07:48.540313972 +0100 +@@ -7,7 +7,7 @@ + + // version_defs.h -- common pieces included in all the version resources + +-#include <Windows.h> ++#include <windows.h> + + // version numbers that should be updated for each release + #define VER_FILEVERSION 2,5,1,0 +diff -ur TECkit-2.5.1.orig/source/version_defs.h TECkit-2.5.1/source/version_defs.h +--- TECkit-2.5.1.orig/source/version_defs.h 2008-04-07 16:21:12.000000000 +0200 ++++ TECkit-2.5.1/source/version_defs.h 2010-02-19 23:07:42.120470272 +0100 +@@ -7,7 +7,7 @@ + + // version_defs.h -- common pieces included in all the version resources + +-#include <Windows.h> ++#include <windows.h> + + // version numbers that should be updated for each release + #define VER_FILEVERSION 2,5,1,0 diff --git a/Build/source/libs/teckit/TECkit-2.5.1/source/Engine.cpp b/Build/source/libs/teckit/TECkit-2.5.1/source/Engine.cpp index 4d8eb837d59..8e779ddbb54 100644 --- a/Build/source/libs/teckit/TECkit-2.5.1/source/Engine.cpp +++ b/Build/source/libs/teckit/TECkit-2.5.1/source/Engine.cpp @@ -50,7 +50,7 @@ Description: # define WIN32_LEAN_AND_MEAN # define NOSERVICE # define NOMCX -# include <Windows.h> +# include <windows.h> BOOL WINAPI DllMain(HINSTANCE /*hInst*/, DWORD /*wDataSeg*/, LPVOID /*lpReserved*/) diff --git a/Build/source/libs/teckit/TECkit-2.5.1/source/Sample-tools/version_defs.h b/Build/source/libs/teckit/TECkit-2.5.1/source/Sample-tools/version_defs.h index 6411d742803..b3b1e450df1 100644 --- a/Build/source/libs/teckit/TECkit-2.5.1/source/Sample-tools/version_defs.h +++ b/Build/source/libs/teckit/TECkit-2.5.1/source/Sample-tools/version_defs.h @@ -7,7 +7,7 @@ GNU Lesser General Public License, as specified in the LICENSING.txt file. // version_defs.h -- common pieces included in all the version resources -#include <Windows.h> +#include <windows.h> // version numbers that should be updated for each release #define VER_FILEVERSION 2,5,1,0 diff --git a/Build/source/libs/teckit/TECkit-2.5.1/source/version_defs.h b/Build/source/libs/teckit/TECkit-2.5.1/source/version_defs.h index 67218665425..da41a0b2af0 100644 --- a/Build/source/libs/teckit/TECkit-2.5.1/source/version_defs.h +++ b/Build/source/libs/teckit/TECkit-2.5.1/source/version_defs.h @@ -7,7 +7,7 @@ GNU Lesser General Public License, as specified in the LICENSING.txt file. // version_defs.h -- common pieces included in all the version resources -#include <Windows.h> +#include <windows.h> // version numbers that should be updated for each release #define VER_FILEVERSION 2,5,1,0 diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog new file mode 100644 index 00000000000..42a931e4484 --- /dev/null +++ b/Build/source/libs/zziplib/ChangeLog @@ -0,0 +1,9 @@ +2010-02-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Test for <zlib.h> requires to set ZLIB flags. + Test for <winnt.h> and <winbase.h> needs #include <windows.h>. + +2010-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index dd81e032ee4..f2b199a1a0c 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -48,7 +48,7 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap + ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/zziplib-aligned-access.m4 \ diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure index 1a7acd1e708..248ef7d7278 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -4693,7 +4693,7 @@ fi done -for ac_header in stdint.h unistd.h windows.h winnt.h winbase.h sys/int_types.h +for ac_header in stdint.h unistd.h windows.h sys/int_types.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4707,6 +4707,21 @@ fi done +for ac_header in winnt.h winbase.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <windows.h> +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + for ac_header in sys/types.h sys/mman.h sys/stat.h sys/param.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -4720,7 +4735,7 @@ _ACEOF fi done - for ac_header in io.h direct.h zlib.h byteswap.h + for ac_header in io.h direct.h byteswap.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4751,8 +4766,8 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether can use mmap for file scanning" >&5 $as_echo_n "checking whether can use mmap for file scanning... " >&6; } enable_mmap='no (just a bit slower)' -test "$ac_cv_header_winbase_h" && enable_mmap="yes, winbase.h" -test "$ac_cv_header_sys_mman_h" && enable_mmap="yes, sys/mman.h" +test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h" +test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h" case "$enable_mmap" in yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';; esac @@ -5431,6 +5446,18 @@ kpse_save_LIBS=$LIBS eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" +for ac_header in zlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" +if test "x$ac_cv_header_zlib_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ZLIB_H 1 +_ACEOF + +fi + +done + ac_fn_c_check_func "$LINENO" "zlibVersion" "ac_cv_func_zlibVersion" if test "x$ac_cv_func_zlibVersion" = x""yes; then : diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac index 06f730dd67d..ac940feb1c2 100644 --- a/Build/source/libs/zziplib/configure.ac +++ b/Build/source/libs/zziplib/configure.ac @@ -31,16 +31,17 @@ KPSE_COMPILER_WARNINGS # Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT -AC_CHECK_HEADERS([stdint.h unistd.h windows.h winnt.h winbase.h sys/int_types.h]) +AC_CHECK_HEADERS([stdint.h unistd.h windows.h sys/int_types.h]) +AC_CHECK_HEADERS([winnt.h winbase.h], , , [#include <windows.h>]) AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/stat.h sys/param.h]) dnl posix'ish -AC_CHECK_HEADERS([io.h direct.h zlib.h byteswap.h]) +AC_CHECK_HEADERS([io.h direct.h byteswap.h]) AC_CHECK_HEADERS([fnmatch.h]) # --------------------------------------------------------------- AC_MSG_CHECKING([whether can use mmap for file scanning]) enable_mmap='no (just a bit slower)' -test "$ac_cv_header_winbase_h" && enable_mmap="yes, winbase.h" -test "$ac_cv_header_sys_mman_h" && enable_mmap="yes, sys/mman.h" +test "x$ac_cv_header_winbase_h" = xyes && enable_mmap="yes, winbase.h" +test "x$ac_cv_header_sys_mman_h" = xyes && enable_mmap="yes, sys/mman.h" case "$enable_mmap" in yes*) ZZIPLIB_DEFINES='-D_USE_MMAP';; esac @@ -71,6 +72,7 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno]) if test "x$enable_build" != xno || test -f config.force; then KPSE_ADD_FLAGS([zlib]) +AC_CHECK_HEADERS([zlib.h]) AC_CHECK_FUNC([zlibVersion], , [AC_ERROR([zlib not found])]) KPSE_RESTORE_FLAGS |