Mercurial > mxe-octave
changeset 972:e5d55b815b89
improved naming of patch files
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Fri, 14 May 2010 19:59:46 +0200 |
| parents | d22c7eaea312 |
| children | 4df75ab7a04d |
| files | src/aubio-1-fix-pkg-config.patch src/aubio-fix-pkg-config.patch src/devil-1-png.patch src/devil-png.patch src/exiv2-1-bugfix.patch src/exiv2-bugfix.patch src/flac-1-win32.patch src/flac-win32.patch src/fribidi-1-fix-gassert.patch src/fribidi-fix-gassert.patch src/gdal-1-fix-pg.patch src/gdal-fix-pg.patch src/gsoap-1-link-dom.patch src/gsoap-link-dom.patch src/guile-1-win32.patch src/guile-win32.patch src/id3lib-1-win32.patch src/id3lib-win32.patch src/jpeg-1-win32.patch src/jpeg-win32.patch src/libgsf-1-no-gettext.patch src/libgsf-no-gettext.patch src/libodbc++-1-win32.patch src/libodbc++-win32.patch src/libpano13-1-fix-jpeg-win32.patch src/libpano13-fix-jpeg-win32.patch src/openssl-001-mingw.patch src/openssl-1-mingw.patch src/pdflib_lite-1-mingw.patch src/pdflib_lite-mingw.patch src/portaudio-1-win32.patch src/portaudio-win32.patch src/proj-1-mutex-win32.patch src/proj-mutex-win32.patch src/qt-1-win32.patch src/qt-win32.patch src/smpeg-1-freebsd-amd64.patch src/smpeg-freebsd-amd64.patch src/zlib-1-win32-static.patch src/zlib-win32-static.patch src/zziplib-1-fix-fnmatch.patch src/zziplib-fix-fnmatch.patch |
| diffstat | 42 files changed, 1474 insertions(+), 1474 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/aubio-1-fix-pkg-config.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,16 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -urN aubio-0.3.2.orig/configure.ac aubio-0.3.2/configure.ac +--- aubio-0.3.2.orig/configure.ac 2006-10-09 01:11:39.000000000 +0200 ++++ aubio-0.3.2/configure.ac 2010-01-26 23:07:23.000000000 +0100 +@@ -135,9 +135,6 @@ + [Defined when c99 style varargs macros are supported]) + fi + +-dnl Check for pkg-config +-AC_PATH_PROG(PKG_CONFIG,pkg-config,no) +- + PKG_CHECK_MODULES(SNDLIB, sndfile >= 1.0.4, SNDLIB_SUPPORT=1) + PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, SAMPLERATE_SUPPORT=1) +
--- a/src/aubio-fix-pkg-config.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN aubio-0.3.2.orig/configure.ac aubio-0.3.2/configure.ac ---- aubio-0.3.2.orig/configure.ac 2006-10-09 01:11:39.000000000 +0200 -+++ aubio-0.3.2/configure.ac 2010-01-26 23:07:23.000000000 +0100 -@@ -135,9 +135,6 @@ - [Defined when c99 style varargs macros are supported]) - fi - --dnl Check for pkg-config --AC_PATH_PROG(PKG_CONFIG,pkg-config,no) -- - PKG_CHECK_MODULES(SNDLIB, sndfile >= 1.0.4, SNDLIB_SUPPORT=1) - PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, SAMPLERATE_SUPPORT=1) -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/devil-1-png.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,36 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c +--- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8/src-IL/src/il_icon.c 2010-02-01 16:01:37.000000000 +0100 +@@ -525,7 +525,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(ico_png_ptr); ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); + } + + // Expand RGB images with transparency to full alpha channels +diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c +--- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100 ++++ devil-1.7.8/src-IL/src/il_png.c 2010-02-01 15:58:41.000000000 +0100 +@@ -105,7 +105,7 @@ + Read = iread(Signature, 1, 8); + iseek(-Read, IL_SEEK_CUR); + +- return png_check_sig(Signature, 8); ++ return !png_sig_cmp(Signature, 0, 8); + } + + +@@ -278,7 +278,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // Expand RGB images with transparency to full alpha channels
--- a/src/devil-png.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c ---- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8/src-IL/src/il_icon.c 2010-02-01 16:01:37.000000000 +0100 -@@ -525,7 +525,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(ico_png_ptr); -+ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); - } - - // Expand RGB images with transparency to full alpha channels -diff -urN devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c ---- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 08:10:09.000000000 +0100 -+++ devil-1.7.8/src-IL/src/il_png.c 2010-02-01 15:58:41.000000000 +0100 -@@ -105,7 +105,7 @@ - Read = iread(Signature, 1, 8); - iseek(-Read, IL_SEEK_CUR); - -- return png_check_sig(Signature, 8); -+ return !png_sig_cmp(Signature, 0, 8); - } - - -@@ -278,7 +278,7 @@ - - // Expand low-bit-depth grayscale images to 8 bits - if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - } - - // Expand RGB images with transparency to full alpha channels
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/exiv2-1-bugfix.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,15 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru exiv2-0.19.orig/src/convert.cpp exiv2-0.19/src/convert.cpp ++++ exiv2-0.19.orig/src/convert.cpp 2009-12-28 15:47:58.000000000 +0100 +--- exiv2-0.19/src/convert.cpp 2010-03-25 01:14:57.000000000 +0100 +@@ -406,7 +406,7 @@ + { mdIptc, "Iptc.Application2.SuppCategory", "Xmp.photoshop.SupplementalCategory", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, + { mdIptc, "Iptc.Application2.Keywords", "Xmp.dc.subject", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, + { mdIptc, "Iptc.Application2.SubLocation", "Xmp.iptc.Location", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, +- { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instruction", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, ++ { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instructions", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, + { mdIptc, "Iptc.Application2.DateCreated", "Xmp.photoshop.DateCreated", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, + { mdIptc, "Iptc.Application2.Byline", "Xmp.dc.creator", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, + { mdIptc, "Iptc.Application2.BylineTitle", "Xmp.photoshop.AuthorsPosition", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
--- a/src/exiv2-bugfix.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru exiv2-0.19.orig/src/convert.cpp exiv2-0.19/src/convert.cpp -+++ exiv2-0.19.orig/src/convert.cpp 2009-12-28 15:47:58.000000000 +0100 ---- exiv2-0.19/src/convert.cpp 2010-03-25 01:14:57.000000000 +0100 -@@ -406,7 +406,7 @@ - { mdIptc, "Iptc.Application2.SuppCategory", "Xmp.photoshop.SupplementalCategory", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.Keywords", "Xmp.dc.subject", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.SubLocation", "Xmp.iptc.Location", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, -- { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instruction", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, -+ { mdIptc, "Iptc.Application2.SpecialInstructions","Xmp.photoshop.Instructions", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.DateCreated", "Xmp.photoshop.DateCreated", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.Byline", "Xmp.dc.creator", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc }, - { mdIptc, "Iptc.Application2.BylineTitle", "Xmp.photoshop.AuthorsPosition", &Converter::cnvIptcValue, &Converter::cnvXmpValueToIptc },
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/flac-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,15 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h +--- flac-1.2.1.orig/include/share/alloc.h 2007-09-12 07:32:21.000000000 +0200 ++++ flac-1.2.1/include/share/alloc.h 2009-10-27 19:55:58.000000000 +0100 +@@ -35,7 +35,7 @@ + + #ifndef SIZE_MAX + # ifndef SIZE_T_MAX +-# ifdef _MSC_VER ++# if defined _MSC_VER || defined __MINGW32__ + # define SIZE_T_MAX UINT_MAX + # else + # error
--- a/src/flac-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h ---- flac-1.2.1.orig/include/share/alloc.h 2007-09-12 07:32:21.000000000 +0200 -+++ flac-1.2.1/include/share/alloc.h 2009-10-27 19:55:58.000000000 +0100 -@@ -35,7 +35,7 @@ - - #ifndef SIZE_MAX - # ifndef SIZE_T_MAX --# ifdef _MSC_VER -+# if defined _MSC_VER || defined __MINGW32__ - # define SIZE_T_MAX UINT_MAX - # else - # error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/fribidi-1-fix-gassert.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,14 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h +--- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 18:13:24.000000000 +0200 ++++ fribidi-0.19.2/lib/fribidi-common.h 2010-02-24 17:20:47.000000000 +0100 +@@ -63,6 +63,7 @@ + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC + # include <glib/gmacros.h> ++# include <glib/gtestutils.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS + # define FRIBIDI_END_DECLS G_END_DECLS
--- a/src/fribidi-fix-gassert.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h ---- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 18:13:24.000000000 +0200 -+++ fribidi-0.19.2/lib/fribidi-common.h 2010-02-24 17:20:47.000000000 +0100 -@@ -63,6 +63,7 @@ - #if FRIBIDI_USE_GLIB+0 - # ifndef __FRIBIDI_DOC - # include <glib/gmacros.h> -+# include <glib/gtestutils.h> - # endif /* !__FRIBIDI_DOC */ - # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS - # define FRIBIDI_END_DECLS G_END_DECLS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gdal-1-fix-pg.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,15 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru gdal-1.7.1.orig/configure.in gdal-1.7.1/configure.in +--- gdal-1.7.1.orig/configure.in 2010-02-08 20:52:34.000000000 +0100 ++++ gdal-1.7.1/configure.in 2010-02-15 15:39:39.000000000 +0100 +@@ -418,7 +418,7 @@ + AC_MSG_RESULT([yes]) + + ax_save_LIBS="${LIBS}" +- LIBS=-L`$PG_CONFIG --libdir`" -lpq" ++ LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS" + AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,) + LIBS="${ax_save_LIBS}" +
--- a/src/gdal-fix-pg.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru gdal-1.7.1.orig/configure.in gdal-1.7.1/configure.in ---- gdal-1.7.1.orig/configure.in 2010-02-08 20:52:34.000000000 +0100 -+++ gdal-1.7.1/configure.in 2010-02-15 15:39:39.000000000 +0100 -@@ -418,7 +418,7 @@ - AC_MSG_RESULT([yes]) - - ax_save_LIBS="${LIBS}" -- LIBS=-L`$PG_CONFIG --libdir`" -lpq" -+ LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS" - AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,) - LIBS="${ax_save_LIBS}" -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gsoap-1-link-dom.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,40 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am +--- a/gsoap/Makefile.am 2009-11-07 21:07:06.000000000 +0100 ++++ b/gsoap/Makefile.am 2010-01-22 21:33:36.000000000 +0100 +@@ -31,22 +31,26 @@ + stdsoap2_ssl_cpp.cpp: stdsoap2.cpp + $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp + ++## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs ++dom_cpp.cpp: dom.cpp ++ $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp ++ + lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a + +-libgsoap_a_SOURCES = stdsoap2.c ++libgsoap_a_SOURCES = stdsoap2.c dom.c + libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) +-libgsoap___a_SOURCES = stdsoap2_cpp.cpp ++libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp + libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) +-libgsoapck_a_SOURCES = stdsoap2_ck.c ++libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c + libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES +-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp ++libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp + libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES +-libgsoapssl_a_SOURCES = stdsoap2_ssl.c ++libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c + libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP +-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp ++libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp + libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP + +-BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES) ++BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) + + include_HEADERS = stdsoap2.h +
--- a/src/gsoap-link-dom.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -urN a/gsoap/Makefile.am b/gsoap/Makefile.am ---- a/gsoap/Makefile.am 2009-11-07 21:07:06.000000000 +0100 -+++ b/gsoap/Makefile.am 2010-01-22 21:33:36.000000000 +0100 -@@ -31,22 +31,26 @@ - stdsoap2_ssl_cpp.cpp: stdsoap2.cpp - $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp - -+## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs -+dom_cpp.cpp: dom.cpp -+ $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp -+ - lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a - --libgsoap_a_SOURCES = stdsoap2.c -+libgsoap_a_SOURCES = stdsoap2.c dom.c - libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) --libgsoap___a_SOURCES = stdsoap2_cpp.cpp -+libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp - libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) --libgsoapck_a_SOURCES = stdsoap2_ck.c -+libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c - libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES --libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp -+libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp - libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES --libgsoapssl_a_SOURCES = stdsoap2_ssl.c -+libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c - libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP --libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp -+libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp - libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP - --BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES) -+BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) - - include_HEADERS = stdsoap2.h -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/guile-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,48 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure +--- guile-1.8.7.orig/configure 2009-07-05 22:25:00.000000000 +0200 ++++ guile-1.8.7/configure 2010-04-10 07:35:25.000000000 +0200 +@@ -35057,6 +35057,7 @@ + $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } + old_CFLAGS="$CFLAGS" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" ++if test "$cross_compiling" = "no"; then + if test "$cross_compiling" = yes; then + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +@@ -35140,6 +35141,9 @@ + fi + + ++else ++works=no ++fi + CFLAGS="$old_CFLAGS" + { $as_echo "$as_me:$LINENO: result: $works" >&5 + $as_echo "$works" >&6; } +diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure +--- guile-1.8.7.orig/guile-readline/configure 2009-07-05 22:24:45.000000000 +0200 ++++ guile-1.8.7/guile-readline/configure 2010-04-10 07:36:18.000000000 +0200 +@@ -12353,7 +12353,7 @@ + fi + + +-for termlib in ncurses curses termcap terminfo termlib ; do ++for termlib in ncurses curses termcap terminfo termlib pdcurses ; do + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5 + $as_echo_n "checking for tgoto in -l${termlib}... " >&6; } +diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h +--- guile-1.8.7.orig/libguile/__scm.h 2009-07-04 00:18:59.000000000 +0200 ++++ guile-1.8.7/libguile/__scm.h 2010-04-10 07:58:48.000000000 +0200 +@@ -150,7 +150,7 @@ + which should be exported or imported in the resulting dynamic link + library (DLL) in the Win32 port. */ + +-#if defined (SCM_IMPORT) ++#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT) + # define SCM_API __declspec (dllimport) extern + #elif defined (SCM_EXPORT) || defined (DLL_EXPORT) + # define SCM_API __declspec (dllexport) extern
--- a/src/guile-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure ---- guile-1.8.7.orig/configure 2009-07-05 22:25:00.000000000 +0200 -+++ guile-1.8.7/configure 2010-04-10 07:35:25.000000000 +0200 -@@ -35057,6 +35057,7 @@ - $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } - old_CFLAGS="$CFLAGS" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -+if test "$cross_compiling" = "no"; then - if test "$cross_compiling" = yes; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -@@ -35140,6 +35141,9 @@ - fi - - -+else -+works=no -+fi - CFLAGS="$old_CFLAGS" - { $as_echo "$as_me:$LINENO: result: $works" >&5 - $as_echo "$works" >&6; } -diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure ---- guile-1.8.7.orig/guile-readline/configure 2009-07-05 22:24:45.000000000 +0200 -+++ guile-1.8.7/guile-readline/configure 2010-04-10 07:36:18.000000000 +0200 -@@ -12353,7 +12353,7 @@ - fi - - --for termlib in ncurses curses termcap terminfo termlib ; do -+for termlib in ncurses curses termcap terminfo termlib pdcurses ; do - as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5 - $as_echo_n "checking for tgoto in -l${termlib}... " >&6; } -diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h ---- guile-1.8.7.orig/libguile/__scm.h 2009-07-04 00:18:59.000000000 +0200 -+++ guile-1.8.7/libguile/__scm.h 2010-04-10 07:58:48.000000000 +0200 -@@ -150,7 +150,7 @@ - which should be exported or imported in the resulting dynamic link - library (DLL) in the Win32 port. */ - --#if defined (SCM_IMPORT) -+#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT) - # define SCM_API __declspec (dllimport) extern - #elif defined (SCM_EXPORT) || defined (DLL_EXPORT) - # define SCM_API __declspec (dllexport) extern
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/id3lib-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,81 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in +--- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100 +@@ -89,6 +89,8 @@ + + AC_ISC_POSIX + ++AC_CHECK_TOOL([AR], [ar], [:]) ++ + dnl Initialize libtool + AM_PROG_LIBTOOL + +@@ -227,7 +229,6 @@ + ) + AC_CHECK_HEADERS( \ + string \ +- iomanip.h \ + ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) + ) + +@@ -251,7 +252,7 @@ + AC_CHECK_FUNCS(mkstemp) + AC_CHECK_FUNCS( + truncate \ +- ,,AC_MSG_ERROR([Missing a vital function for id3lib]) ++ ,,AC_MSG_WARN([Missing a vital function for id3lib]) + ) + + dnl Checks for typedefs, structures, and compiler characteristics. +diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h +--- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100 +@@ -41,7 +41,7 @@ + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef WIN32 ++#ifdef __MSVC_VER + # define LINKOPTION_STATIC 1 //both for use and creation of static lib + # define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp + # define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic +@@ -74,11 +74,11 @@ + # define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar + # endif + # endif +-#else /* !WIN32 */ ++#else /* !__MSVC_VER */ + # define ID3_C_EXPORT + # define ID3_CPP_EXPORT + # define CCONV +-#endif /* !WIN32 */ ++#endif /* !__MSVC_VER */ + + #define ID3_C_VAR extern + +diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h +--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include <string> ++#include <cstring> + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h +--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,7 +30,7 @@ + + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include <string.h> ++#include <cstring> + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + {
--- a/src/id3lib-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in ---- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100 -@@ -89,6 +89,8 @@ - - AC_ISC_POSIX - -+AC_CHECK_TOOL([AR], [ar], [:]) -+ - dnl Initialize libtool - AM_PROG_LIBTOOL - -@@ -227,7 +229,6 @@ - ) - AC_CHECK_HEADERS( \ - string \ -- iomanip.h \ - ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) - ) - -@@ -251,7 +252,7 @@ - AC_CHECK_FUNCS(mkstemp) - AC_CHECK_FUNCS( - truncate \ -- ,,AC_MSG_ERROR([Missing a vital function for id3lib]) -+ ,,AC_MSG_WARN([Missing a vital function for id3lib]) - ) - - dnl Checks for typedefs, structures, and compiler characteristics. -diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h ---- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100 -@@ -41,7 +41,7 @@ - * we prefix variable declarations so they can - * properly get exported in windows dlls. - */ --#ifdef WIN32 -+#ifdef __MSVC_VER - # define LINKOPTION_STATIC 1 //both for use and creation of static lib - # define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp - # define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic -@@ -74,11 +74,11 @@ - # define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar - # endif - # endif --#else /* !WIN32 */ -+#else /* !__MSVC_VER */ - # define ID3_C_EXPORT - # define ID3_CPP_EXPORT - # define CCONV --#endif /* !WIN32 */ -+#endif /* !__MSVC_VER */ - - #define ID3_C_VAR extern - -diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h ---- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100 -@@ -30,6 +30,7 @@ - #define _ID3LIB_STRINGS_H_ - - #include <string> -+#include <cstring> - - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) - namespace std -diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h ---- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include "id3/writer.h" - #include "id3/id3lib_streams.h" --//#include <string.h> -+#include <cstring> - - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer - {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jpeg-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,40 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -r fcac1fe04220 jconfig.cfg +--- a/jconfig.cfg Sun Apr 25 11:28:20 2010 +0200 ++++ b/jconfig.cfg Mon Apr 26 11:32:32 2010 +0200 +@@ -16,6 +16,14 @@ + #undef NEED_SHORT_EXTERNAL_NAMES + /* Define this if you get warnings about undefined structures. */ + #undef INCOMPLETE_TYPES_BROKEN ++ ++/* Define "boolean" as unsigned char, not int, on Windows systems. */ ++#ifdef _WIN32 ++#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ ++typedef unsigned char boolean; ++#endif ++#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#endif + + #ifdef JPEG_INTERNALS + +diff -r fcac1fe04220 jconfig.txt +--- a/jconfig.txt Sun Apr 25 11:28:20 2010 +0200 ++++ b/jconfig.txt Mon Apr 26 11:32:32 2010 +0200 +@@ -91,6 +91,15 @@ + */ + #undef INCOMPLETE_TYPES_BROKEN + ++/* Define "boolean" as unsigned char, not int, on Windows systems. ++ */ ++#ifdef _WIN32 ++#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ ++typedef unsigned char boolean; ++#endif ++#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#endif ++ + + /* + * The following options affect code selection within the JPEG library,
--- a/src/jpeg-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -r fcac1fe04220 jconfig.cfg ---- a/jconfig.cfg Sun Apr 25 11:28:20 2010 +0200 -+++ b/jconfig.cfg Mon Apr 26 11:32:32 2010 +0200 -@@ -16,6 +16,14 @@ - #undef NEED_SHORT_EXTERNAL_NAMES - /* Define this if you get warnings about undefined structures. */ - #undef INCOMPLETE_TYPES_BROKEN -+ -+/* Define "boolean" as unsigned char, not int, on Windows systems. */ -+#ifdef _WIN32 -+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ -+typedef unsigned char boolean; -+#endif -+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+#endif - - #ifdef JPEG_INTERNALS - -diff -r fcac1fe04220 jconfig.txt ---- a/jconfig.txt Sun Apr 25 11:28:20 2010 +0200 -+++ b/jconfig.txt Mon Apr 26 11:32:32 2010 +0200 -@@ -91,6 +91,15 @@ - */ - #undef INCOMPLETE_TYPES_BROKEN - -+/* Define "boolean" as unsigned char, not int, on Windows systems. -+ */ -+#ifdef _WIN32 -+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ -+typedef unsigned char boolean; -+#endif -+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ -+#endif -+ - - /* - * The following options affect code selection within the JPEG library,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libgsf-1-no-gettext.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,17 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru libgsf-1.14.17.orig/configure.in libgsf-1.14.17/configure.in +--- libgsf-1.14.17.orig/configure.in 2009-11-19 01:52:56.000000000 +0100 ++++ libgsf-1.14.17/configure.in 2010-02-23 16:17:17.000000000 +0100 +@@ -53,10 +53,6 @@ + + dnl Gettext/i18n stuff + +-IT_PROG_INTLTOOL([0.35.0]) +- +-AM_GLIB_GNU_GETTEXT +- + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
--- a/src/libgsf-no-gettext.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru libgsf-1.14.17.orig/configure.in libgsf-1.14.17/configure.in ---- libgsf-1.14.17.orig/configure.in 2009-11-19 01:52:56.000000000 +0100 -+++ libgsf-1.14.17/configure.in 2010-02-23 16:17:17.000000000 +0100 -@@ -53,10 +53,6 @@ - - dnl Gettext/i18n stuff - --IT_PROG_INTLTOOL([0.35.0]) -- --AM_GLIB_GNU_GETTEXT -- - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libodbc++-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,36 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +--- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200 ++++ libodbc++-0.2.5/configure.ac 2010-02-04 22:40:32.000000000 +0100 +@@ -118,7 +118,7 @@ + if test "x$iodbc_ok" != "xyes" && + test "x$odbc_ok" != "xyes" + then +- AC_MSG_ERROR([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?]) ++ AC_MSG_WARN([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?]) + fi + + AC_ARG_WITH(odbc-version, +--- libodbc++-0.2.5.orig/src/datastream.h 2009-01-06 12:20:05.000000000 +0100 ++++ libodbc++-0.2.5/src/datastream.h 2009-10-27 23:14:22.000000000 +0100 +@@ -35,7 +35,7 @@ + #if defined(ODBCXX_QT) + # include <qiodevice.h> + #endif +- ++#include <stdio.h> + namespace odbc { + + #if !defined(ODBCXX_QT) +--- libodbc++-0.2.5.orig/include/odbc++/resultset.h 2009-03-07 07:41:09.000000000 +0100 ++++ libodbc++-0.2.5/include/odbc++/resultset.h 2009-10-27 23:07:54.000000000 +0100 +@@ -474,7 +474,7 @@ + * @param idx The column index, starting at 1 + * @param val The value to set + */ +- Guid ResultSet::getGuid(int idx); ++ Guid getGuid(int idx); + #endif + /** Sets the value of a column to an int + * @param idx The column index, starting at 1
--- a/src/libodbc++-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - ---- libodbc++-0.2.5.orig/configure.ac 2009-08-20 23:39:08.000000000 +0200 -+++ libodbc++-0.2.5/configure.ac 2010-02-04 22:40:32.000000000 +0100 -@@ -118,7 +118,7 @@ - if test "x$iodbc_ok" != "xyes" && - test "x$odbc_ok" != "xyes" - then -- AC_MSG_ERROR([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?]) -+ AC_MSG_WARN([No ODBC driver manager configured. Pperhaps you need to give configure --with-odbc=/some/location?]) - fi - - AC_ARG_WITH(odbc-version, ---- libodbc++-0.2.5.orig/src/datastream.h 2009-01-06 12:20:05.000000000 +0100 -+++ libodbc++-0.2.5/src/datastream.h 2009-10-27 23:14:22.000000000 +0100 -@@ -35,7 +35,7 @@ - #if defined(ODBCXX_QT) - # include <qiodevice.h> - #endif -- -+#include <stdio.h> - namespace odbc { - - #if !defined(ODBCXX_QT) ---- libodbc++-0.2.5.orig/include/odbc++/resultset.h 2009-03-07 07:41:09.000000000 +0100 -+++ libodbc++-0.2.5/include/odbc++/resultset.h 2009-10-27 23:07:54.000000000 +0100 -@@ -474,7 +474,7 @@ - * @param idx The column index, starting at 1 - * @param val The value to set - */ -- Guid ResultSet::getGuid(int idx); -+ Guid getGuid(int idx); - #endif - /** Sets the value of a column to an int - * @param idx The column index, starting at 1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/libpano13-1-fix-jpeg-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,12 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -r f39a7d5630f2 jpeg.c +--- a/jpeg.c Tue Apr 27 18:26:40 2010 +0200 ++++ b/jpeg.c Tue Apr 27 18:27:05 2010 +0200 +@@ -1,5 +1,4 @@ + #include <stdio.h> +-#include <jpeglib.h> + //#define __NO_SYSTEM__ + #include "filter.h" + #include "metadata.h"
--- a/src/libpano13-fix-jpeg-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -r f39a7d5630f2 jpeg.c ---- a/jpeg.c Tue Apr 27 18:26:40 2010 +0200 -+++ b/jpeg.c Tue Apr 27 18:27:05 2010 +0200 -@@ -1,5 +1,4 @@ - #include <stdio.h> --#include <jpeglib.h> - //#define __NO_SYSTEM__ - #include "filter.h" - #include "metadata.h"
--- a/src/openssl-001-mingw.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru openssl-1.0.0-orig/apps/speed.c openssl-1.0.0/apps/speed.c ---- openssl-1.0.0-orig/apps/speed.c 2010-03-03 14:56:18.000000000 -0500 -+++ openssl-1.0.0/apps/speed.c 2010-03-30 02:06:56.763000000 -0400 -@@ -295,7 +295,7 @@ - if (thr==NULL) - { - DWORD ret=GetLastError(); -- BIO_printf(bio_err,"unable to CreateThread (%d)",ret); -+ BIO_printf(bio_err,"unable to CreateThread (%u)",ret); - ExitProcess(ret); - } - CloseHandle(thr); /* detach the thread */ -diff -ru openssl-1.0.0-orig/Configure openssl-1.0.0/Configure ---- openssl-1.0.0-orig/Configure 2010-01-19 16:40:54.000000000 -0500 -+++ openssl-1.0.0/Configure 2010-03-30 02:06:49.782000000 -0400 -@@ -1035,6 +1035,8 @@ - - my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; - -+$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys()); -+ - $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); - $exe_ext=".nlm" if ($target =~ /netware/); - $exe_ext=".pm" if ($target =~ /vos/); -@@ -2040,3 +2042,11 @@ - print STDERR "No sanity errors detected!\n" if $errorcnt == 0; - return $errorcnt; - } -+ -+# Attempt to detect MSYS environment -+ -+sub is_msys -+ { -+ return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys"); -+ return 0; -+ } -diff -ru openssl-1.0.0-orig/util/pl/Mingw32.pl openssl-1.0.0/util/pl/Mingw32.pl ---- openssl-1.0.0-orig/util/pl/Mingw32.pl 2008-04-17 06:19:16.000000000 -0400 -+++ openssl-1.0.0/util/pl/Mingw32.pl 2010-03-30 02:06:53.097000000 -0400 -@@ -19,7 +19,7 @@ - if ($debug) - { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } - else -- { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } -+ { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; } - - if ($gaswin and !$no_asm) - { -@@ -66,6 +66,7 @@ - $shlibp=".a"; - $lfile=''; - -+$asmtype='coff'; - $asm='as'; - $afile='-o '; - #$bn_asm_obj="";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/openssl-1-mingw.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,59 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru openssl-1.0.0-orig/apps/speed.c openssl-1.0.0/apps/speed.c +--- openssl-1.0.0-orig/apps/speed.c 2010-03-03 14:56:18.000000000 -0500 ++++ openssl-1.0.0/apps/speed.c 2010-03-30 02:06:56.763000000 -0400 +@@ -295,7 +295,7 @@ + if (thr==NULL) + { + DWORD ret=GetLastError(); +- BIO_printf(bio_err,"unable to CreateThread (%d)",ret); ++ BIO_printf(bio_err,"unable to CreateThread (%u)",ret); + ExitProcess(ret); + } + CloseHandle(thr); /* detach the thread */ +diff -ru openssl-1.0.0-orig/Configure openssl-1.0.0/Configure +--- openssl-1.0.0-orig/Configure 2010-01-19 16:40:54.000000000 -0500 ++++ openssl-1.0.0/Configure 2010-03-30 02:06:49.782000000 -0400 +@@ -1035,6 +1035,8 @@ + + my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; + ++$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys()); ++ + $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); + $exe_ext=".nlm" if ($target =~ /netware/); + $exe_ext=".pm" if ($target =~ /vos/); +@@ -2040,3 +2042,11 @@ + print STDERR "No sanity errors detected!\n" if $errorcnt == 0; + return $errorcnt; + } ++ ++# Attempt to detect MSYS environment ++ ++sub is_msys ++ { ++ return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys"); ++ return 0; ++ } +diff -ru openssl-1.0.0-orig/util/pl/Mingw32.pl openssl-1.0.0/util/pl/Mingw32.pl +--- openssl-1.0.0-orig/util/pl/Mingw32.pl 2008-04-17 06:19:16.000000000 -0400 ++++ openssl-1.0.0/util/pl/Mingw32.pl 2010-03-30 02:06:53.097000000 -0400 +@@ -19,7 +19,7 @@ + if ($debug) + { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; } + else +- { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -mcpu=i486 -Wall"; } ++ { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -march=i486 -Wall"; } + + if ($gaswin and !$no_asm) + { +@@ -66,6 +66,7 @@ + $shlibp=".a"; + $lfile=''; + ++$asmtype='coff'; + $asm='as'; + $afile='-o '; + #$bn_asm_obj="";
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pdflib_lite-1-mingw.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,23 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://tech.groups.yahoo.com/group/pdflib/message/20472 + +diff -urN a/libs/pdcore/pc_util.c b/libs/pdcore/pc_util.c +--- a/libs/pdcore/pc_util.c 2010-04-29 15:50:05.000000000 +0200 ++++ b/libs/pdcore/pc_util.c 2010-05-11 23:59:03.915954995 +0200 +@@ -30,8 +30,12 @@ + #include <ieeefp.h> /* for finite */ + #endif + +-#if defined (isfinite) ++#if defined(isfinite) + #define PDC_ISFINITE isfinite ++#if defined(__MINGW32__) ++/* MinGW has infinite, but we still need DWORD */ ++#include <windef.h> ++#endif + #else /* isfinite */ + + #if defined(WIN32)
--- a/src/pdflib_lite-mingw.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://tech.groups.yahoo.com/group/pdflib/message/20472 - -diff -urN a/libs/pdcore/pc_util.c b/libs/pdcore/pc_util.c ---- a/libs/pdcore/pc_util.c 2010-04-29 15:50:05.000000000 +0200 -+++ b/libs/pdcore/pc_util.c 2010-05-11 23:59:03.915954995 +0200 -@@ -30,8 +30,12 @@ - #include <ieeefp.h> /* for finite */ - #endif - --#if defined (isfinite) -+#if defined(isfinite) - #define PDC_ISFINITE isfinite -+#if defined(__MINGW32__) -+/* MinGW has infinite, but we still need DWORD */ -+#include <windef.h> -+#endif - #else /* isfinite */ - - #if defined(WIN32)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/portaudio-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,89 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru portaudio-orig/configure.in portaudio/configure.in +--- portaudio-orig/configure.in 2007-11-13 22:22:56.000000000 +0100 ++++ portaudio/configure.in 2010-01-23 17:04:37.000000000 +0100 +@@ -139,6 +139,7 @@ + dnl Mac OS X configuration + + AC_DEFINE(PA_USE_COREAUDIO) ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then + SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; + CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; +@@ -167,6 +168,7 @@ + dnl MingW configuration + + echo "WINAPI: $with_winapi" ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" + if [[ $with_winapi = "directx" ]] ; then + if [[ $with_dxdir ]] ; then + DXDIR="$with_dxdir"; +@@ -174,15 +176,15 @@ + DXDIR="/usr/local/dx7sdk"; + fi + echo "DXDIR: $DXDIR" +- OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; ++ OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o"; + LIBS="-lwinmm -lm -ldsound -lole32"; + PADLL="portaudio.dll"; + THREAD_CFLAGS="-mthreads" + SHARED_FLAGS="-shared"; +- DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"; ++ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L${DXDIR}/lib -ldsound -lole32"; + #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""; + #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"; +- CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS; ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS"; + elif [[ $with_winapi = "asio" ]] ; then + if [[ $with_asiodir ]] ; then + ASIODIR="$with_asiodir"; +@@ -228,9 +230,10 @@ + + cygwin* ) + dnl Cygwin configuration +- ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" + OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; + CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI" ++ + LIBS="-lwinmm -lm"; + PADLL="portaudio.dll"; + THREAD_CFLAGS="-mthreads" +@@ -242,6 +245,7 @@ + dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003). + dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST). + dnl ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!])) + AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!])) + AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!])) +@@ -271,6 +275,7 @@ + , + AC_MSG_ERROR([libpthread not found!])) + ++ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" + if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then + DLL_LIBS="$DLL_LIBS -lasound" + OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" +@@ -305,6 +310,7 @@ + OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" + esac + CFLAGS="$CFLAGS $THREAD_CFLAGS" ++echo "CFLAGS: $CFLAGS" + + if test "$enable_cxx" = "yes"; then + AC_CONFIG_SUBDIRS([bindings/cpp]) +diff -ru portaudio-orig/Makefile.in portaudio/Makefile.in +--- portaudio-orig/Makefile.in 2007-10-24 17:29:04.000000000 +0200 ++++ portaudio/Makefile.in 2010-01-23 17:00:40.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir = @libdir@ + includedir = @includedir@ + CC = @CC@ +-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @CFLAGS@ @DEFS@ ++CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@ + LIBS = @LIBS@ + AR = @AR@ + RANLIB = @RANLIB@
--- a/src/portaudio-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru portaudio-orig/configure.in portaudio/configure.in ---- portaudio-orig/configure.in 2007-11-13 22:22:56.000000000 +0100 -+++ portaudio/configure.in 2010-01-23 17:04:37.000000000 +0100 -@@ -139,6 +139,7 @@ - dnl Mac OS X configuration - - AC_DEFINE(PA_USE_COREAUDIO) -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" - if [[ -d /Developer/SDKs/MacOSX10.5.sdk ]] ; then - SHARED_FLAGS="-Werror -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -dynamiclib -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; - CFLAGS="-Werror $CFLAGS -arch x86_64 -arch ppc64 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.3"; -@@ -167,6 +168,7 @@ - dnl MingW configuration - - echo "WINAPI: $with_winapi" -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" - if [[ $with_winapi = "directx" ]] ; then - if [[ $with_dxdir ]] ; then - DXDIR="$with_dxdir"; -@@ -174,15 +176,15 @@ - DXDIR="/usr/local/dx7sdk"; - fi - echo "DXDIR: $DXDIR" -- OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; -+ OTHER_OBJS="src/hostapi/dsound/pa_win_ds.o src/hostapi/dsound/pa_win_ds_dynlink.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o"; - LIBS="-lwinmm -lm -ldsound -lole32"; - PADLL="portaudio.dll"; - THREAD_CFLAGS="-mthreads" - SHARED_FLAGS="-shared"; -- DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L./dx7sdk/lib -ldsound -lole32"; -+ DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L${DXDIR}/lib -ldsound -lole32"; - #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""; - #CFLAGS="$CFLAGS -I$VC98 -DPA_NO_WMME -DPA_NO_ASIO"; -- CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO" -DPA_NO_WDMKS; -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I$DXDIR/include -DPA_NO_WMME -DPA_NO_ASIO -DPA_NO_WDMKS"; - elif [[ $with_winapi = "asio" ]] ; then - if [[ $with_asiodir ]] ; then - ASIODIR="$with_asiodir"; -@@ -228,9 +230,10 @@ - - cygwin* ) - dnl Cygwin configuration -- -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win" - OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o"; - CFLAGS="$CFLAGS -DPA_NO_DS -DPA_NO_WDMKS -DPA_NO_ASIO -DPA_NO_WASAPI" -+ - LIBS="-lwinmm -lm"; - PADLL="portaudio.dll"; - THREAD_CFLAGS="-mthreads" -@@ -242,6 +245,7 @@ - dnl SGI IRIX audio library (AL) configuration (Pieter, oct 2-13, 2003). - dnl The 'dmedia' library is needed to read the Unadjusted System Time (UST). - dnl -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" - AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([IRIX posix thread library not found!])) - AC_CHECK_LIB(audio, alOpenPort, , AC_MSG_ERROR([IRIX audio library not found!])) - AC_CHECK_LIB(dmedia, dmGetUST, , AC_MSG_ERROR([IRIX digital media library not found!])) -@@ -271,6 +275,7 @@ - , - AC_MSG_ERROR([libpthread not found!])) - -+ CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix" - if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then - DLL_LIBS="$DLL_LIBS -lasound" - OTHER_OBJS="$OTHER_OBJS src/hostapi/alsa/pa_linux_alsa.o" -@@ -305,6 +310,7 @@ - OTHER_OBJS="$OTHER_OBJS src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o" - esac - CFLAGS="$CFLAGS $THREAD_CFLAGS" -+echo "CFLAGS: $CFLAGS" - - if test "$enable_cxx" = "yes"; then - AC_CONFIG_SUBDIRS([bindings/cpp]) -diff -ru portaudio-orig/Makefile.in portaudio/Makefile.in ---- portaudio-orig/Makefile.in 2007-10-24 17:29:04.000000000 +0200 -+++ portaudio/Makefile.in 2010-01-23 17:00:40.000000000 +0100 -@@ -16,7 +16,7 @@ - libdir = @libdir@ - includedir = @includedir@ - CC = @CC@ --CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @CFLAGS@ @DEFS@ -+CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@ - LIBS = @LIBS@ - AR = @AR@ - RANLIB = @RANLIB@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/proj-1-mutex-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from upstream. More information: +http://trac.osgeo.org/proj/ticket/56 +http://trac.osgeo.org/proj/changeset/1790 + +--- proj/src/pj_mutex.c (revision 1788) ++++ proj/src/pj_mutex.c (revision 1790) +@@ -38,6 +38,8 @@ + #endif + +-#ifdef _WIN32 ++/* on win32 we always use win32 mutexes, even if pthreads are available */ ++#if defined(_WIN32) && !defined(MUTEX_stub) + # define MUTEX_win32 ++# undef MUTEX_pthread + #endif
--- a/src/proj-mutex-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from upstream. More information: -http://trac.osgeo.org/proj/ticket/56 -http://trac.osgeo.org/proj/changeset/1790 - ---- proj/src/pj_mutex.c (revision 1788) -+++ proj/src/pj_mutex.c (revision 1790) -@@ -38,6 +38,8 @@ - #endif - --#ifdef _WIN32 -+/* on win32 we always use win32 mutexes, even if pthreads are available */ -+#if defined(_WIN32) && !defined(MUTEX_stub) - # define MUTEX_win32 -+# undef MUTEX_pthread - #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qt-1-win32.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,838 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test +index 67a4636..fa54560 100755 +--- a/config.tests/unix/compile.test ++++ b/config.tests/unix/compile.test +@@ -66,7 +66,7 @@ cd "$OUTDIR/$TEST" + + test -r Makefile && $MAKE distclean >/dev/null 2>&1 + +-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" ++"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" + + if [ "$VERBOSE" = "yes" ]; then + $MAKE +@@ -74,7 +74,7 @@ else + $MAKE >/dev/null 2>&1 + fi + +-[ -x "$EXE" ] && SUCCESS=yes ++[ -x "$EXE" ] || [ -x "${EXE}.exe" ] && SUCCESS=yes + + # done + if [ "$SUCCESS" != "yes" ]; then +diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp +index a00bf15..cb562fe 100644 +--- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp ++++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp +@@ -42,9 +42,16 @@ + /* Sample program for configure to test for getaddrinfo on the unix + platform. we check for all structures and functions required. */ + ++#include <stdio.h> ++#include <stdlib.h> ++#ifdef __MINGW32__ ++#include <winsock2.h> ++#include <ws2tcpip.h> ++#else + #include <sys/types.h> + #include <sys/socket.h> + #include <netdb.h> ++#endif + + int main() + { +diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro +index 8cdc776..898a017 100644 +--- a/config.tests/unix/iconv/iconv.pro ++++ b/config.tests/unix/iconv/iconv.pro +@@ -1,3 +1,3 @@ + SOURCES = iconv.cpp + CONFIG -= qt dylib app_bundle +-mac:LIBS += -liconv ++mac|win32-g++:LIBS += -liconv +diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp +index 3dc30c3..5783a85 100644 +--- a/config.tests/unix/ipv6/ipv6test.cpp ++++ b/config.tests/unix/ipv6/ipv6test.cpp +@@ -46,9 +46,14 @@ platforms. We check for the required IPv6 data structures. */ + #define _HPUX_SOURCE + #endif + ++#ifdef __MINGW32__ ++#include <winsock2.h> ++#include <ws2tcpip.h> ++#else + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> ++#endif + + int main() + { +diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp +index a5d7313..3a8924c 100644 +--- a/config.tests/unix/largefile/largefiletest.cpp ++++ b/config.tests/unix/largefile/largefiletest.cpp +@@ -51,6 +51,9 @@ platforms. + #include <sys/stat.h> + #include <assert.h> + #include <stdio.h> ++#ifdef __MINGW32__ ++#define ftello ftello64 ++#endif + + int main( int, char **argv ) + { +diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp +index 7092c58..f28712e 100644 +--- a/config.tests/unix/odbc/odbc.cpp ++++ b/config.tests/unix/odbc/odbc.cpp +@@ -38,7 +38,9 @@ + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ +- ++#ifdef __MINGW32__ ++#include <windows.h> ++#endif + #include <sql.h> + #include <sqlext.h> + +diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro +index c588ede..740582a 100644 +--- a/config.tests/unix/odbc/odbc.pro ++++ b/config.tests/unix/odbc/odbc.pro +@@ -1,4 +1,5 @@ + SOURCES = odbc.cpp + CONFIG -= qt dylib + mac:CONFIG -= app_bundle +-LIBS += -lodbc ++win32-g++:LIBS += -lodbc32 ++else:LIBS += -lodbc +diff --git a/config.tests/unix/rtti/rtti.cpp b/config.tests/unix/rtti/rtti.cpp +new file mode 100644 +index 0000000..e78103c +--- /dev/null ++++ b/config.tests/unix/rtti/rtti.cpp +@@ -0,0 +1,45 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the config.tests of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++int main(int, char**) ++{ ++ return 0; ++} +diff --git a/config.tests/unix/rtti/rtti.pro b/config.tests/unix/rtti/rtti.pro +new file mode 100644 +index 0000000..d0aae30 +--- /dev/null ++++ b/config.tests/unix/rtti/rtti.pro +@@ -0,0 +1,3 @@ ++SOURCES = rtti.cpp ++CONFIG -= x11 qt ++mac:CONFIG -= app_bundle +diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro +index 432bd8d..94faf15 100644 +--- a/config.tests/x11/opengl/opengl.pro ++++ b/config.tests/x11/opengl/opengl.pro +@@ -7,4 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) { + } + + CONFIG -= qt +-LIBS += -lGL -lGLU ++win32-g++:LIBS += -lopengl32 ++else:LIBS += -lGL -lGLU +diff --git a/configure b/configure +index ed5891f..a070d78 100755 +--- a/configure ++++ b/configure +@@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + # window system detection + #------------------------------------------------------------------------------- + ++# XPLATFROM win32-g++ is treated as a subcase of PLATFORM_X11 for convenience + PLATFORM_X11=no + PLATFORM_MAC=no + PLATFORM_QWS=no +@@ -605,7 +606,7 @@ mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" + cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" + +-QMakeVar add styles "cde mac motif plastique cleanlooks windows" ++QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista" + QMakeVar add decorations "default windows styled" + QMakeVar add mouse-drivers "pc" + if [ "$UNAME_SYSTEM" = "Linux" ] ; then +@@ -733,6 +734,7 @@ CFG_MMX=auto + CFG_3DNOW=auto + CFG_SSE=auto + CFG_SSE2=auto ++CFG_RTTI=auto + CFG_REDUCE_RELOCATIONS=no + CFG_IPV6=auto + CFG_NAS=no +@@ -1602,6 +1604,13 @@ while [ "$#" -gt 0 ]; do + UNKNOWN_OPT=yes + fi + ;; ++ rtti) ++ if [ "$VAL" = "no" ]; then ++ CFG_RTTI="$VAL" ++ else ++ UNKNOWN_OPT=yes ++ fi ++ ;; + iwmmxt) + CFG_IWMMXT="yes" + ;; +@@ -3482,6 +3491,7 @@ cat << EOF + -no-3dnow .......... Do not compile with use of 3DNOW instructions. + -no-sse ............ Do not compile with use of SSE instructions. + -no-sse2 ........... Do not compile with use of SSE2 instructions. ++ -no-rtti ........... Do not compile with RTTI. + + -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'. + -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so. +@@ -4508,6 +4518,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then + fi + fi + ++# detect rtti support ++if [ "${CFG_RTTI}" = "auto" ]; then ++ if [ "$XPLATFORM" != "win32-g++" ]; then ++ CFG_RTTI=no ++ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/rtti "rtti" $L_FLAGS $I_FLAGS $l_FLAGS "-frtti"; then ++ CFG_RTTI=yes ++ else ++ CFG_RTTI=no ++ fi ++fi ++ + # check iWMMXt support + if [ "$CFG_IWMMXT" = "yes" ]; then + "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt" +@@ -4683,6 +4704,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do + if "$WHICH" pg_config >/dev/null 2>&1; then + QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` + QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` ++ QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS" + fi + [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" +@@ -4707,7 +4729,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do + ;; + odbc) + if [ "$CFG_SQL_odbc" != "no" ]; then +- if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then ++ if [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM" = "win32-g++" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + if [ "$CFG_SQL_odbc" = "auto" ]; then + CFG_SQL_odbc=plugin + fi +@@ -5002,7 +5024,10 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then + fi + + if [ "$CFG_PHONON" != "no" ]; then +- if [ "$CFG_PHONON_BACKEND" != "no" ]; then ++ if [ "$XPLATFORM" = "win32-g++" ]; then ++ echo "Will build Phonon for win32-g++" ++ CFG_PHONON=yes ++ elif [ "$CFG_PHONON_BACKEND" != "no" ]; then + if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then + if [ -n "$PKG_CONFIG" ]; then + QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` +@@ -5060,8 +5085,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then + fi + + # Check we actually have X11 :-) +- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS +- if [ $? != "0" ]; then ++ if [ "$XPLATFORM" = "win32-g++" ]; then ++ echo "Skipping XLib test for win32-g++" ++ elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + echo "Basic XLib functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." +@@ -6141,6 +6167,7 @@ fi + [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" + [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" + [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" ++[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti" + [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" + [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" + [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" +@@ -6222,7 +6249,7 @@ else + QT_CONFIG="$QT_CONFIG freetype" + fi + +-if [ "x$PLATFORM_MAC" = "xyes" ]; then ++if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then + #On Mac we implicitly link against libz, so we + #never use the 3rdparty stuff. + [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" +@@ -7161,7 +7188,7 @@ fi + + cat >>"$QTCONFIG.tmp" <<EOF + #configuration +-CONFIG += $QTCONFIG_CONFIG ++CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG + QT_ARCH = $CFG_ARCH + QT_EDITION = $Edition + QT_CONFIG += $QT_CONFIG +@@ -7434,7 +7461,7 @@ fi + echo "Declarative module .. $CFG_DECLARATIVE" + echo "STL support ......... $CFG_STL" + echo "PCH support ......... $CFG_PRECOMPILE" +-echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" ++echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" + if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then + echo "iWMMXt support ...... ${CFG_IWMMXT}" + echo "NEON support ........ ${CFG_NEON}" +@@ -7752,7 +7779,11 @@ for file in .projects .projects.3; do + [ "$IN_ROOT" = "no" ] && continue + + case $a in +- *winmain/winmain.pro) continue ;; ++ *winmain/winmain.pro) ++ case "$XPLATFORM" in ++ win32*) SPEC=$XQMAKESPEC ;; ++ *) continue ;; ++ esac ;; + *s60main/s60main.pro) continue ;; + *examples/activeqt/*) continue ;; + */qmake/qmake.pro) continue ;; +diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf +index b282f69..b537bc7 100644 +--- a/mkspecs/win32-g++/qmake.conf ++++ b/mkspecs/win32-g++/qmake.conf +@@ -3,23 +3,31 @@ + # + # Written for MinGW + # ++load(qt_config) + + MAKEFILE_GENERATOR = MINGW + TEMPLATE = app + CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header ++CONFIG += windows win32 ++CONFIG -= freetype ++QT_CONFIG -= freetype + QT += core gui + DEFINES += UNICODE QT_LARGEFILE_SUPPORT ++DEFINES -= QT_LARGEFILE_SUPPORT ++DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS + QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 + + QMAKE_EXT_OBJ = .o + QMAKE_EXT_RES = _res.o + +-QMAKE_CC = gcc ++QMAKE_CC = HOSTPLATFORMPREFIX-gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = byacc + QMAKE_YACCFLAGS = -d + QMAKE_CFLAGS = ++QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE ++QMAKE_CFLAGS += -pipe + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall + QMAKE_CFLAGS_WARN_OFF = -w +@@ -27,7 +35,7 @@ QMAKE_CFLAGS_RELEASE = -O2 + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + +-QMAKE_CXX = g++ ++QMAKE_CXX = HOSTPLATFORMPREFIX-g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +@@ -42,6 +50,7 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads + QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions + + QMAKE_INCDIR = ++QMAKE_INCDIR += . + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] + QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] + +@@ -50,8 +59,8 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< + QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src + QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< + +-QMAKE_LINK = g++ +-QMAKE_LINK_C = gcc ++QMAKE_LINK = HOSTPLATFORMPREFIX-g++ ++QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc + QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc + QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl + QMAKE_LFLAGS_EXCEPTIONS_OFF = +@@ -72,15 +81,18 @@ QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 + QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 + QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain + ++QMAKE_SH = bash ++ + !isEmpty(QMAKE_SH) { + MINGW_IN_SHELL = 1 + QMAKE_DIR_SEP = / + QMAKE_COPY = cp +- QMAKE_COPY_DIR = xcopy /s /q /y /i ++ QMAKE_COPY_DIR = cp -r + QMAKE_MOVE = mv +- QMAKE_DEL_FILE = rm +- QMAKE_MKDIR = mkdir ++ QMAKE_DEL_FILE = rm -f ++ QMAKE_MKDIR = mkdir -p + QMAKE_DEL_DIR = rmdir ++ QMAKE_SYMBOLIC_LINK = ln -s + QMAKE_CHK_DIR_EXISTS = test -d + } else { + QMAKE_COPY = copy /y +@@ -92,15 +104,16 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain + QMAKE_CHK_DIR_EXISTS = if not exist + } + +-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe +-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe +-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe ++#QMAKE_IDC = HOSTPLATFORMPREFIX-idc ++QMAKE_MOC = HOSTPLATFORMPREFIX-moc ++QMAKE_RCC = HOSTPLATFORMPREFIX-rcc ++QMAKE_UIC = HOSTPLATFORMPREFIX-uic + +-QMAKE_IDL = midl +-QMAKE_LIB = ar -ru +-QMAKE_RC = windres ++#QMAKE_IDL = midl ++QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru ++QMAKE_RC = HOSTPLATFORMPREFIX-windres + QMAKE_ZIP = zip -r -9 + +-QMAKE_STRIP = strip ++QMAKE_STRIP = HOSTPLATFORMPREFIX-strip + QMAKE_STRIPFLAGS_LIB += --strip-unneeded +-load(qt_config) ++PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config +diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +index f7d42cf..9c7993c 100644 +--- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp ++++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp +@@ -45,7 +45,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. + #endif + + #ifndef QT_NO_OPENGL +-#include <gl/gl.h> ++#include <GL/gl.h> + #ifndef GL_FRAGMENT_PROGRAM_ARB + #define GL_FRAGMENT_PROGRAM_ARB 0x8804 + #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 +diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri +index 3406e41..e171584 100644 +--- a/src/corelib/tools/tools.pri ++++ b/src/corelib/tools/tools.pri +@@ -96,8 +96,8 @@ contains(QT_CONFIG, zlib) { + ../3rdparty/zlib/uncompr.c \ + ../3rdparty/zlib/zutil.c + } else:!contains(QT_CONFIG, no-zlib) { +- unix:LIBS_PRIVATE += -lz +-# win32:LIBS += libz.lib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + + DEFINES += HB_EXPORT=Q_CORE_EXPORT +diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri +index b67be55..6642ae3 100644 +--- a/src/gui/image/image.pri ++++ b/src/gui/image/image.pri +@@ -93,11 +93,11 @@ SOURCES += \ + SOURCES += image/qpnghandler.cpp + + contains(QT_CONFIG, system-png) { +- unix:LIBS_PRIVATE += -lpng +- win32:LIBS += libpng.lib ++ unix|win32-g++:LIBS_PRIVATE += -lpng ++ win32:!win32-g++:LIBS += libpng.lib + } else { + !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE +- INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib ++ INCLUDEPATH += ../3rdparty/libpng + SOURCES += ../3rdparty/libpng/png.c \ + ../3rdparty/libpng/pngerror.c \ + ../3rdparty/libpng/pngget.c \ +@@ -115,6 +115,10 @@ SOURCES += \ + ../3rdparty/libpng/pngwutil.c \ + ../3rdparty/libpng/pnggccrd.c + } ++ contains(QT_CONFIG, system-zlib) { ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib ++ } + } else { + DEFINES *= QT_NO_IMAGEFORMAT_PNG + } +diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri +index a6cc9c7..95779a1 100644 +--- a/src/gui/painting/painting.pri ++++ b/src/gui/painting/painting.pri +@@ -387,9 +387,9 @@ neon { + } + + contains(QT_CONFIG, zlib) { +- INCLUDEPATH += ../3rdparty/zlib ++ INCLUDEPATH += ../3rdparty/zlib + } else:!contains(QT_CONFIG, no-zlib) { +- unix:LIBS_PRIVATE += -lz +-# win32:LIBS += libz.lib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + +diff --git a/src/network/access/access.pri b/src/network/access/access.pri +index aa36890..f009761 100644 +--- a/src/network/access/access.pri ++++ b/src/network/access/access.pri +@@ -59,8 +59,8 @@ SOURCES += access/qftp.cpp \ + + #zlib support + contains(QT_CONFIG, zlib) { +- INCLUDEPATH += ../3rdparty/zlib ++ INCLUDEPATH += ../3rdparty/zlib + } else:!contains(QT_CONFIG, no-zlib) { +- unix:LIBS_PRIVATE += -lz +-# win32:LIBS += libz.lib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } +diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri +index 72ea80f..cf31a5b 100644 +--- a/src/network/ssl/ssl.pri ++++ b/src/network/ssl/ssl.pri +@@ -34,6 +34,7 @@ symbian { + # Include Qt's default CA bundle + RESOURCES += network.qrc + +- # Add optional SSL libs ++ # Add optional SSL libs, but not accidently system zlib ++ !contains(QT_CONFIG, system-zlib):OPENSSL_LIBS -= -lz + LIBS_PRIVATE += $$OPENSSL_LIBS + } +diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro +index ebc79cc..30a19c6 100644 +--- a/src/plugins/imageformats/jpeg/jpeg.pro ++++ b/src/plugins/imageformats/jpeg/jpeg.pro +@@ -20,8 +20,8 @@ symbian: { + } + + contains(QT_CONFIG, system-jpeg) { +- unix:LIBS += -ljpeg +- win32:LIBS += libjpeg.lib ++ unix|win32-g++:LIBS += -ljpeg ++ win32:!win32-g++:LIBS += libjpeg.lib + } + !contains(QT_CONFIG, system-jpeg) { + INCLUDEPATH += ../../../3rdparty/libjpeg +diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro +index de7dfa7..46c84c4 100644 +--- a/src/plugins/imageformats/mng/mng.pro ++++ b/src/plugins/imageformats/mng/mng.pro +@@ -14,8 +14,8 @@ symbian: { + } + + contains(QT_CONFIG, system-mng) { +- unix:LIBS += -lmng +- win32:LIBS += libmng.lib ++ unix|win32-g++:LIBS += -lmng ++ win32:!win32-g++:LIBS += libmng.lib + } + !contains(QT_CONFIG, system-mng) { + DEFINES += MNG_BUILD_SO +@@ -44,10 +44,11 @@ contains(QT_CONFIG, system-mng) { + } + + contains(QT_CONFIG, system-zlib) { +- LIBS += -lz ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + !contains(QT_CONFIG, system-zlib) { +- INCLUDEPATH += ../../../3rdparty/zlib ++ INCLUDEPATH += ../../../3rdparty/zlib + } + + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro +index 312f99c..29d36f4 100644 +--- a/src/plugins/imageformats/tiff/tiff.pro ++++ b/src/plugins/imageformats/tiff/tiff.pro +@@ -8,8 +8,13 @@ SOURCES += main.cpp \ + qtiffhandler.cpp + + contains(QT_CONFIG, system-tiff) { +- unix:LIBS += -ltiff +- win32:LIBS += libtiff.lib ++ unix|win32-g++:LIBS += -ltiff ++ win32:!win32-g++:LIBS += libtiff.lib ++ ++ contains(QT_CONFIG, system-jpeg) { ++ unix|win32-g++:LIBS += -ljpeg ++ win32:!win32-g++:LIBS += libjpeg.lib ++ } + } + !contains(QT_CONFIG, system-tiff) { + INCLUDEPATH += ../../../3rdparty/libtiff/libtiff +@@ -62,10 +67,11 @@ contains(QT_CONFIG, system-tiff) { + } + + contains(QT_CONFIG, system-zlib) { +- LIBS += -lz ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + !contains(QT_CONFIG, system-zlib) { +- INCLUDEPATH += ../../../3rdparty/zlib ++ INCLUDEPATH += ../../../3rdparty/zlib + } + + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro +index 29fbada..0a38ee4 100644 +--- a/src/plugins/sqldrivers/psql/psql.pro ++++ b/src/plugins/sqldrivers/psql/psql.pro +@@ -4,18 +4,15 @@ HEADERS = ../../../sql/drivers/psql/qsql_psql.h + SOURCES = main.cpp \ + ../../../sql/drivers/psql/qsql_psql.cpp + +-unix: { ++unix|win32-g++: { + !isEmpty(QT_LFLAGS_PSQL) { +- LIBS *= $$QT_LFLAGS_PSQL ++ !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz ++ !static:LIBS *= $$QT_LFLAGS_PSQL + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL + } + !contains(LIBS, .*pq.*):LIBS *= -lpq + } + +-win32:!contains(LIBS, .*pq.* ) { +- !win32-g++:LIBS *= -llibpq +- win32-g++:LIBS *= -lpq +- LIBS *= -lws2_32 -ladvapi32 +-} ++win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 + + include(../qsqldriverbase.pri) +diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp +index eb654ef..0a17f17 100644 +--- a/src/plugins/sqldrivers/tds/main.cpp ++++ b/src/plugins/sqldrivers/tds/main.cpp +@@ -47,6 +47,7 @@ + #define _WINSCARD_H_ + #include <windows.h> + #endif ++#define Q_USE_SYBASE + #include "../../../sql/drivers/tds/qsql_tds.h" + + QT_BEGIN_NAMESPACE +diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro +index 08a166b..f66d5b7 100644 +--- a/src/plugins/sqldrivers/tds/tds.pro ++++ b/src/plugins/sqldrivers/tds/tds.pro +@@ -6,8 +6,9 @@ SOURCES = main.cpp \ + ../../../sql/drivers/tds/qsql_tds.cpp + + unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb ++win32-g++:LIBS *= -lsybdb -liconv -lws2_32 + +-win32 { ++win32:!win32-g++ { + !win32-borland:LIBS *= -lNTWDBLIB + win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB + } +diff --git a/src/qbase.pri b/src/qbase.pri +index 710a2b6..2c3e91c 100644 +--- a/src/qbase.pri ++++ b/src/qbase.pri +@@ -85,7 +85,6 @@ win32-borland { + } + + win32 { +- CONFIG += zlib + INCLUDEPATH += tmp + !static: DEFINES+=QT_MAKEDLL + } +diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri +index 184eca9..aac0267 100644 +--- a/src/sql/drivers/drivers.pri ++++ b/src/sql/drivers/drivers.pri +@@ -6,19 +6,16 @@ contains(sql-drivers, psql) { + HEADERS += drivers/psql/qsql_psql.h + SOURCES += drivers/psql/qsql_psql.cpp + +- unix { +- !isEmpty(QT_LFLAGS_PSQL) { +- LIBS *= $$QT_LFLAGS_PSQL ++ unix|win32-g++ { ++ !static:!isEmpty(QT_LFLAGS_PSQL) { ++ !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz ++ !static:LIBS *= $$QT_LFLAGS_PSQL + QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL + } + !contains(LIBS, .*pq.*):LIBS *= -lpq + } + +- win32 { +- !win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -llibpq +- win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -lpq +- LIBS *= -lws2_32 -ladvapi32 +- } ++ win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 + } + + contains(sql-drivers, mysql) { +diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp +index 422f866..16785ed 100644 +--- a/src/sql/drivers/tds/qsql_tds.cpp ++++ b/src/sql/drivers/tds/qsql_tds.cpp +@@ -47,7 +47,8 @@ + #else + #define Q_USE_SYBASE + #endif +- ++//Force SYBASE because we use FreeTDS ++#define Q_USE_SYBASE + #include "qsql_tds.h" + + #include <qvariant.h> +diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h +index cb318f3..a6354ce 100644 +--- a/src/sql/drivers/tds/qsql_tds.h ++++ b/src/sql/drivers/tds/qsql_tds.h +@@ -48,7 +48,8 @@ + + #ifdef Q_OS_WIN32 + #define WIN32_LEAN_AND_MEAN +-#define DBNTWIN32 // indicates 32bit windows dblib ++//#define DBNTWIN32 // indicates 32bit windows dblib ++#include <winsock2.h> + #include <QtCore/qt_windows.h> + #include <sqlfront.h> + #include <sqldb.h> +diff --git a/src/svg/svg.pro b/src/svg/svg.pro +index d2a4227..0d3ef83 100644 +--- a/src/svg/svg.pro ++++ b/src/svg/svg.pro +@@ -44,7 +44,8 @@ symbian:TARGET.UID3=0x2001B2E2 + + #zlib support + contains(QT_CONFIG, zlib) { +- INCLUDEPATH += ../3rdparty/zlib ++ INCLUDEPATH += ../3rdparty/zlib + } else:!contains(QT_CONFIG, no-zlib) { +- unix:LIBS_PRIVATE += -lz ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } +diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri +index b3ee948..18efe9d 100644 +--- a/src/tools/bootstrap/bootstrap.pri ++++ b/src/tools/bootstrap/bootstrap.pri +@@ -52,8 +52,8 @@ hpux-acc*|hpuxi-acc* { + LIBS += -lbootstrap + } + !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { +- unix:LIBS += -lz +-# win32:LIBS += libz.lib ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + win32:LIBS += -luser32 + +diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro +index 0dbb90f..e6b43a6 100644 +--- a/src/tools/bootstrap/bootstrap.pro ++++ b/src/tools/bootstrap/bootstrap.pro +@@ -109,6 +109,9 @@ contains(QT_CONFIG, zlib) { + ../3rdparty/zlib/trees.c \ + ../3rdparty/zlib/uncompr.c \ + ../3rdparty/zlib/zutil.c ++} else:!contains(QT_CONFIG, no-zlib) { ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } + + lib.CONFIG = dummy_install +diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro +index bc322b9..f1fec05 100644 +--- a/src/winmain/winmain.pro ++++ b/src/winmain/winmain.pro +@@ -11,7 +11,7 @@ win32 { + win32-g++:DEFINES += QT_NEEDS_QMAIN + win32-borland:DEFINES += QT_NEEDS_QMAIN + SOURCES = qtmain_win.cpp +- CONFIG += png zlib ++ CONFIG += png + CONFIG -= jpeg + INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore + } +diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro +index dde7e8d..556dbcb 100644 +--- a/tools/qvfb/qvfb.pro ++++ b/tools/qvfb/qvfb.pro +@@ -42,12 +42,14 @@ contains(QT_CONFIG, opengl) { + } + + contains(QT_CONFIG, system-png) { +- LIBS += -lpng ++ unix|win32-g++:LIBS_PRIVATE += -lpng ++ win32:!win32-g++:LIBS += libpng.lib + } else { + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng + } + contains(QT_CONFIG, system-zlib) { +- LIBS += -lz ++ unix|win32-g++:LIBS_PRIVATE += -lz ++ win32:!win32-g++:LIBS += zdll.lib + } else { + INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib + }
--- a/src/qt-win32.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,838 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test -index 67a4636..fa54560 100755 ---- a/config.tests/unix/compile.test -+++ b/config.tests/unix/compile.test -@@ -66,7 +66,7 @@ cd "$OUTDIR/$TEST" - - test -r Makefile && $MAKE distclean >/dev/null 2>&1 - --"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" -+"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" - - if [ "$VERBOSE" = "yes" ]; then - $MAKE -@@ -74,7 +74,7 @@ else - $MAKE >/dev/null 2>&1 - fi - --[ -x "$EXE" ] && SUCCESS=yes -+[ -x "$EXE" ] || [ -x "${EXE}.exe" ] && SUCCESS=yes - - # done - if [ "$SUCCESS" != "yes" ]; then -diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp -index a00bf15..cb562fe 100644 ---- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp -+++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp -@@ -42,9 +42,16 @@ - /* Sample program for configure to test for getaddrinfo on the unix - platform. we check for all structures and functions required. */ - -+#include <stdio.h> -+#include <stdlib.h> -+#ifdef __MINGW32__ -+#include <winsock2.h> -+#include <ws2tcpip.h> -+#else - #include <sys/types.h> - #include <sys/socket.h> - #include <netdb.h> -+#endif - - int main() - { -diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro -index 8cdc776..898a017 100644 ---- a/config.tests/unix/iconv/iconv.pro -+++ b/config.tests/unix/iconv/iconv.pro -@@ -1,3 +1,3 @@ - SOURCES = iconv.cpp - CONFIG -= qt dylib app_bundle --mac:LIBS += -liconv -+mac|win32-g++:LIBS += -liconv -diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp -index 3dc30c3..5783a85 100644 ---- a/config.tests/unix/ipv6/ipv6test.cpp -+++ b/config.tests/unix/ipv6/ipv6test.cpp -@@ -46,9 +46,14 @@ platforms. We check for the required IPv6 data structures. */ - #define _HPUX_SOURCE - #endif - -+#ifdef __MINGW32__ -+#include <winsock2.h> -+#include <ws2tcpip.h> -+#else - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> -+#endif - - int main() - { -diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp -index a5d7313..3a8924c 100644 ---- a/config.tests/unix/largefile/largefiletest.cpp -+++ b/config.tests/unix/largefile/largefiletest.cpp -@@ -51,6 +51,9 @@ platforms. - #include <sys/stat.h> - #include <assert.h> - #include <stdio.h> -+#ifdef __MINGW32__ -+#define ftello ftello64 -+#endif - - int main( int, char **argv ) - { -diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp -index 7092c58..f28712e 100644 ---- a/config.tests/unix/odbc/odbc.cpp -+++ b/config.tests/unix/odbc/odbc.cpp -@@ -38,7 +38,9 @@ - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ -- -+#ifdef __MINGW32__ -+#include <windows.h> -+#endif - #include <sql.h> - #include <sqlext.h> - -diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro -index c588ede..740582a 100644 ---- a/config.tests/unix/odbc/odbc.pro -+++ b/config.tests/unix/odbc/odbc.pro -@@ -1,4 +1,5 @@ - SOURCES = odbc.cpp - CONFIG -= qt dylib - mac:CONFIG -= app_bundle --LIBS += -lodbc -+win32-g++:LIBS += -lodbc32 -+else:LIBS += -lodbc -diff --git a/config.tests/unix/rtti/rtti.cpp b/config.tests/unix/rtti/rtti.cpp -new file mode 100644 -index 0000000..e78103c ---- /dev/null -+++ b/config.tests/unix/rtti/rtti.cpp -@@ -0,0 +1,45 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -+** All rights reserved. -+** Contact: Nokia Corporation (qt-info@nokia.com) -+** -+** This file is part of the config.tests of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial Usage -+** Licensees holding valid Qt Commercial licenses may use this file in -+** accordance with the Qt Commercial License Agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and Nokia. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** If you have questions regarding the use of this file, please contact -+** Nokia at qt-info@nokia.com. -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+int main(int, char**) -+{ -+ return 0; -+} -diff --git a/config.tests/unix/rtti/rtti.pro b/config.tests/unix/rtti/rtti.pro -new file mode 100644 -index 0000000..d0aae30 ---- /dev/null -+++ b/config.tests/unix/rtti/rtti.pro -@@ -0,0 +1,3 @@ -+SOURCES = rtti.cpp -+CONFIG -= x11 qt -+mac:CONFIG -= app_bundle -diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro -index 432bd8d..94faf15 100644 ---- a/config.tests/x11/opengl/opengl.pro -+++ b/config.tests/x11/opengl/opengl.pro -@@ -7,4 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) { - } - - CONFIG -= qt --LIBS += -lGL -lGLU -+win32-g++:LIBS += -lopengl32 -+else:LIBS += -lGL -lGLU -diff --git a/configure b/configure -index ed5891f..a070d78 100755 ---- a/configure -+++ b/configure -@@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - # window system detection - #------------------------------------------------------------------------------- - -+# XPLATFROM win32-g++ is treated as a subcase of PLATFORM_X11 for convenience - PLATFORM_X11=no - PLATFORM_MAC=no - PLATFORM_QWS=no -@@ -605,7 +606,7 @@ mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" - cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" - --QMakeVar add styles "cde mac motif plastique cleanlooks windows" -+QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista" - QMakeVar add decorations "default windows styled" - QMakeVar add mouse-drivers "pc" - if [ "$UNAME_SYSTEM" = "Linux" ] ; then -@@ -733,6 +734,7 @@ CFG_MMX=auto - CFG_3DNOW=auto - CFG_SSE=auto - CFG_SSE2=auto -+CFG_RTTI=auto - CFG_REDUCE_RELOCATIONS=no - CFG_IPV6=auto - CFG_NAS=no -@@ -1602,6 +1604,13 @@ while [ "$#" -gt 0 ]; do - UNKNOWN_OPT=yes - fi - ;; -+ rtti) -+ if [ "$VAL" = "no" ]; then -+ CFG_RTTI="$VAL" -+ else -+ UNKNOWN_OPT=yes -+ fi -+ ;; - iwmmxt) - CFG_IWMMXT="yes" - ;; -@@ -3482,6 +3491,7 @@ cat << EOF - -no-3dnow .......... Do not compile with use of 3DNOW instructions. - -no-sse ............ Do not compile with use of SSE instructions. - -no-sse2 ........... Do not compile with use of SSE2 instructions. -+ -no-rtti ........... Do not compile with RTTI. - - -qtnamespace <name> Wraps all Qt library code in 'namespace <name> {...}'. - -qtlibinfix <infix> Renames all libQt*.so to libQt*<infix>.so. -@@ -4508,6 +4518,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then - fi - fi - -+# detect rtti support -+if [ "${CFG_RTTI}" = "auto" ]; then -+ if [ "$XPLATFORM" != "win32-g++" ]; then -+ CFG_RTTI=no -+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/rtti "rtti" $L_FLAGS $I_FLAGS $l_FLAGS "-frtti"; then -+ CFG_RTTI=yes -+ else -+ CFG_RTTI=no -+ fi -+fi -+ - # check iWMMXt support - if [ "$CFG_IWMMXT" = "yes" ]; then - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt" -@@ -4683,6 +4704,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - if "$WHICH" pg_config >/dev/null 2>&1; then - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` -+ QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS" - fi - [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" -@@ -4707,7 +4729,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - ;; - odbc) - if [ "$CFG_SQL_odbc" != "no" ]; then -- if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then -+ if [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM" = "win32-g++" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then - if [ "$CFG_SQL_odbc" = "auto" ]; then - CFG_SQL_odbc=plugin - fi -@@ -5002,7 +5024,10 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then - fi - - if [ "$CFG_PHONON" != "no" ]; then -- if [ "$CFG_PHONON_BACKEND" != "no" ]; then -+ if [ "$XPLATFORM" = "win32-g++" ]; then -+ echo "Will build Phonon for win32-g++" -+ CFG_PHONON=yes -+ elif [ "$CFG_PHONON_BACKEND" != "no" ]; then - if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null` -@@ -5060,8 +5085,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then - fi - - # Check we actually have X11 :-) -- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS -- if [ $? != "0" ]; then -+ if [ "$XPLATFORM" = "win32-g++" ]; then -+ echo "Skipping XLib test for win32-g++" -+ elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then - echo "Basic XLib functionality test failed!" - echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." -@@ -6141,6 +6167,7 @@ fi - [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" - [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" - [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" -+[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti" - [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" - [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" - [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" -@@ -6222,7 +6249,7 @@ else - QT_CONFIG="$QT_CONFIG freetype" - fi - --if [ "x$PLATFORM_MAC" = "xyes" ]; then -+if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then - #On Mac we implicitly link against libz, so we - #never use the 3rdparty stuff. - [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" -@@ -7161,7 +7188,7 @@ fi - - cat >>"$QTCONFIG.tmp" <<EOF - #configuration --CONFIG += $QTCONFIG_CONFIG -+CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG - QT_ARCH = $CFG_ARCH - QT_EDITION = $Edition - QT_CONFIG += $QT_CONFIG -@@ -7434,7 +7461,7 @@ fi - echo "Declarative module .. $CFG_DECLARATIVE" - echo "STL support ......... $CFG_STL" - echo "PCH support ......... $CFG_PRECOMPILE" --echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" -+echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" - if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then - echo "iWMMXt support ...... ${CFG_IWMMXT}" - echo "NEON support ........ ${CFG_NEON}" -@@ -7752,7 +7779,11 @@ for file in .projects .projects.3; do - [ "$IN_ROOT" = "no" ] && continue - - case $a in -- *winmain/winmain.pro) continue ;; -+ *winmain/winmain.pro) -+ case "$XPLATFORM" in -+ win32*) SPEC=$XQMAKESPEC ;; -+ *) continue ;; -+ esac ;; - *s60main/s60main.pro) continue ;; - *examples/activeqt/*) continue ;; - */qmake/qmake.pro) continue ;; -diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index b282f69..b537bc7 100644 ---- a/mkspecs/win32-g++/qmake.conf -+++ b/mkspecs/win32-g++/qmake.conf -@@ -3,23 +3,31 @@ - # - # Written for MinGW - # -+load(qt_config) - - MAKEFILE_GENERATOR = MINGW - TEMPLATE = app - CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header -+CONFIG += windows win32 -+CONFIG -= freetype -+QT_CONFIG -= freetype - QT += core gui - DEFINES += UNICODE QT_LARGEFILE_SUPPORT -+DEFINES -= QT_LARGEFILE_SUPPORT -+DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS - QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 - - QMAKE_EXT_OBJ = .o - QMAKE_EXT_RES = _res.o - --QMAKE_CC = gcc -+QMAKE_CC = HOSTPLATFORMPREFIX-gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = byacc - QMAKE_YACCFLAGS = -d - QMAKE_CFLAGS = -+QMAKE_CFLAGS += -isystem HOSTPLATFORMINCLUDE -+QMAKE_CFLAGS += -pipe - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall - QMAKE_CFLAGS_WARN_OFF = -w -@@ -27,7 +35,7 @@ QMAKE_CFLAGS_RELEASE = -O2 - QMAKE_CFLAGS_DEBUG = -g - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - --QMAKE_CXX = g++ -+QMAKE_CXX = HOSTPLATFORMPREFIX-g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -@@ -42,6 +50,7 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads - QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions - - QMAKE_INCDIR = -+QMAKE_INCDIR += . - QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] - QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] - -@@ -50,8 +59,8 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src - QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - --QMAKE_LINK = g++ --QMAKE_LINK_C = gcc -+QMAKE_LINK = HOSTPLATFORMPREFIX-g++ -+QMAKE_LINK_C = HOSTPLATFORMPREFIX-gcc - QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc - QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl - QMAKE_LFLAGS_EXCEPTIONS_OFF = -@@ -72,15 +81,18 @@ QMAKE_LIBS_OPENGL = -lopengl32 -lglu32 -lgdi32 -luser32 - QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 - QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - -+QMAKE_SH = bash -+ - !isEmpty(QMAKE_SH) { - MINGW_IN_SHELL = 1 - QMAKE_DIR_SEP = / - QMAKE_COPY = cp -- QMAKE_COPY_DIR = xcopy /s /q /y /i -+ QMAKE_COPY_DIR = cp -r - QMAKE_MOVE = mv -- QMAKE_DEL_FILE = rm -- QMAKE_MKDIR = mkdir -+ QMAKE_DEL_FILE = rm -f -+ QMAKE_MKDIR = mkdir -p - QMAKE_DEL_DIR = rmdir -+ QMAKE_SYMBOLIC_LINK = ln -s - QMAKE_CHK_DIR_EXISTS = test -d - } else { - QMAKE_COPY = copy /y -@@ -92,15 +104,16 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - QMAKE_CHK_DIR_EXISTS = if not exist - } - --QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe --QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe --QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe -+#QMAKE_IDC = HOSTPLATFORMPREFIX-idc -+QMAKE_MOC = HOSTPLATFORMPREFIX-moc -+QMAKE_RCC = HOSTPLATFORMPREFIX-rcc -+QMAKE_UIC = HOSTPLATFORMPREFIX-uic - --QMAKE_IDL = midl --QMAKE_LIB = ar -ru --QMAKE_RC = windres -+#QMAKE_IDL = midl -+QMAKE_LIB = HOSTPLATFORMPREFIX-ar -ru -+QMAKE_RC = HOSTPLATFORMPREFIX-windres - QMAKE_ZIP = zip -r -9 - --QMAKE_STRIP = strip -+QMAKE_STRIP = HOSTPLATFORMPREFIX-strip - QMAKE_STRIPFLAGS_LIB += --strip-unneeded --load(qt_config) -+PKG_CONFIG = HOSTPLATFORMPREFIX-pkg-config -diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp -index f7d42cf..9c7993c 100644 ---- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp -+++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp -@@ -45,7 +45,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. - #endif - - #ifndef QT_NO_OPENGL --#include <gl/gl.h> -+#include <GL/gl.h> - #ifndef GL_FRAGMENT_PROGRAM_ARB - #define GL_FRAGMENT_PROGRAM_ARB 0x8804 - #define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri -index 3406e41..e171584 100644 ---- a/src/corelib/tools/tools.pri -+++ b/src/corelib/tools/tools.pri -@@ -96,8 +96,8 @@ contains(QT_CONFIG, zlib) { - ../3rdparty/zlib/uncompr.c \ - ../3rdparty/zlib/zutil.c - } else:!contains(QT_CONFIG, no-zlib) { -- unix:LIBS_PRIVATE += -lz --# win32:LIBS += libz.lib -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - - DEFINES += HB_EXPORT=Q_CORE_EXPORT -diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri -index b67be55..6642ae3 100644 ---- a/src/gui/image/image.pri -+++ b/src/gui/image/image.pri -@@ -93,11 +93,11 @@ SOURCES += \ - SOURCES += image/qpnghandler.cpp - - contains(QT_CONFIG, system-png) { -- unix:LIBS_PRIVATE += -lpng -- win32:LIBS += libpng.lib -+ unix|win32-g++:LIBS_PRIVATE += -lpng -+ win32:!win32-g++:LIBS += libpng.lib - } else { - !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE -- INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib -+ INCLUDEPATH += ../3rdparty/libpng - SOURCES += ../3rdparty/libpng/png.c \ - ../3rdparty/libpng/pngerror.c \ - ../3rdparty/libpng/pngget.c \ -@@ -115,6 +115,10 @@ SOURCES += \ - ../3rdparty/libpng/pngwutil.c \ - ../3rdparty/libpng/pnggccrd.c - } -+ contains(QT_CONFIG, system-zlib) { -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib -+ } - } else { - DEFINES *= QT_NO_IMAGEFORMAT_PNG - } -diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri -index a6cc9c7..95779a1 100644 ---- a/src/gui/painting/painting.pri -+++ b/src/gui/painting/painting.pri -@@ -387,9 +387,9 @@ neon { - } - - contains(QT_CONFIG, zlib) { -- INCLUDEPATH += ../3rdparty/zlib -+ INCLUDEPATH += ../3rdparty/zlib - } else:!contains(QT_CONFIG, no-zlib) { -- unix:LIBS_PRIVATE += -lz --# win32:LIBS += libz.lib -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - -diff --git a/src/network/access/access.pri b/src/network/access/access.pri -index aa36890..f009761 100644 ---- a/src/network/access/access.pri -+++ b/src/network/access/access.pri -@@ -59,8 +59,8 @@ SOURCES += access/qftp.cpp \ - - #zlib support - contains(QT_CONFIG, zlib) { -- INCLUDEPATH += ../3rdparty/zlib -+ INCLUDEPATH += ../3rdparty/zlib - } else:!contains(QT_CONFIG, no-zlib) { -- unix:LIBS_PRIVATE += -lz --# win32:LIBS += libz.lib -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } -diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri -index 72ea80f..cf31a5b 100644 ---- a/src/network/ssl/ssl.pri -+++ b/src/network/ssl/ssl.pri -@@ -34,6 +34,7 @@ symbian { - # Include Qt's default CA bundle - RESOURCES += network.qrc - -- # Add optional SSL libs -+ # Add optional SSL libs, but not accidently system zlib -+ !contains(QT_CONFIG, system-zlib):OPENSSL_LIBS -= -lz - LIBS_PRIVATE += $$OPENSSL_LIBS - } -diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro -index ebc79cc..30a19c6 100644 ---- a/src/plugins/imageformats/jpeg/jpeg.pro -+++ b/src/plugins/imageformats/jpeg/jpeg.pro -@@ -20,8 +20,8 @@ symbian: { - } - - contains(QT_CONFIG, system-jpeg) { -- unix:LIBS += -ljpeg -- win32:LIBS += libjpeg.lib -+ unix|win32-g++:LIBS += -ljpeg -+ win32:!win32-g++:LIBS += libjpeg.lib - } - !contains(QT_CONFIG, system-jpeg) { - INCLUDEPATH += ../../../3rdparty/libjpeg -diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro -index de7dfa7..46c84c4 100644 ---- a/src/plugins/imageformats/mng/mng.pro -+++ b/src/plugins/imageformats/mng/mng.pro -@@ -14,8 +14,8 @@ symbian: { - } - - contains(QT_CONFIG, system-mng) { -- unix:LIBS += -lmng -- win32:LIBS += libmng.lib -+ unix|win32-g++:LIBS += -lmng -+ win32:!win32-g++:LIBS += libmng.lib - } - !contains(QT_CONFIG, system-mng) { - DEFINES += MNG_BUILD_SO -@@ -44,10 +44,11 @@ contains(QT_CONFIG, system-mng) { - } - - contains(QT_CONFIG, system-zlib) { -- LIBS += -lz -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - !contains(QT_CONFIG, system-zlib) { -- INCLUDEPATH += ../../../3rdparty/zlib -+ INCLUDEPATH += ../../../3rdparty/zlib - } - - QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats -diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro -index 312f99c..29d36f4 100644 ---- a/src/plugins/imageformats/tiff/tiff.pro -+++ b/src/plugins/imageformats/tiff/tiff.pro -@@ -8,8 +8,13 @@ SOURCES += main.cpp \ - qtiffhandler.cpp - - contains(QT_CONFIG, system-tiff) { -- unix:LIBS += -ltiff -- win32:LIBS += libtiff.lib -+ unix|win32-g++:LIBS += -ltiff -+ win32:!win32-g++:LIBS += libtiff.lib -+ -+ contains(QT_CONFIG, system-jpeg) { -+ unix|win32-g++:LIBS += -ljpeg -+ win32:!win32-g++:LIBS += libjpeg.lib -+ } - } - !contains(QT_CONFIG, system-tiff) { - INCLUDEPATH += ../../../3rdparty/libtiff/libtiff -@@ -62,10 +67,11 @@ contains(QT_CONFIG, system-tiff) { - } - - contains(QT_CONFIG, system-zlib) { -- LIBS += -lz -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - !contains(QT_CONFIG, system-zlib) { -- INCLUDEPATH += ../../../3rdparty/zlib -+ INCLUDEPATH += ../../../3rdparty/zlib - } - - QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats -diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro -index 29fbada..0a38ee4 100644 ---- a/src/plugins/sqldrivers/psql/psql.pro -+++ b/src/plugins/sqldrivers/psql/psql.pro -@@ -4,18 +4,15 @@ HEADERS = ../../../sql/drivers/psql/qsql_psql.h - SOURCES = main.cpp \ - ../../../sql/drivers/psql/qsql_psql.cpp - --unix: { -+unix|win32-g++: { - !isEmpty(QT_LFLAGS_PSQL) { -- LIBS *= $$QT_LFLAGS_PSQL -+ !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz -+ !static:LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL - } - !contains(LIBS, .*pq.*):LIBS *= -lpq - } - --win32:!contains(LIBS, .*pq.* ) { -- !win32-g++:LIBS *= -llibpq -- win32-g++:LIBS *= -lpq -- LIBS *= -lws2_32 -ladvapi32 --} -+win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 - - include(../qsqldriverbase.pri) -diff --git a/src/plugins/sqldrivers/tds/main.cpp b/src/plugins/sqldrivers/tds/main.cpp -index eb654ef..0a17f17 100644 ---- a/src/plugins/sqldrivers/tds/main.cpp -+++ b/src/plugins/sqldrivers/tds/main.cpp -@@ -47,6 +47,7 @@ - #define _WINSCARD_H_ - #include <windows.h> - #endif -+#define Q_USE_SYBASE - #include "../../../sql/drivers/tds/qsql_tds.h" - - QT_BEGIN_NAMESPACE -diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro -index 08a166b..f66d5b7 100644 ---- a/src/plugins/sqldrivers/tds/tds.pro -+++ b/src/plugins/sqldrivers/tds/tds.pro -@@ -6,8 +6,9 @@ SOURCES = main.cpp \ - ../../../sql/drivers/tds/qsql_tds.cpp - - unix:!contains( LIBS, .*sybdb.* ):LIBS *= -lsybdb -+win32-g++:LIBS *= -lsybdb -liconv -lws2_32 - --win32 { -+win32:!win32-g++ { - !win32-borland:LIBS *= -lNTWDBLIB - win32-borland:LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB - } -diff --git a/src/qbase.pri b/src/qbase.pri -index 710a2b6..2c3e91c 100644 ---- a/src/qbase.pri -+++ b/src/qbase.pri -@@ -85,7 +85,6 @@ win32-borland { - } - - win32 { -- CONFIG += zlib - INCLUDEPATH += tmp - !static: DEFINES+=QT_MAKEDLL - } -diff --git a/src/sql/drivers/drivers.pri b/src/sql/drivers/drivers.pri -index 184eca9..aac0267 100644 ---- a/src/sql/drivers/drivers.pri -+++ b/src/sql/drivers/drivers.pri -@@ -6,19 +6,16 @@ contains(sql-drivers, psql) { - HEADERS += drivers/psql/qsql_psql.h - SOURCES += drivers/psql/qsql_psql.cpp - -- unix { -- !isEmpty(QT_LFLAGS_PSQL) { -- LIBS *= $$QT_LFLAGS_PSQL -+ unix|win32-g++ { -+ !static:!isEmpty(QT_LFLAGS_PSQL) { -+ !contains(QT_CONFIG, system-zlib): QT_LFLAGS_PSQL -= -lz -+ !static:LIBS *= $$QT_LFLAGS_PSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL - } - !contains(LIBS, .*pq.*):LIBS *= -lpq - } - -- win32 { -- !win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -llibpq -- win32-g++:!contains( LIBS, .*pq.* ):LIBS *= -lpq -- LIBS *= -lws2_32 -ladvapi32 -- } -+ win32:!win32-g++:!contains(LIBS, .*pq.* ) LIBS *= -llibpq -lws2_32 -ladvapi32 - } - - contains(sql-drivers, mysql) { -diff --git a/src/sql/drivers/tds/qsql_tds.cpp b/src/sql/drivers/tds/qsql_tds.cpp -index 422f866..16785ed 100644 ---- a/src/sql/drivers/tds/qsql_tds.cpp -+++ b/src/sql/drivers/tds/qsql_tds.cpp -@@ -47,7 +47,8 @@ - #else - #define Q_USE_SYBASE - #endif -- -+//Force SYBASE because we use FreeTDS -+#define Q_USE_SYBASE - #include "qsql_tds.h" - - #include <qvariant.h> -diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h -index cb318f3..a6354ce 100644 ---- a/src/sql/drivers/tds/qsql_tds.h -+++ b/src/sql/drivers/tds/qsql_tds.h -@@ -48,7 +48,8 @@ - - #ifdef Q_OS_WIN32 - #define WIN32_LEAN_AND_MEAN --#define DBNTWIN32 // indicates 32bit windows dblib -+//#define DBNTWIN32 // indicates 32bit windows dblib -+#include <winsock2.h> - #include <QtCore/qt_windows.h> - #include <sqlfront.h> - #include <sqldb.h> -diff --git a/src/svg/svg.pro b/src/svg/svg.pro -index d2a4227..0d3ef83 100644 ---- a/src/svg/svg.pro -+++ b/src/svg/svg.pro -@@ -44,7 +44,8 @@ symbian:TARGET.UID3=0x2001B2E2 - - #zlib support - contains(QT_CONFIG, zlib) { -- INCLUDEPATH += ../3rdparty/zlib -+ INCLUDEPATH += ../3rdparty/zlib - } else:!contains(QT_CONFIG, no-zlib) { -- unix:LIBS_PRIVATE += -lz -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } -diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri -index b3ee948..18efe9d 100644 ---- a/src/tools/bootstrap/bootstrap.pri -+++ b/src/tools/bootstrap/bootstrap.pri -@@ -52,8 +52,8 @@ hpux-acc*|hpuxi-acc* { - LIBS += -lbootstrap - } - !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib) { -- unix:LIBS += -lz --# win32:LIBS += libz.lib -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - win32:LIBS += -luser32 - -diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index 0dbb90f..e6b43a6 100644 ---- a/src/tools/bootstrap/bootstrap.pro -+++ b/src/tools/bootstrap/bootstrap.pro -@@ -109,6 +109,9 @@ contains(QT_CONFIG, zlib) { - ../3rdparty/zlib/trees.c \ - ../3rdparty/zlib/uncompr.c \ - ../3rdparty/zlib/zutil.c -+} else:!contains(QT_CONFIG, no-zlib) { -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } - - lib.CONFIG = dummy_install -diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index bc322b9..f1fec05 100644 ---- a/src/winmain/winmain.pro -+++ b/src/winmain/winmain.pro -@@ -11,7 +11,7 @@ win32 { - win32-g++:DEFINES += QT_NEEDS_QMAIN - win32-borland:DEFINES += QT_NEEDS_QMAIN - SOURCES = qtmain_win.cpp -- CONFIG += png zlib -+ CONFIG += png - CONFIG -= jpeg - INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore - } -diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro -index dde7e8d..556dbcb 100644 ---- a/tools/qvfb/qvfb.pro -+++ b/tools/qvfb/qvfb.pro -@@ -42,12 +42,14 @@ contains(QT_CONFIG, opengl) { - } - - contains(QT_CONFIG, system-png) { -- LIBS += -lpng -+ unix|win32-g++:LIBS_PRIVATE += -lpng -+ win32:!win32-g++:LIBS += libpng.lib - } else { - INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/libpng - } - contains(QT_CONFIG, system-zlib) { -- LIBS += -lz -+ unix|win32-g++:LIBS_PRIVATE += -lz -+ win32:!win32-g++:LIBS += zdll.lib - } else { - INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib - }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/smpeg-1-freebsd-amd64.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,15 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +--- smpeg-0.4.5+cvs20030824.orig/config.guess 2009-10-12 19:02:17.000000000 +1100 ++++ smpeg-0.4.5+cvs20030824/config.guess 2009-10-12 19:01:51.000000000 +1100 +@@ -723,6 +723,9 @@ + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; ++ amd64:FreeBSD:*:*) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit 0 ;; + *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;;
--- a/src/smpeg-freebsd-amd64.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - ---- smpeg-0.4.5+cvs20030824.orig/config.guess 2009-10-12 19:02:17.000000000 +1100 -+++ smpeg-0.4.5+cvs20030824/config.guess 2009-10-12 19:01:51.000000000 +1100 -@@ -723,6 +723,9 @@ - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -+ amd64:FreeBSD:*:*) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zlib-1-win32-static.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,31 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -r 5a13d390f989 Makefile.in +--- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200 ++++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200 +@@ -167,8 +167,8 @@ + -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi + -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi + -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi +- cp $(STATICLIB) $(DESTDIR)$(libdir) +- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) ++ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) ++ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) + cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) + -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 + -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ +diff -r 5a13d390f989 configure +--- a/configure Tue Apr 20 14:59:46 2010 +0200 ++++ b/configure Tue Apr 20 17:46:22 2010 +0200 +@@ -122,10 +122,7 @@ + CYGWIN* | Cygwin* | cygwin* | OS/2*) + EXE='.exe' ;; + MINGW*|mingw*) +-# temporary bypass + rm -f $test.[co] $test $test$shared_ext +- echo "Please use win32/Makefile.gcc instead." +- exit 1 + LDSHARED=${LDSHARED-"$cc -shared"} + LDSHAREDLIBC="" + EXE='.exe' ;;
--- a/src/zlib-win32-static.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -r 5a13d390f989 Makefile.in ---- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200 -+++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200 -@@ -167,8 +167,8 @@ - -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi - -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi - -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi -- cp $(STATICLIB) $(DESTDIR)$(libdir) -- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) -+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir) -+ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) - cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB) - -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ -diff -r 5a13d390f989 configure ---- a/configure Tue Apr 20 14:59:46 2010 +0200 -+++ b/configure Tue Apr 20 17:46:22 2010 +0200 -@@ -122,10 +122,7 @@ - CYGWIN* | Cygwin* | cygwin* | OS/2*) - EXE='.exe' ;; - MINGW*|mingw*) --# temporary bypass - rm -f $test.[co] $test $test$shared_ext -- echo "Please use win32/Makefile.gcc instead." -- exit 1 - LDSHARED=${LDSHARED-"$cc -shared"} - LDSHAREDLIBC="" - EXE='.exe' ;;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zziplib-1-fix-fnmatch.patch Fri May 14 19:59:46 2010 +0200 @@ -0,0 +1,16 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://sourceforge.net/tracker/?func=detail&aid=2995373&group_id=6389&atid=306389 + +--- zziplib-0.13.58/zzip/__fnmatch.h 2009-08-23 07:38:22.000000000 -0400 ++++ zziplib-0.13.58/zzip/__fnmatch.h 2010-01-09 13:32:11.311799466 -0500 +@@ -4,6 +4,7 @@ + + #include <zzip/conf.h> + #include <stdio.h> ++#include <string.h> + + #ifdef ZZIP_HAVE_FNMATCH_H + #include <fnmatch.h>
--- a/src/zziplib-fix-fnmatch.patch Fri May 14 19:53:19 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://sourceforge.net/tracker/?func=detail&aid=2995373&group_id=6389&atid=306389 - ---- zziplib-0.13.58/zzip/__fnmatch.h 2009-08-23 07:38:22.000000000 -0400 -+++ zziplib-0.13.58/zzip/__fnmatch.h 2010-01-09 13:32:11.311799466 -0500 -@@ -4,6 +4,7 @@ - - #include <zzip/conf.h> - #include <stdio.h> -+#include <string.h> - - #ifdef ZZIP_HAVE_FNMATCH_H - #include <fnmatch.h>