CWS-TOOLING: integrate CWS cairosource01

2008-11-28 13:29:24 +0100 rene  r264546 : i96634# add patch from kendy fixing --disable-mozilla with the new mozbootstrap stuff
2008-11-28 12:43:54 +0100 rene  r264540 : revert commit to wrong branch
2008-11-28 11:52:54 +0100 rene  r264537 : #ii10000# work around gcc taking hours/OOMing with qnametostr.cxx
2008-11-24 21:40:36 +0100 mox  r264268 : Remove the support for pre-built binaries, now that cairo can be built
from source
2008-11-24 21:39:01 +0100 mox  r264267 : Remove the support for pre-built binaries, now that cairo can be built
from source
2008-11-14 22:25:27 +0100 mox  r263699 : Fix build breakers on vanilla Win32
2008-11-10 19:45:48 +0100 mox  r263538 : Try to fix build breaker
2008-11-09 10:48:43 +0100 mox  r263493 : Full pixman_CFLAGS and pixman_LIBS are needed for configure to work
properly on UNX.
2008-11-08 20:24:06 +0100 mox  r263491 : Patch for pixman is still needed to fix build breakers in VM with Linux/FreeBSD
2008-11-05 21:29:44 +0100 mox  r263358 : CWS-TOOLING: rebase CWS cairosource01 to trunk@263288 (milestone: DEV300:m35)
2008-11-03 20:36:48 +0100 mox  r263306 : Update cairo sources missing from migration.
2008-11-03 20:33:17 +0100 mox  r263305 : Migrate CWS cairosource01 to SVN.

7 files changed, 326 insertions, 321 deletions

diff --git a/cairo/cairo-1.6.4.patch b/cairo/cairo-1.6.4.patch
deleted file mode 100644
index b67d96f56283..000000000000
--- a/cairo/cairo-1.6.4.patch
+++ /dev/null
@@ -1,148 +0,0 @@
---- misc/cairo-1.6.4/configure.orig	2008-04-12 06:33:44.000000000 +0900
-+++ misc/build/cairo-1.6.4/configure	2008-07-19 14:58:12.144500000 +0900
-@@ -4728,7 +4728,7 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
-@@ -4737,7 +4737,7 @@
-   # func_win32_libid shell function, so use a weaker test based on 'objdump',
-   # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
--    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
-     lt_cv_file_magic_cmd='func_win32_libid'
-   else
-     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-@@ -21031,19 +21031,39 @@
- 
- LIBS="$LIBS $LIBM"
- 
--{ echo "$as_me:$LINENO: checking for compress in -lz" >&5
--echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; }
--if test "${ac_cv_lib_z_compress+set}" = set; then
-+save_libs="$LIBS"
-+LIBS="$LIBS $ZLIB3RDLIB"
-+
-+for ac_func in $COMPRESS
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lz  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -21051,11 +21071,18 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char compress ();
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
- int
- main ()
- {
--return compress ();
-+return $ac_func ();
-   ;
-   return 0;
- }
-@@ -21078,22 +21105,25 @@
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_z_compress=yes
-+  eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_lib_z_compress=no
-+	eval "$as_ac_var=no"
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; }
--if test $ac_cv_lib_z_compress = yes; then
--  if test "${ac_cv_header_zlib_h+set}" = set; then
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ if test "${ac_cv_header_zlib_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for zlib.h" >&5
- echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_zlib_h+set}" = set; then
-@@ -21233,7 +21263,9 @@
- else
-   have_libz="no (requires zlib http://www.gzip.org/zlib/)"
- fi
-+done
- 
-+LIBS="$save_libs"
- 
- 
- 
-@@ -28683,7 +28715,7 @@
- 
-     # The ps backend requires zlib.
-     use_ps=$have_libz
--    ps_NONPKGCONFIG_LIBS=-lz
-+    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- 
- 			    cairo_cv_backend_ps_use=$use_ps
- 			    cairo_cv_backend_ps_cache_version=4
-@@ -28877,7 +28909,7 @@
- 
-     # The pdf backend requires zlib.
-     use_pdf=$have_libz
--    pdf_NONPKGCONFIG_LIBS=-lz
-+    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
- 
- 			    cairo_cv_backend_pdf_use=$use_pdf
- 			    cairo_cv_backend_pdf_cache_version=4
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
new file mode 100644
index 000000000000..b8533c8cc5f9
--- /dev/null
+++ b/cairo/cairo-1.8.0.patch
@@ -0,0 +1,251 @@
+diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo-1.8.0/build/Makefile.win32.common
+--- misc/build/cairo-1.8.0.org/build/Makefile.win32.common	2008-09-25 14:36:35.000000000 +0300
++++ misc/build/cairo-1.8.0/build/Makefile.win32.common	2008-11-14 22:20:08.000000000 +0200
+@@ -18,8 +18,8 @@
+ OPT := -O2
+ endif
+ 
+-PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
+-PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
++PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman-0.12.0/pixman
++PIXMAN_LIBS := $(top_builddir)/../pixman-0.12.0/pixman/$(CFG)/pixman-1.lib
+ 
+ CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
+ ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
+@@ -27,13 +27,15 @@
+ endif
+ ifeq ($(CAIRO_HAS_PS_SURFACE)$(CAIRO_HAS_PDF_SURFACE),00)
+ else
+-CAIRO_LIBS += zdll.lib
++CAIRO_LIBS += zlib.lib
+ endif
+ 
+ DEFAULT_CFLAGS = -MD -nologo $(OPT)
+ DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+ DEFAULT_CFLAGS += -I. -I$(top_srcdir)
+ DEFAULT_CFLAGS += $(PIXMAN_CFLAGS)
++DEFAULT_CFLAGS += $(SOLARINC)
++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib -DZLIB_FIX
+ 
+ CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
+ 
+@@ -55,7 +57,7 @@
+ 
+ $(CFG)/%.obj: %.c
+ 	@mkdir -p $(CFG)
+-	@$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
++	$(CC) $(CAIRO_CFLAGS) -c -Fo"$@" $<
+ 
+ $(CFG)/%-static.obj: %.c
+ 	@mkdir -p $(CFG)
+diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cairo-1.8.0/build/Makefile.win32.features
+--- misc/build/cairo-1.8.0.org/build/Makefile.win32.features	2008-09-25 02:15:49.000000000 +0300
++++ misc/build/cairo-1.8.0/build/Makefile.win32.features	2008-11-04 22:19:52.000000000 +0200
+@@ -10,11 +10,11 @@
+ CAIRO_HAS_WIN32_FONT=1
+ CAIRO_HAS_OS2_SURFACE=0
+ CAIRO_HAS_BEOS_SURFACE=0
+-CAIRO_HAS_PNG_FUNCTIONS=1
++CAIRO_HAS_PNG_FUNCTIONS=0
+ CAIRO_HAS_GLITZ_SURFACE=0
+ CAIRO_HAS_DIRECTFB_SURFACE=0
+ CAIRO_HAS_FT_FONT=0
+ CAIRO_HAS_PS_SURFACE=1
+ CAIRO_HAS_PDF_SURFACE=1
+-CAIRO_HAS_SVG_SURFACE=1
++CAIRO_HAS_SVG_SURFACE=0
+ CAIRO_HAS_TEST_SURFACES=0
+diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
+--- misc/build/cairo-1.8.0.org/configure	2008-09-26 01:57:30.000000000 +0300
++++ misc/build/cairo-1.8.0/configure	2008-11-04 22:21:26.000000000 +0200
+@@ -4397,7 +4397,7 @@
+ 
+ cygwin*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+@@ -4406,7 +4406,7 @@
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+   if ( file / ) >/dev/null 2>&1; then
+-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+     lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+@@ -25304,19 +25304,39 @@
+ rm -f confcache
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for compress in -lz" >&5
+-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
++save_libs="$LIBS"
++LIBS="$LIBS $ZLIB3RDLIB"
++
++for ac_func in $COMPRESS
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -25324,11 +25344,18 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char compress ();
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$ac_func || defined __stub___$ac_func
++choke me
++#endif
++
+ int
+ main ()
+ {
+-return compress ();
++return $ac_func ();
+   ;
+   return 0;
+ }
+@@ -25351,22 +25378,25 @@
+ 	 test ! -s conftest.err
+        } && test -s conftest$ac_exeext &&
+        $as_test_x conftest$ac_exeext; then
+-  ac_cv_lib_z_compress=yes
++  eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_z_compress=no
++	eval "$as_ac_var=no"
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
+-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; }
+-if test $ac_cv_lib_z_compress = yes; then
+-  if test "${ac_cv_header_zlib_h+set}" = set; then
++ac_res=`eval echo '${'$as_ac_var'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ if test "${ac_cv_header_zlib_h+set}" = set; then
+   { echo "$as_me:$LINENO: checking for zlib.h" >&5
+ echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+@@ -25506,7 +25536,9 @@
+ else
+   have_libz="no (requires zlib http://www.gzip.org/zlib/)"
+ fi
++done
+ 
++LIBS="$save_libs"
+ 
+ 
+ { echo "$as_me:$LINENO: checking for X" >&5
+@@ -34097,7 +34129,7 @@
+ 
+     # The ps backend requires zlib.
+     use_ps=$have_libz
+-    ps_NONPKGCONFIG_LIBS=-lz
++    ps_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_ps_use=$use_ps
+ 			cairo_cv_ps_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
+@@ -34444,7 +34476,7 @@
+ 
+     # The pdf backend requires zlib.
+     use_pdf=$have_libz
+-    pdf_NONPKGCONFIG_LIBS=-lz
++    pdf_NONPKGCONFIG_LIBS=$ZLIB3RDLIB
+ 
+ 			cairo_cv_pdf_use=$use_pdf
+ 			cairo_cv_pdf_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS"
+diff -ur misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c misc/build/cairo-1.8.0/src/cairo-deflate-stream.c
+--- misc/build/cairo-1.8.0.org/src/cairo-deflate-stream.c	2008-09-25 13:03:43.000000000 +0300
++++ misc/build/cairo-1.8.0/src/cairo-deflate-stream.c	2008-11-14 22:21:00.000000000 +0200
+@@ -36,7 +36,11 @@
+ 
+ #include "cairoint.h"
+ #include "cairo-output-stream-private.h"
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ 
+ #define BUFFER_SIZE 16384
+ 
+diff -ur misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c misc/build/cairo-1.8.0/src/cairo-pdf-surface.c
+--- misc/build/cairo-1.8.0.org/src/cairo-pdf-surface.c	2008-09-25 14:36:35.000000000 +0300
++++ misc/build/cairo-1.8.0/src/cairo-pdf-surface.c	2008-11-14 22:20:41.000000000 +0200
+@@ -51,7 +51,11 @@
+ #include "cairo-type3-glyph-surface-private.h"
+ 
+ #include <time.h>
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ 
+ /* Issues:
+  *
+diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.0/src/cairo-ps-surface.c
+--- misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c	2008-09-25 14:36:35.000000000 +0300
++++ misc/build/cairo-1.8.0/src/cairo-ps-surface.c	2008-11-14 22:21:33.000000000 +0200
+@@ -67,7 +67,11 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <time.h>
++#ifdef ZLIB_FIX
++#include <zlib/zlib.h>
++#else
+ #include <zlib.h>
++#endif
+ #include <errno.h>
+ 
+ #define DEBUG_PS 0
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 45526345152a..f97b489f8c3b 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..
 
 PRJNAME=cairo
 TARGET=so_cairo
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 # --- Settings -----------------------------------------------------
 
@@ -46,25 +47,17 @@ all:
 all:
     @echo "Nothing to do, using system cairo."
 
-.ELIF "$(BUILD_CAIRO)" == ""
-all:
-       @echo "Not building cairo from source, prebuilt binaries will be used."
-
 .ENDIF
 
 # --- Files --------------------------------------------------------
 
-CAIROVERSION=1.6.4
+CAIROVERSION=1.8.0
 
 TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
 PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
 
-cairo_CFLAGS=-I$(SOLARINC)
-cairo_LDFLAGS=-L$(SOLARLIB)
-
-# pixman is in this module
-pixman_CFLAGS=-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc
-pixman_LIBS=-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1
+cairo_CFLAGS=$(SOLARINC)
+cairo_LDFLAGS=$(SOLARLIB)
 
 cairo_CPPFLAGS=
 .IF "$(SYSTEM_ZLIB)"!="YES"
@@ -78,11 +71,13 @@ cairo_CPPFLAGS+=$(INCLUDE)
 .IF "$(OS)"=="WNT"
 # --------- Windows -------------------------------------------------
 .IF "$(COM)"=="GCC"
+cairo_CFLAGS+=-D_MT
+cairo_LDFLAGS+=-no-undefined -L$(ILIB:s/;/ -L/)
 cairo_CPPFLAGS+=-nostdinc
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-CONFIGURE_FLAGS=--disable-xlib --disable-freetype --disable-pthread --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config CFLAGS=-D_MT CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS=-lmingwthrd pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--disable-xlib --disable-ft --disable-pthread --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 PKG_CONFIG=./dummy_pkg_config LIBS=-lmingwthrd ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) OBJDUMP="$(WRAPCMD) objdump"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -91,13 +86,8 @@ BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
 .ELSE   # WNT, not GCC
-CONFIGURE_DIR=win32
-CONFIGURE_ACTION=cscript configure.js
-.IF "$(debug)"!=""
-CONFIGURE_FLAGS+=debug=yes
-.ENDIF
-BUILD_ACTION=nmake
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32 CFG=release
+BUILD_DIR=
 .ENDIF
 
 OUT2INC+=src$/cairo-win32.h
@@ -106,7 +96,7 @@ OUT2INC+=src$/cairo-win32.h
 # ----------- Native Mac OS X (Aqua/Quartz) --------------------------------
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-freetype --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config CFLAGS="$(cairo_CFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -116,20 +106,19 @@ OUT2INC+=src$/cairo-quartz.h
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
 .ELIF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ELIF "$(OS)"=="MACOSX"      # X11 on Mac OS X
-cairo_LDFLAGS+=-lfontconfig -lXrender
+cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 
 .IF "$(SYSBASE)"!=""
 cairo_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS)
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl
+cairo_LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl
 .ENDIF
 .ENDIF			# "$(SYSBASE)"!=""
 
+LDFLAGS:=$(cairo_LDFLAGS)
 .EXPORT: LDFLAGS
 
 .IF "$(COMNAME)"=="sunpro5"
@@ -138,27 +127,36 @@ cairo_CFLAGS+=-xc99=none
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-xlib --enable-freetype --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no CFLAGS="$(cairo_CFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)" LDFLAGS="$(cairo_LDFLAGS)" pixman_CFLAGS="$(pixman_CFLAGS)" pixman_LIBS="$(pixman_LIBS)" ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(OS)"=="MACOSX"      # X11 on Mac OS X
-CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
-CONFIGURE_FLAGS+=--disable-quartz --disable-quartz-font PKG_CONFIG=./dummy_pkg_config
-.ENDIF
+CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 OUT2INC+=src$/cairo-xlib.h \
-     src$/cairo-xlib-xrender.h
+     src$/cairo-xlib-xrender.h \
+     src$/cairo-ft.h
 
 .ENDIF
 
 
-
 # -------- All platforms --------------------------------------------
 
+.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
+
+CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
+
+.ENDIF
 
-OUT2INC+=src$/cairo-deprecated.h \
+OUT2INC+=cairo-version.h \
+     src$/cairo-deprecated.h \
      src$/cairo-features.h  \
      src$/cairo-pdf.h	\
      src$/cairo-ps.h	\
@@ -171,8 +169,8 @@ OUT2LIB+=src$/.libs$/libcairo*.dylib
 OUT2BIN+=src$/.libs$/*.a
 OUT2BIN+=src$/.libs$/*.dll
 .ELSE
-OUT2LIB+=win32$/bin.msvc$/*.lib
-OUT2BIN+=win32$/bin.msvc$/*.dll
+OUT2LIB+=src$/release$/*.lib
+OUT2BIN+=src$/release$/*.dll
 .ENDIF
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
new file mode 100644
index 000000000000..4aa06811fbfc
--- /dev/null
+++ b/cairo/pixman-0.12.0.patch
@@ -0,0 +1,25 @@
+--- misc/build/pixman-0.12.0/configure.orig	2008-09-17 20:14:40.000000000 +0300
++++ misc/build/pixman-0.12.0/configure	2008-11-08 21:17:00.000000000 +0200
+@@ -19740,6 +19740,13 @@
+ 
+ 
+ 
++# getisax is falsely detected when using OOo build script on Linux/FBSD...
++case "$build_os" in
++     linux-gnu*)
++	;;
++     freebsd*)
++	;;
++     *)
+ 
+ for ac_func in getisax
+ do
+@@ -19834,6 +19841,8 @@
+ fi
+ done
+ 
++	;;
++esac
+ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index a6d5fef55c8d..b33d02ffc731 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -33,6 +33,7 @@ PRJ=..
 
 PRJNAME=cairo
 TARGET=so_pixman
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 # --- Settings -----------------------------------------------------
 
@@ -42,30 +43,28 @@ TARGET=so_pixman
 all:
         @echo "Nothing to do (Cairo not enabled)."
 
-.ELIF "$(SYSTEM_CAIRO)" == "YES"
+.ELIF "$(BUILD_PIXMAN)" == ""
 all:
-    @echo "Nothing to do, using system cairo."
-
-.ELIF "$(BUILD_CAIRO)" == ""
-all:
-       @echo "Not building cairo from source, prebuilt binaries will be used."
+       @echo "Not building pixman."
 
 .ENDIF
 
 # --- Files --------------------------------------------------------
 
-PIXMANVERSION=0.10.0
+PIXMANVERSION=0.12.0
 
 TARFILE_NAME=pixman-$(PIXMANVERSION)
+PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
 
 # Note: we are building static pixman library to avoid linking problems.
+# However, for Unix dynamic library must be used (especially due to 64bit issues)
 
 .IF "$(OS)"=="WNT"
 # --------- Windows -------------------------------------------------
 .IF "$(COM)"=="GCC"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(cairo_CFLAGS) -D_MT" LDFLAGS="$(cairo_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="$(pixman_CFLAGS) -D_MT" LDFLAGS="$(pixman_LDFLAGS) -no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" OBJDUMP="$(WRAPCMD) objdump"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -74,13 +73,8 @@ BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
 .ELSE   # WNT, not GCC
-CONFIGURE_DIR=win32
-CONFIGURE_ACTION=cscript configure.js
-.IF "$(debug)"!=""
-CONFIGURE_FLAGS+=debug=yes
-.ENDIF
-BUILD_ACTION=nmake
-BUILD_DIR=$(CONFIGURE_DIR)
+BUILD_DIR=pixman
+BUILD_ACTION=$(GNUMAKE) -f Makefile.win32
 .ENDIF
 
 .ELIF "$(GUIBASE)"=="aqua"
@@ -103,7 +97,7 @@ LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
 
 .IF "$(SYSBASE)"!=""
-cairo_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS)
+pixman_CFLAGS+=-I$(SYSBASE)$/usr$/include -I$(SOLARINCDIR)$/external $(EXTRA_CFLAGS)
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
 LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ldl
 .ENDIF
@@ -112,12 +106,14 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld
 .EXPORT: LDFLAGS
 
 .IF "$(COMNAME)"=="sunpro5"
-cairo_CFLAGS+=-xc99=none
+pixman_CFLAGS+=-xc99=none
 .ENDIF
 
+pixman_CFLAGS+=-fPIC
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CFLAGS="$(cairo_CFLAGS)"
+CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes CFLAGS="$(pixman_CFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -136,11 +132,10 @@ OUT2LIB+=pixman$/.libs$/libpixman-1.a
 .IF "$(COM)"=="GCC"
 OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
-OUT2LIB+=win32$/bin.msvc$/*.lib
-OUT2BIN+=win32$/bin.msvc$/*.dll
+OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
 .ELSE
-OUT2LIB+=pixman$/.libs$/libpixman-1.a
+OUT2LIB+=pixman$/.libs$/libpixman-1.so
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index ad4b0f73ba35..6f45aedc4047 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,5 +1,4 @@
-lcairo	cairo	: soltools NULL
+lcairo	cairo	: zlib soltools NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
-lcairo	cairo\zipped		    nmake	-	all	lcairo_zipped lcairo_cairo NULL
diff --git a/cairo/zipped/makefile.mk b/cairo/zipped/makefile.mk
deleted file mode 100644
index 90a61b6a8a1b..000000000000
--- a/cairo/zipped/makefile.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.3 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=cairo
-TARGET=cairo_unzip
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF  "$(ENABLE_CAIRO)" == ""
-all:
-    @echo "Nothing to do (Cairo not enabled)."
-
-.ELIF "$(SYSTEM_CAIRO)" == "YES"
-all:
-    @echo "Nothing to do, using system cairo."
-
-.ELIF "$(BUILD_CAIRO)" != ""
-all:
-       @echo "Not using prebuilt binaries, building cairo from source."
-
-.ELIF  "$(OS)" != "MACOSX" && "$(GUI)" != "WNT"
-all:
-    @echo "Cairo prebuilt not supported on this platform."
-
-.ELSE # unpack prebuild cairo libraries
-.INCLUDE :  target.mk
-
-ALLTAR: \
-    $(MISC)$/unpacked_$(TARGET)_inc \
-    $(MISC)$/unpacked_$(TARGET)_lib 
-
-.IF "$(OS)" == "MACOSX"
-
-# On Mac OS X the Cairo prebuilt binary is for native (Quartz) cairo only.
-# Intel library is MACOSXGCCI
-#
-CAIROURL=http://porting.openoffice.org/mac/prebuilt
-CAIROINC=cairo-$(OS)$(COM)$(CPU)-inc.tar.gz
-CAIROLIB=cairo-$(OS)$(COM)$(CPU)-lib.tar.gz
-
-$(MISC)$/unpacked_$(TARGET)_lib : $(CAIROLIB)
-    $(COPY) $< $(MISC)$/$<
-    cd $(LB) && tar xvzf ..$/misc$/$<
-    $(TOUCH) $@
-    chmod -R 775 $(LB)
-
-$(MISC)$/unpacked_$(TARGET)_inc : $(CAIROINC)
-    $(COPY) $< $(MISC)$/$<
-    cd $(INCCOM) && tar xvzf ..$/misc$/$<
-    $(TOUCH)	$@
-    chmod -R 775 $(INCCOM)
-
-
-.ELIF "$(GUI)" == "WNT"
-
-CAIROURL=http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
-CAIROINC=cairo-dev-1.4.8-win32-only.zip
-CAIROLIB=cairo-1.4.8-win32-only.zip
-
-$(MISC)$/unpacked_$(TARGET)_lib : $(CAIROLIB) 
-    unzip -o -d $(MISC)$/cairo$/ $<                          && \
-    $(COPY) -r $(MISC)$/cairo$/bin$/*cairo*.* $(LB)$/        && \
-    $(TOUCH) $@
-
-$(MISC)$/unpacked_$(TARGET)_inc : $(CAIROINC)
-    unzip -o -d $(MISC)$/cairo$/ $<                          && \
-    $(COPY) -r $(MISC)$/cairo$/include$/cairo $(INCCOM)$/    && \
-    $(COPY) -r $(MISC)$/cairo$/lib$/*cairo*.* $(LB)$/   	 && \
-    $(TOUCH)	$@
-
-.ENDIF # WNT
-
-$(CAIROLIB) : 
-        curl $(CAIROURL)/$(CAIROLIB) > $@
-
-$(CAIROINC) : 
-        curl $(CAIROURL)/$(CAIROINC) > $@
-
-
-.ENDIF	 # unpack prebuild cairo libraries
-