Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern-sys

Conflicts:
graphite/graphite2-0.9.2.patch

11 files changed, 111 insertions, 25 deletions

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index e693eb4cc019..d18396c0ac03 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -186,6 +186,15 @@ diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
  
  
  { echo "$as_me:$LINENO: checking for X" >&5
+@@ -31723,7 +31723,7 @@
+ 
+   if test "x$png_REQUIRES" = x; then
+     # libpng13 is GnuWin32's libpng-1.2.8 :-(
+-    for l in libpng12 libpng13 libpng10 ; do
++    for l in libpng12 libpng13 libpng14 libpng10 ; do
+       if $PKG_CONFIG --exists $l ; then
+         png_REQUIRES=$l
+         use_png=yes
 @@ -34097,7 +34129,7 @@
  
      # The ps backend requires zlib.
diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch
index 72970b663bec..016b65d8838b 100644
--- a/gettext/gettext-0.18.1.1.patch
+++ b/gettext/gettext-0.18.1.1.patch
@@ -2721,7 +2721,7 @@
 +#endif
 +
 +#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__) && HAVE_NEWLOCALE
++#if (defined __APPLE__ && defined __MACH__)
 +# include <xlocale.h>
 +#endif
 +
@@ -3016,7 +3016,7 @@
 +   or gettext() but for which the format string could be the return value
 +   of _() or gettext() need to add this #include.  Oh well.  */
 +
-+#if !0
++#if !(defined __APPLE__ && defined __MACH__)
 +
 +#include <stdio.h>
 +#include <stddef.h>
@@ -3138,7 +3138,7 @@
 +#define setlocale libintl_setlocale
 +extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
 +
-+#if HAVE_NEWLOCALE
++#if (defined __APPLE__ && defined __MACH__)
 +
 +#undef newlocale
 +#define newlocale libintl_newlocale
@@ -3194,7 +3194,7 @@
 +#define _LIBINTL_H 1
 +
 +#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__) && 0
++#if (defined __APPLE__ && defined __MACH__)
 +# include <xlocale.h>
 +#endif
 +
@@ -3485,7 +3485,7 @@
 +   or gettext() but for which the format string could be the return value
 +   of _() or gettext() need to add this #include.  Oh well.  */
 +
-+#if !0
++#if !(defined __APPLE__ && defined __MACH__)
 +
 +#include <stdio.h>
 +#include <stddef.h>
@@ -3607,7 +3607,7 @@
 +#define setlocale libintl_setlocale
 +extern char *setlocale (int, const char *);
 +
-+#if 0
++#if (defined __APPLE__ && defined __MACH__)
 +
 +#undef newlocale
 +#define newlocale libintl_newlocale
diff --git a/gettext/prj/d.lst b/gettext/prj/d.lst
index 09e9ea1c2e60..205abacc1435 100644
--- a/gettext/prj/d.lst
+++ b/gettext/prj/d.lst
@@ -10,6 +10,7 @@ symlink: %_DEST%\lib%_EXT%\libgettextsrc-0.18.1.dylib %_DEST%\lib%_EXT%\libgette
 symlink: %_DEST%\lib%_EXT%\libintl.8.dylib %_DEST%\lib%_EXT%\libintl.dylib
 ..\%__SRC%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib
 symlink: %_DEST%\lib%_EXT%\libgettextlib-0.18.1.dylib %_DEST%\lib%_EXT%\libgettextlib.dylib
+..\%__SRC%\lib\libintl.a %_DEST%\lib%_EXT%\libintl.a
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%
 ..\%__SRC%\bin\msgattrib %_DEST%\bin%_EXT%\msgattrib
 ..\%__SRC%\bin\msgcat %_DEST%\bin%_EXT%\msgcat
diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch
index cadcc4db2cb8..da993817da7f 100644
--- a/glib/glib-2.28.1.patch
+++ b/glib/glib-2.28.1.patch
@@ -39,3 +39,20 @@
  #include "gthreadprivate.h"
  
  /**
+--- misc/glib-2.28.1/glib/gconvert.c
++++ misc/build/glib-2.28.1/glib/gconvert.c
+@@ -58,13 +58,6 @@
+ 
+ #include "glibintl.h"
+ 
+-#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
+-#error GNU libiconv in use but included iconv.h not from libiconv
+-#endif
+-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+-#error GNU libiconv not in use but included iconv.h is from libiconv
+-#endif
+-
+ 
+ /**
+  * SECTION:conversions
+
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 70736ff88386..7d65bad2aa32 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -48,19 +48,44 @@ TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION)
 TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
 
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
 PATCH_FILES=glib-2.28.1.patch
 
-CONFIGURE_FLAGS=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS= \
+    glib_cv_stack_grows=no \
+    glib_cv_uscore=yes \
+    ac_cv_func_posix_getpwuid_r=yes \
+    ac_cv_func_posix_getgrgid_r=yes \
+    ac_cv_func__NSGetEnviron=no \
+    --disable-shared
+FRAMEWORK=-framework CoreFoundation
+.ELSE
+CONFIGURE_FLAGS=--disable-static
+.ENDIF
+
+CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
 CONFIGURE_FLAGS+=--disable-fam
 CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX"
 CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external"
-CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)"
+CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) $(FRAMEWORK)"
 
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+ 
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+
+.IF "$(VERBOSE)"!=""
+VFLAG=V=1
+.ENDIF
+
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
 
 EXTRPATH=LOADER
+
+.IF "$(OS)"=="MACOSX"
+
 OUT2LIB+=gio/.libs/libgio-2.0.0.dylib
 OUT2LIB+=glib/.libs/libglib-2.0.0.dylib
 OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib
@@ -69,6 +94,17 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib
 
 OUT2BIN+=gobject/glib-mkenums
 OUT2BIN+=gobject/.libs/glib-genmarshal
+OUT2BIN+=gio/.libs/glib-compile-schemas
+
+.ELIF "$(OS)"=="IOS"
+
+OUT2LIB+=gio/.libs/libgio-2.0.a
+OUT2LIB+=glib/.libs/libglib-2.0.a
+OUT2LIB+=gmodule/.libs/libgmodule-2.0.a
+OUT2LIB+=gobject/.libs/libgobject-2.0.a
+OUT2LIB+=gthread/.libs/libgthread-2.0.a
+
+.ENDIF
 
 OUT2INC+=glib/glib.h
 OUT2INC+=glib/glib-object.h
diff --git a/glib/prj/d.lst b/glib/prj/d.lst
index 851265ca79a2..5ec89f19a4e4 100644
--- a/glib/prj/d.lst
+++ b/glib/prj/d.lst
@@ -13,6 +13,7 @@ symlink: %_DEST%\lib%_EXT%\libgobject-2.0.0.dylib %_DEST%\lib%_EXT%\libgobject-2
 ..\%__SRC%\bin\glib-mkenums %_DEST%\bin%_EXT%\glib-mkenums
 ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin%_EXT%\glib-genmarshal
 ..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin%_EXT%\glib-genmarshal.exe
+..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin%_EXT%\glib-compile-schemas
 ..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib%_EXT%\gio-2.0.lib
 ..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib%_EXT%\gmodule-2.0.lib
 ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib%_EXT%\gthread-2.0.lib
diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch
index a775c1fe6c8e..c6d796867e13 100644
--- a/graphite/graphite2-0.9.2.patch
+++ b/graphite/graphite2-0.9.2.patch
@@ -371,15 +371,13 @@ diff -r 5369cdd12120 src/gr_slot.cpp
 diff current src/List.h
 --- misc/build/graphite2-0.9.2/src/List.h	Sat Feb 12 22:54:16 2011 +0700
 +++ misc/build/graphite2-0.9.2/src/List.h	Fri Feb 18 16:05:40 2011 +0700
-@@ -51,6 +51,6 @@
+@@ -51,5 +51,5 @@
      template <typename I> 
      Vector(I first, const I last)               : m_first(0), m_last(0), m_end(0) { insert(begin(), first, last); }
 -    ~Vector() { free(m_first); }
 +    ~Vector() { clear(); free(m_first); }
      
      iterator            begin()         { return m_first; }
-     const_iterator      begin() const   { return m_first; }
-
 --- misc/graphite2-0.9.2/src/Code.cpp	2011-02-12 16:54:16.000000000 +0100
 +++ misc/build/graphite2-0.9.2/src/Code.cpp	2011-03-11 11:28:11.700215286 +0100
 @@ -168,7 +168,7 @@
@@ -393,15 +391,27 @@ diff current src/List.h
           0,0,0,0,0,0,0,0, 
 --- misc/graphite2-0.9.2/include/graphite2/Types.h	2011-02-12 16:54:16.000000000 +0100
 +++ misc/build/graphite2-0.9.2/include/graphite2/Types.h	2011-03-15 21:38:06.264788098 +0100
-@@ -36,7 +36,7 @@
- };
+@@ -36,19 +36,7 @@
  
  // Definitions for library publicly exported symbols
--#if defined _WIN32 || defined __CYGWIN__
-+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
-   #ifdef GR2_EXPORTING
-     #ifdef __GNUC__
-       #define GR2_API    __attribute__((dllexport))
+ #if defined _WIN32 || defined __CYGWIN__
+-  #ifdef GR2_EXPORTING
+-    #ifdef __GNUC__
+-      #define GR2_API    __attribute__((dllexport))
+-    #else
+-      #define GR2_API    __declspec(dllexport)
+-    #endif
+-  #else
+-    #ifdef __GNUC__
+-      #define GR2_API    __attribute__((dllimport))
+-    #else
+-      #define GR2_API    __declspec(dllimport)
+-    #endif
+-  #endif
++  #define GR2_API
+   #define GR2_LOCAL
+ #else
+   #if __GNUC__ >= 4
 diff -r b3a86877ec68 src/Pass.cpp
 --- misc/build/graphite2-0.9.2/src/Pass.cpp	Wed May 11 09:34:52 2011 +0700
 +++ misc/build/graphite2-0.9.2/src/Pass.cpp	Mon May 16 13:54:00 2011 +0700
diff --git a/icu/makefile.mk b/icu/makefile.mk
index b23aa6667c1d..684785500c31 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -110,7 +110,7 @@ CONFIGURE_DIR=source
 .IF "$(OS)"=="IOS"
 STATIC_OR_SHARED=--enable-static --disable-shared
 .ELSE
-STATIC_OR_SHARED==--disable-static --enable-shared
+STATIC_OR_SHARED=--disable-static --enable-shared
 .ENDIF
 
 .IF "$(CROSS_COMPILING)"!=""
diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch
index a39758367f83..12d20c660129 100644
--- a/libgsf/libgsf-1.14.19.patch
+++ b/libgsf/libgsf-1.14.19.patch
@@ -18,3 +18,12 @@
  
  
  
+@@ -11963,7 +11963,7 @@
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+-if test "x" != "xno-xml"; then
++if test "xno-xml" != "xno-xml"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index fc2897deaec1..955925ff7ce2 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -37,8 +37,8 @@ TARGET=so_libgsf
 
 .IF "$(SYSTEM_LIBGSF)" == "YES"
 all:
-    @echo "An already available installation of gdk-pixbuf should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of gdk-pixbuf should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -67,7 +67,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  .$/configure \
                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
                  LDFLAGS="-L$(SOLARLIBDIR)" \
                  --without-python \
                  --without-bonobo \
diff --git a/pango/makefile.mk b/pango/makefile.mk
index fddbbecf83a1..6e9165e8ecf5 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -67,7 +67,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 CONFIGURE_ACTION+="--without-x"
 
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
+.IF "$(VERBOSE)"!=""
+VFLAG=V=1
+.ENDIF
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
 BUILD_DIR=$(CONFIGURE_DIR)
 
 EXTRPATH=LOADER