Merge branch 'master' into feature/gnumake4

boost/boost.4713.warnings.patch

@@ -879,3 +879,16 @@
              if( !allow_null )
              {
                  BOOST_PTR_CONTAINER_THROW_EXCEPTION( 0 == x && "null not allowed", 
+--- misc/boost_1_44_0/boost/pool/object_pool.hpp.orig	2011-07-14 16:08:31.672964851 +0100
++++ misc/build/boost_1_44_0/boost/pool/object_pool.hpp	2011-07-14 16:09:20.851594534 +0100
+@@ -53,8 +53,8 @@
+ 
+   public:
+     // This constructor parameter is an extension!
+-    explicit object_pool(const size_type next_size = 32)
+-    :pool<UserAllocator>(sizeof(T), next_size) { }
++    explicit object_pool(const size_type next_size_ = 32)
++    :pool<UserAllocator>(sizeof(T), next_size_) { }
+ 
+     ~object_pool();
+ 

boost/boost.windows.patch

+--- misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
++++ misc/build/boost_1_44_0/boost/pool/detail/mutex.hpp
+@@ -46,7 +46,9 @@
+ 
+ #ifndef BOOST_NO_MT
+ # ifdef BOOST_WINDOWS
++#  define NOMINMAX
+ #  include <windows.h>
++#  undef NOMINMAX
+ # endif
+ # if defined(_POSIX_THREADS) || defined(BOOST_HAS_PTHREADS)
+ #  include <pthread.h>

boost/makefile.mk

@@ -60,6 +60,8 @@ PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
 PATCH_FILES+=boost.gcc47679.patch
 
+PATCH_FILES+=boost.windows.patch
+
 ADDITIONAL_FILES= \
     libs/thread/src/win32/makefile.mk
 

cairo/cairo-1.8.0.ios.patch

+--- misc/build/cairo-1.8.0.org/src/cairo-quartz.h
++++ misc/build/cairo-1.8.0/src/cairo-quartz.h
+@@ -40,7 +40,7 @@
+ 
+ #if CAIRO_HAS_QUARTZ_SURFACE
+ 
+-#include <ApplicationServices/ApplicationServices.h>
++#include <CoreGraphics/CoreGraphics.h>
+ 
+ CAIRO_BEGIN_DECLS
+ 
+@@ -66,8 +66,12 @@
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_cgfont (CGFontRef font);
+ 
++#if 0
++
+ cairo_public cairo_font_face_t *
+ cairo_quartz_font_face_create_for_atsu_font_id (ATSUFontID font_id);
++
++#endif /* 0 */
+ 
+ #endif /* CAIRO_HAS_QUARTZ_FONT */
+ 
+--- misc/build/cairo-1.8.0.org/src/cairo-quartz-surface.c
++++ misc/build/cairo-1.8.0/src/cairo-quartz-surface.c
+@@ -152,10 +152,6 @@
+     CGContextGetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextGetAllowsFontSmoothing");
+     CGContextSetAllowsFontSmoothingPtr = dlsym(RTLD_DEFAULT, "CGContextSetAllowsFontSmoothing");
+ 
+-    if (Gestalt(gestaltSystemVersion, &_cairo_quartz_osx_version) != noErr) {
+-	// assume 10.4
+-	_cairo_quartz_osx_version = 0x1040;
+-    }
+ 
+     _cairo_quartz_symbol_lookup_done = TRUE;
+ }
+@@ -2093,7 +2093,10 @@
+ 	yprev = yf;
+     }
+ 
+-    if (_cairo_quartz_osx_version >= 0x1050 && isClipping) {
++    if (0) {
++	/* Assume the bug mentioned below is not present in iOS,
++	 * until proven otherwise.
++	 */
+ 	/* If we're clipping, OSX 10.5 (at least as of 10.5.2) has a
+ 	 * bug (apple bug ID #5834794) where the glyph
+ 	 * advances/positions are not transformed by the text matrix
+--- misc/build/cairo-1.8.0.org/src/cairo-quartz-font.c
++++ misc/build/cairo-1.8.0/src/cairo-quartz-font.c
+@@ -766,6 +766,8 @@
+ }
+ 
+ 
++#if 0
++
+ /*
+  * compat with old ATSUI backend
+  */
+@@ -808,3 +808,5 @@
+ {
+     return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
+ }
++
++#endif /* 0 */

cairo/cairo/makefile.mk

@@ -35,14 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF  "$(ENABLE_CAIRO)" == ""
+.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
 all:
-    @echo "Nothing to do (Cairo not enabled)."
-
-.ELIF "$(SYSTEM_CAIRO)" == "YES"
-all:
-    @echo "Nothing to do, using system cairo."
-
+    @echo "Not building cairo."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -54,6 +49,10 @@ TARFILE_MD5=4ea70ea87b47e92d318d4e7f5b940f47
 
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
+.IF "$(OS)" == "IOS"
+PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch
+.ENDIF
+
 cairo_CFLAGS=$(SOLARINC)
 cairo_LDFLAGS=$(SOLARLIB)
 
@@ -148,21 +147,21 @@ cairo_CFLAGS+=-march=i486
 
 CONFIGURE_DIR=
 
-.IF "$(OS)"=="ANDROID"
-# No pkg-config in the Android NDK
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+# No pkg-config on MacOSX (for iOS) or in the Android NDK
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
 .ELSE
 CONFIGURE_ACTION=.$/configure
 .ENDIF
 
 .IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
+CONFIGURE_FLAGS=--disable-shared --disable-xlib --enable-quartz --enable-quartz-font
 .ELSE
 CONFIGURE_FLAGS=--disable-static --enable-xlib
 .ENDIF
 
-.IF "$(OS)"=="ANDROID"
-CONFIGURE_FLAGS+=--disable-ft
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+CONFIGURE_FLAGS+=--disable-ft PKG_CONFIG=./dummy_pkg_config
 .ELSE
 CONFIGURE_FLAGS+=--enable-ft
 .ENDIF
@@ -177,9 +176,13 @@ BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 
+.IF "$(OS)" == "IOS"
+OUT2INC+=src$/cairo-quartz.h
+.ELSE
 OUT2INC+=src$/cairo-xlib.h \
      src$/cairo-xlib-xrender.h \
      src$/cairo-ft.h
+.ENDIF
 
 .ENDIF
 
@@ -189,12 +192,10 @@ OUT2INC+=src$/cairo-xlib.h \
 .IF "$(OS)" != "WNT" || "$(COM)" == "GCC"
 # all other platforms except vanilla WNT, which does not use configure
 
-.IF "$(BUILD_PIXMAN)" == "YES"
 # pixman is in this module
 # We include paths to this module also in LDFLAGS/CFLAGS to guarantee search order.
 # However pixman_* vars need to be also set for configure to work properly on all platforms.
 CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
-.ENDIF
 
 .IF "$(debug)"!=""
 cairo_CFLAGS+=-g
@@ -229,7 +230,7 @@ OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
 .ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
-OUT2LIB+=src$/.libs$/libcairo-1.a
+OUT2LIB+=src$/.libs$/libcairo*.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
 .ENDIF

cairo/pixman/makefile.mk

@@ -35,11 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF  "$(ENABLE_CAIRO)" == ""
-all:
-    @echo "Nothing to do (Cairo not enabled)."
-
-.ELIF "$(BUILD_PIXMAN)" == ""
+.IF "$(SYSTEM_CAIRO)" == "YES" || "$(GUIBASE)" == "android"
 all:
     @echo "Not building pixman."
 

gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch

@@ -333,7 +333,7 @@
  #
  gdk-pixbuf-enum-types.h : $(gdk_pixbuf_headers) makefile.msc
 -	$(PERL) $(GLIB)\gobject\glib-mkenums \
-+	$(PERL) $(OUTDIR)\bin\glib-mkenums \
++	perl $(OUTDIR)\bin\glib-mkenums \
  		--fhead "#ifndef __GDK_PIXBUF__ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n" \
  		--fprod "/* enumerations from \"@filename@\" */\n" \
  		--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -343,7 +343,7 @@
  gdk-pixbuf-enum-types.c: $(gdk_pixbuf_headers) makefile.msc
 -	$(PERL) $(GLIB)\gobject\glib-mkenums \
 -		--fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \
-+	$(PERL) $(OUTDIR)\bin\glib-mkenums \
++	perl $(OUTDIR)\bin\glib-mkenums \
 +		--fhead "#include <gdk-pixbuf.h>" \
  		--fprod "\n/* enumerations from \"@filename@\" */" \
  		--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"       \

glib/glib-2.28.1-win32.patch

@@ -77,7 +77,7 @@
  !ELSE
 -ZLIB_CFLAGS = -I $(DEVTOP)\include
 -ZLIB_LIBS = $(DEVTOP)\lib\zdll.lib
-+ZLIB_CFLAGS = -I $(ZLIB)
++ZLIB_CFLAGS = -I $(OUTDIR)\inc\external\zlib
 +ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
  !ENDIF
  

hunspell/hunspell-android.patch

---- misc/hunspell-1.3.1/config.sub
-+++ misc/build/hunspell-1.3.1/config.sub
+--- misc/hunspell-1.3.2/config.sub
++++ misc/build/hunspell-1.3.2/config.sub
 @@ -1272,7 +1272,7 @@
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -9,8 +9,8 @@
  	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
---- misc/hunspell-1.3.1/src/tools/munch.c
-+++ misc/build/hunspell-1.3.1/src/tools/munch.c
+--- misc/hunspell-1.3.2/src/tools/munch.c
++++ misc/build/hunspell-1.3.2/src/tools/munch.c
 @@ -8,7 +8,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -20,8 +20,8 @@
  #include <error.h>
  #include <errno.h>
  #include <sys/mman.h>
---- misc/hunspell-1.3.1/src/tools/unmunch.c
-+++ misc/build/hunspell-1.3.1/src/tools/unmunch.c
+--- misc/hunspell-1.3.2/src/tools/unmunch.c
++++ misc/build/hunspell-1.3.2/src/tools/unmunch.c
 @@ -8,7 +8,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>

hunspell/hunspell-mingw.patch

---- misc/hunspell-1.3.1/src/tools/hunspell.cxx	2010-02-27 23:37:14.000000000 +0900
-+++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx	2010-04-25 07:57:39.233875000 +0900
-@@ -27,7 +27,9 @@
- 
- #ifdef WIN32
- 
-+#ifndef __MINGW32__
- #define gettext
-+#endif
- #define LIBDIR "C:\\Hunspell\\"
- #define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook"
- #define OOODIR \

hunspell/hunspell-solaris.patch

---- misc/hunspell-1.3.1.orig/src/tools/hunspell.cxx	2010-02-27 23:42:05.000000000 +0000
-+++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx	2010-02-27 23:43:02.000000000 +0000
+--- misc/hunspell-1.3.2.orig/src/tools/hunspell.cxx	2010-02-27 23:42:05.000000000 +0000
++++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx	2010-02-27 23:43:02.000000000 +0000
 @@ -10,6 +10,9 @@
  #include "hunspell.hxx"
  #include "csutil.hxx"

hunspell/hunspell-static.patch

---- misc/hunspell-1.3.1/src/hunspell/makefile.mk	2010-06-17 15:56:41.000000000 +0200
-+++ misc/build/hunspell-1.3.1/src/hunspell/makefile.mk	2011-02-10 20:47:22.000000000 +0100
+--- misc/hunspell-1.3.2/src/hunspell/makefile.mk	2010-06-17 15:56:41.000000000 +0200
++++ misc/build/hunspell-1.3.2/src/hunspell/makefile.mk	2011-02-10 20:47:22.000000000 +0100
 @@ -39,7 +39,7 @@
  
  # --- Files --------------------------------------------------------

hunspell/hunspell-wntconfig.patch

---- misc/hunspell-1.3.1/config.h	2010-02-25 14:38:38.000000000 +0000
-+++ misc/build/hunspell-1.3.1/config.h	2010-02-25 14:38:42.000000000 +0000
+--- misc/hunspell-1.3.2/config.h	2010-02-25 14:38:38.000000000 +0000
++++ misc/build/hunspell-1.3.2/config.h	2010-02-25 14:38:42.000000000 +0000
 @@ -1 +0,0 @@
 -dummy

hunspell/makefile.mk

@@ -36,8 +36,8 @@ TARGET=hunspell
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hunspell-1.3.1
-TARFILE_MD5=9ed97fce60a9a65852402248a6659492
+TARFILE_NAME=hunspell-1.3.2
+TARFILE_MD5=3121aaf3e13e5d88dfff13fb4a5f1ab8
 ADDITIONAL_FILES+=config.h
 
 PATCH_FILES=\
@@ -73,20 +73,23 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.3.a
 
 .ENDIF # "$(GUI)"=="UNX"
 
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-PATCH_FILES=\
-    hunspell-mingw.patch
-
 CONFIGURE_ACTION=configure
+
 CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=make
-OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.3.a
 .ELSE
 BUILD_ACTION=cd src/hunspell && dmake
 .ENDIF