Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg

Now with librsvg no longer used, and liblangtag no longer using glib, a bunch of bundled (in some configurations, always on some platforms) 3rd-party libraries are no longer needed. Initial work by rene, continued by tml. Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
author: Tor Lillqvist <tml@iki.fi> 2012-11-06 18:08:16 +0200
committer: Tor Lillqvist <tml@iki.fi> 2012-11-06 18:59:44 +0200
commit: e10124b20efb8cb7caf0f02fc537147a6505aa1d (patch)
tree: 4b1590fccf7d083da11a2e7e5b197af34d30b8f4
parent: 7b58bf4c0bd6614e8ebf8d4fee880a235834323c (diff)
73 files changed, 12 insertions, 12259 deletions
diff --git a/Makefile.top b/Makefile.top
index acdfcb90b0f6..1a56a3a7c57a 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -167,6 +167,7 @@ sot\
 starmath\
 stoc\
 store\
+svgio\
 svl\
 svtools\
 svx\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index af387b1cdc98..142f828025e3 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	libcmis \
 	libmspub \
 	liborcus \
-	$(call gb_Helper_optional,LIBRSVG,librsvg) \
 	libvisio \
 	libwpd \
 	libwpg \
diff --git a/Repository.mk b/Repository.mk
index de354f28d0f6..f4b6985b871c 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -465,7 +465,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     pyuno \
     pyuno_wrapper \
     recentfile \
-	librsvg-2-2 \
     scriptframe \
     sdbc2 \
     smoketest \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 716e1a7e2581..6d68b30e8941 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -593,42 +593,10 @@ endef
 
 endif # SYSTEM_LIBXSLT
 
-
-ifeq ($(SYSTEM_GLIB),YES)
-
-define gb_LinkTarget__use_glib
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(GLIB_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(GLIB_LIBS))
-
-endef
-
-else # !SYSTEM_GLIB
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	glib-2.0 \
-	gmodule-2.0 \
-))
-
 define gb_LinkTarget__use_glib
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/glib-2.0 \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-	glib-2.0 \
-	gmodule-2.0 \
-)
-
+$(error gb_LinkTarget__use_glib should not be called any more)
 endef
 
-endif # SYSTEM_GLIB
-
-
 ifeq ($(ENABLE_LIBLANGTAG),YES)
 
 ifeq ($(SYSTEM_LIBLANGTAG),YES)
@@ -654,12 +622,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 	langtag \
 )
 
-ifeq ($(OS),MACOSX)
-
-$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,libglib-2.0.0 libgmodule-2.0.0,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib))
-
-endif
-
 endef
 
 endif # SYSTEM_LIBLANGTAG
@@ -1308,25 +1270,10 @@ endef
 
 else # ENABLE_GIO
 
-ifeq ($(SYSTEM_GLIB),YES)
-
-gb_LinkTarget__use_gio :=
-
-else # !SYSTEM_GLIB
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	gio-2.0 \
-))
-
 define gb_LinkTarget__use_gio
-$(call gb_LinkTarget_use_libraries,$(1),\
-	gio-2.0 \
-)
-
+$(error gb_LinkTarget__use_gio should not be used any more)
 endef
 
-endif # SYSTEM_GLIB
-
 endif # ENABLE_GIO
 
 define gb_LinkTarget__use_gtk
@@ -1352,27 +1299,10 @@ endif
 
 endef
 
-ifeq ($(SYSTEM_GLIB),YES)
-
 define gb_LinkTarget__use_gthread
-$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
-
+$(error gb_LinkTarget__use_gthread should not be used any more)
 endef
 
-else # !SYSTEM_GLIB
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	gthread-2.0 \
-))
-
-define gb_LinkTarget__use_gthread
-$(call gb_LinkTarget_use_libraries,$(1),\
-	gthread-2.0 \
-)
-endef
-
-endif # SYSTEM_GLIB
-
 ifeq ($(ENABLE_CUPS),TRUE)
 
 define gb_LinkTarget__use_cups
@@ -1458,108 +1388,22 @@ gb_LinkTarget__use_telepathy :=
 
 endif # ENABLE_TELEPATHY
 
-ifeq ($(SYSTEM_LIBCROCO),NO)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	croco-0.6-3 \
-))
-
 define gb_LinkTarget__use_croco
-
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/libcroco-0.6 \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-	croco-0.6-3 \
-)
-
+$(error gb_LinkTarget__use_croco should not be used any more)
 endef
 
-else # !SYSTEM_LIBCROCO
-
-gb_LinkTarget__use_croco :=
-
-endif # SYSTEM_LIBCROCO
-
-ifeq ($(SYSTEM_PANGO),NO)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	pango-1.0 \
-	pangocairo-1.0 \
-))
-
 define gb_LinkTarget__use_pango
-
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/pango-1.0 \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-	pango-1.0 \
-	pangocairo-1.0 \
-)
-
+$(error gb_LinkTarget__use_pango should not be used any more)
 endef
 
-else # !SYSTEM_PANGO
-
-gb_LinkTarget__use_pango :=
-
-endif # SYSTEM_PANGO
-
-ifeq ($(SYSTEM_LIBGSF),NO)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	gsf-1 \
-))
-
 define gb_LinkTarget__use_gsf
-
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/libgsf-1 \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-	gsf-1 \
-)
-
+$(error gb_LinkTarget__use_gsf should not be used any more)
 endef
 
-else # !SYSTEM_LIBGSF
-
-gb_LinkTarget__use_gsf :=
-
-endif # SYSTEM_LIBGSF
-
-ifeq ($(SYSTEM_GDKPIXBUF),NO)
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	gdk_pixbuf-2.0 \
-))
-
 define gb_LinkTarget__use_pixbuf
-
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-	gdk_pixbuf-2.0 \
-)
-
+$(error gb_LinkTarget__use_pixbuf should not be used any more)
 endef
 
-else # !SYSTEM_GDKPIXBUF
-
-gb_LinkTarget__use_pixbuf :=
-
-endif # SYSTEM_GDKPIXBUF
-
 ifeq ($(SYSTEM_DB),YES)
 
 define gb_LinkTarget__use_berkeleydb
@@ -1776,32 +1620,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
 
 endif # SYSTEM_CLUCENE
 
-ifeq ($(SYSTEM_GLIB),YES)
 define gb_LinkTarget__use_gobject
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(GOBJECT_LIBS) \
-)
-
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(GOBJECT_CFLAGS) \
-)
+$(error gb_LinkTarget__use_gobject should not be used any more)
 endef
 
-else # !SYSTEM_GLIB
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	gobject-2.0 \
-))
-
-define gb_LinkTarget__use_gobject
-$(call gb_LinkTarget_use_libraries,$(1),\
-	gobject-2.0 \
-)
-endef
-
-endif # !SYSTEM_GLIB
-
 ifeq ($(SYSTEM_HSQLDB),YES)
 
 define gb_LinkTarget__use_hsqldb
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 752bfdc35875..16732d4464a8 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -107,7 +107,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	libmspub \
 	liborcus \
 	libpng \
-	$(call gb_Helper_optional,LIBRSVG,librsvg) \
 	libvisio \
 	libwpd \
 	libwpg \
diff --git a/config_host.mk.in b/config_host.mk.in
index 48758f172966..d4e83f2806d3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_KAB=@ENABLE_KAB@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_KDE=@ENABLE_KDE@
 export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
-export ENABLE_LIBRSVG=@ENABLE_LIBRSVG@
 export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
 export ENABLE_LOMENUBAR=@ENABLE_LOMENUBAR@
 export ENABLE_LTO=@ENABLE_LTO@
@@ -202,8 +201,6 @@ export GIO_CFLAGS=@GIO_CFLAGS@
 export GIO_LIBS=@GIO_LIBS@
 export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
-export GLIB_CFLAGS=@GLIB_CFLAGS@
-export GLIB_LIBS=@GLIB_LIBS@
 export PARALLELISM=@PARALLELISM@
 export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
@@ -332,7 +329,6 @@ export LIBMYSQL_PATH=@LIBMYSQL_PATH@
 export LIBPNG_CFLAGS=@LIBPNG_CFLAGS@
 export LIBPNG_LIBS=@LIBPNG_LIBS@
 export LIBREPOSITORY_JAR=@LIBREPOSITORY_JAR@
-export LIBRSVG_TARBALL=@LIBRSVG_TARBALL@
 export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@
 export LIBXML_CFLAGS=@LIBXML_CFLAGS@
 export LIBXML_JAR=@LIBXML_JAR@
@@ -366,8 +362,6 @@ export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@
 export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@
 export MINGW_GCCDLL=@MINGW_GCCDLL@
 export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@
-export MINGW_GLIB_DLL=@MINGW_GLIB_DLL@
-export MINGW_GMODULE_DLL=@MINGW_GMODULE_DLL@
 export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@
 export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@
 export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
@@ -379,7 +373,6 @@ export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@
 export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
 export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
 export MINGW_IDN_DLL=@MINGW_IDN_DLL@
-export MINGW_INTL_DLL=@MINGW_INTL_DLL@
 export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
 export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
 export MINGW_LIBEXSLT_DLL=@MINGW_LIBEXSLT_DLL@
@@ -574,12 +567,9 @@ export SYSTEM_DB=@SYSTEM_DB@
 export SYSTEM_DB_CFLAGS=@SYSTEM_DB_CFLAGS@
 export SYSTEM_DICTS=@SYSTEM_DICTS@
 export SYSTEM_EXPAT=@SYSTEM_EXPAT@
-export SYSTEM_GDKPIXBUF=@SYSTEM_GDKPIXBUF@
 export SYSTEM_GENBRK=@SYSTEM_GENBRK@
 export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
 export SYSTEM_GENCMN=@SYSTEM_GENCMN@
-export SYSTEM_GETTEXT=@SYSTEM_GETTEXT@
-export SYSTEM_GLIB=@SYSTEM_GLIB@
 export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
 export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
 export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@
@@ -591,15 +581,12 @@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@
 export SYSTEM_LIBC=@SYSTEM_LIBC@
 export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@
 export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@
-export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
-export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
 export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
-export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
 export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
 export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
 export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
@@ -620,7 +607,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
 export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
-export SYSTEM_PANGO=@SYSTEM_PANGO@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
 export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
 export SYSTEM_PYTHON=@SYSTEM_PYTHON@
diff --git a/configure.ac b/configure.ac
index a94739cd8f2b..d5e784bb1c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,14 +833,6 @@ AC_ARG_ENABLE(cairo-canvas,
                           platforms where Cairo is available.
 ])
 
-AC_ARG_ENABLE(librsvg,
-    AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal/fully-internal>],
-        [Enables or disables use of librsvg to render SVG at run-time.
-         Also specificed what librsvg to use. 'auto' is the default.
-         'fully-internal' also forces internal versions of libraries (only)
-         librsvg depends on (currently GLib, gdk-pixbuf, libcroco, libgsf,
-         pango).]))
-
 AC_ARG_ENABLE(opengl,
     AS_HELP_STRING([--disable-opengl],
         [Determines whether to build the OpenGL 3D slide transitions component.]),
@@ -1260,11 +1252,6 @@ AC_ARG_WITH(system-cairo,
         [Use Cairo libraries already on system.]),,
     [with_system_cairo="$with_system_libs"])
 
-AC_ARG_WITH(system-glib,
-    AS_HELP_STRING([--with-system-glib],
-        [Use GLib library already installed on system.]),,
-    [with_system_glib=auto])
-
 AC_ARG_WITH(system-graphite,
     AS_HELP_STRING([--with-system-graphite],
         [Use graphite library already installed on system.]),,
@@ -4297,7 +4284,6 @@ if test "$enable_headless" = "yes"; then
     test_kde4=no
     test_unix_quickstarter=no
     test_cairo=no
-    enable_librsvg=no
     enable_gnome_vfs=no
 fi
 
@@ -11376,114 +11362,6 @@ AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
 
 dnl ===================================================================
-dnl Checks for librsvg
-dnl ===================================================================
-
-dnl ENABLE_LIBRSVG is set to NO, SYSTEM or INTERNAL. The
-dnl SYSTEM_LIBRSVG, SYSTEM_GDKPIXBUF etc are redundant.
-
-dnl FIXME: RSVG is a hard dependency now as the impress masterpages use it
-dnl FIXME: thus the --enable-rsvg=no is not really an option anymore and we
-dnl should error out in that case. leaving as is for now as this might be an
-dnl unwelcome buildbreaker otherwise
-ENABLE_LIBRSVG=""
-LIBRSVG_CFLAGS=""
-LIBRSVG_LIBS=""
-
-AC_MSG_CHECKING([what librsvg to use])
-
-case "$enable_librsvg" in
-no|disable)
-    AC_MSG_RESULT([none])
-    enable_librsvg=no
-    ;;
-
-""|yes|auto)
-    if test $build_os = cygwin -o \
-           $_os = Darwin; then
-        dnl When building on/for these OSes always use the internal one,
-        dnl if at all. Add more OSes above as needed.
-        AC_MSG_RESULT([internal])
-        enable_librsvg=internal
-    elif test  $_os = iOS -o $_os = Android; then
-        AC_MSG_RESULT([none])
-        enable_librsvg=no
-    else
-        if test "$with_system_libs" = yes; then
-            AC_MSG_RESULT([system])
-            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-            enable_librsvg=system
-        elif test "$with_system_libs" = no; then
-            AC_MSG_RESULT([internal])
-            enable_librsvg=internal
-        else
-            AC_MSG_RESULT([checking further])
-            PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14,, [:])
-            if test -z "$LIBRSVG_PKG_ERRORS"; then
-                enable_librsvg=system
-            else
-                enable_librsvg=internal
-            fi
-        fi
-    fi
-    ;;
-
-internal)
-    AC_MSG_RESULT([internal])
-    ;;
-
-fully-internal)
-    AC_MSG_RESULT([fully internal])
-    ;;
-
-system)
-    if test $_os = WINNT -a "$WITH_MINGW" != yes; then
-        AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
-    fi
-    AC_MSG_RESULT([system])
-    PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= 2.14)
-    ;;
-
-*)
-    AC_MSG_ERROR([Incorrect --enable-librsvg option])
-    ;;
-esac
-
-want_glib=
-dnl By now enable_librsvg should be "system", "internal", "fully-internal", or
-dnl "no":
-case $enable_librsvg in
-system)
-    ENABLE_LIBRSVG=SYSTEM
-    SYSTEM_LIBRSVG=YES
-    want_glib=yes
-    ;;
-
-internal|fully-internal)
-    ENABLE_LIBRSVG=INTERNAL
-    SYSTEM_LIBRSVG=NO
-    BUILD_TYPE="$BUILD_TYPE LIBRSVG"
-	LIBRSVG_TARBALL="d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz"
-    want_glib=yes
-    ;;
-
-no)
-    ENABLE_LIBRSVG=NO
-    SYSTEM_LIBRSVG=NO
-    ;;
-
-*)
-    AC_MSG_ERROR([Internal configure script error, invalid enable_librsvg value "$enable_librsvg"])
-    ;;
-esac
-
-AC_SUBST(ENABLE_LIBRSVG)
-AC_SUBST(LIBRSVG_TARBALL)
-AC_SUBST(LIBRSVG_CFLAGS)
-AC_SUBST(LIBRSVG_LIBS)
-AC_SUBST(SYSTEM_LIBRSVG)
-
-dnl ===================================================================
 dnl Test whether to build cairo or rely on the system version
 dnl ===================================================================
 
@@ -11524,7 +11402,7 @@ if test "$test_cairo" = "yes" ; then
         if test $_os = WINNT; then
             dnl We only need cairo for Windows if we
             dnl build librsvg or directx disabled
-            if test "$ENABLE_LIBRSVG" != NO -o -z "$ENABLE_DIRECTX"; then
+            if test -z "$ENABLE_DIRECTX"; then
                 BUILD_TYPE="$BUILD_TYPE CAIRO"
             fi
         else
@@ -11532,9 +11410,7 @@ if test "$test_cairo" = "yes" ; then
                 BUILD_TYPE="$BUILD_TYPE CAIRO"
             else
                 if test "$with_system_cairo" != "yes"; then
-                    if test "$ENABLE_LIBRSVG" != NO; then
-                        BUILD_TYPE="$BUILD_TYPE CAIRO"
-                    fi
+                    BUILD_TYPE="$BUILD_TYPE CAIRO"
                 fi
             fi
         fi
@@ -11550,44 +11426,6 @@ AC_SUBST([MINGW_FREETYPE_DLL])
 AC_SUBST([MINGW_PIXMAN_DLL])
 AC_SUBST([MINGW_PNG15_DLL])
 
-
-dnl ===================================================================
-dnl Test whether to build gdk-pixbuf or rely on the system version
-dnl ===================================================================
-
-if test "$ENABLE_LIBRSVG" != NO; then
-    AC_MSG_CHECKING([whether to use the system gdk-pixbuf])
-
-    dnl As long as the only thing we need gdk-pixbuf for is below
-    dnl librsvg, use the same --enable-librsvg (possibly implied
-    dnl by --with-system-libs) to override this.
-
-    if test "$SYSTEM_LIBRSVG" = YES; then
-        SYSTEM_GDKPIXBUF=YES
-    elif test "$enable_librsvg" = fully-internal; then
-        SYSTEM_GDKPIXBUF=NO
-    else
-        case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_GDKPIXBUF=NO
-            ;;
-        *)
-            SYSTEM_GDKPIXBUF=YES
-            ;;
-        esac
-    fi
-
-    if test "$SYSTEM_GDKPIXBUF" = YES; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        BUILD_TYPE="$BUILD_TYPE GDK_PIXBUF"
-    fi
-else
-    SYSTEM_GDKPIXBUF=NO
-fi
-AC_SUBST(SYSTEM_GDKPIXBUF)
-
 dnl ===================================================================
 dnl Test whether to use liblangtag
 dnl ===================================================================
@@ -11617,186 +11455,6 @@ AC_SUBST(SYSTEM_LIBLANGTAG)
 AC_SUBST(LIBLANGTAG_CFLAGS)
 AC_SUBST(LIBLANGTAG_LIBS)
 AC_SUBST([MINGW_LIBLANGTAG_DLL])
-AC_SUBST([MINGW_GLIB_DLL])
-AC_SUBST([MINGW_GMODULE_DLL])
-
-dnl ===================================================================
-dnl Test whether to build GLib or rely on the system version
-dnl ===================================================================
-
-if test "$want_glib" = yes; then
-    if test "$with_system_glib" = auto; then
-        case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            with_system_glib="$with_system_libs"
-            ;;
-        *)
-            with_system_glib=yes
-            ;;
-        esac
-    fi
-
-    AC_MSG_CHECKING([which GLib to use])
-
-    if test "$with_system_glib" = yes; then
-        AC_MSG_RESULT([external])
-        SYSTEM_GLIB=YES
-        PKG_CHECK_MODULES( GLIB, glib-2.0 )
-        libo_MINGW_CHECK_DLL([GLIB], [libglib-2.0])
-        libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
-    else
-        AC_MSG_RESULT([internal])
-        SYSTEM_GLIB=NO
-        BUILD_TYPE="$BUILD_TYPE GLIB"
-    fi
-fi
-AC_SUBST([SYSTEM_GLIB])
-AC_SUBST([GLIB_CFLAGS])
-AC_SUBST([GLIB_LIBS])
-
-dnl ===================================================================
-dnl Test whether to build gettext runtime (libintl) or rely on the
-dnl system version
-dnl ===================================================================
-
-AC_MSG_CHECKING([whether to use the system gettext runtime])
-
-if test -z "$with_system_gettext"; then
-    case "$_os" in
-    WINNT|Darwin|iOS|Android)
-        with_system_gettext=no
-        ;;
-    *)
-        with_system_gettext=yes
-        ;;
-    esac
-fi
-if test "$with_system_gettext" = yes; then
-    SYSTEM_GETTEXT=YES
-    AC_MSG_RESULT([yes])
-elif test "$with_system_gettext" = no; then
-    SYSTEM_GETTEXT=NO
-    dnl gettext is only used by the librsvg stack, so let us not build
-    dnl it unless it is actually needed
-    if test "$ENABLE_LIBRSVG" != NO; then
-        BUILD_TYPE="$BUILD_TYPE GETTEXT"
-    fi
-    AC_MSG_RESULT([no])
-else
-    AC_MSG_ERROR([bad --with-system-gettext=$with_system_gettext])
-fi
-AC_SUBST(SYSTEM_GETTEXT)
-
-dnl ===================================================================
-dnl Test whether to build libcroco or rely on the system version
-dnl ===================================================================
-
-if test "$ENABLE_LIBRSVG" != NO; then
-    AC_MSG_CHECKING([whether to use the system libcroco])
-
-    dnl As long as the only thing we need libcroco for is below
-    dnl librsvg, use the same --enable-librsvg (possibly implied
-    dnl by --with-system-libs) to override this.
-
-    if test "$SYSTEM_LIBRSVG" = YES; then
-        SYSTEM_LIBCROCO=YES
-    elif test "$enable_librsvg" = fully-internal; then
-        SYSTEM_LIBCROCO=NO
-    else
-        case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBCROCO=NO
-            ;;
-        *)
-            SYSTEM_LIBCROCO=YES
-            ;;
-        esac
-    fi
-
-    if test "$SYSTEM_LIBCROCO" = YES; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        BUILD_TYPE="$BUILD_TYPE LIBCROCO"
-    fi
-else
-    SYSTEM_LIBCROCO=NO
-fi
-AC_SUBST(SYSTEM_LIBCROCO)
-
-dnl ===================================================================
-dnl Test whether to build Pango or rely on the system version
-dnl ===================================================================
-
-if test "$ENABLE_LIBRSVG" != NO; then
-    AC_MSG_CHECKING([whether to use the system pango])
-
-    dnl As long as the only thing we need Pango for is below
-    dnl librsvg, use the same --enable-librsvg (possibly implied
-    dnl by --with-system-libs) to override this.
-
-    if test "$SYSTEM_LIBRSVG" = YES; then
-        SYSTEM_PANGO=YES
-    elif test "$enable_librsvg" = fully-internal; then
-        SYSTEM_PANGO=NO
-    else
-        case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_PANGO=NO
-            ;;
-        *)
-            SYSTEM_PANGO=YES
-            ;;
-        esac
-    fi
-
-    if test "$SYSTEM_PANGO" = YES; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        BUILD_TYPE="$BUILD_TYPE PANGO"
-    fi
-else
-    SYSTEM_PANGO=NO
-fi
-AC_SUBST(SYSTEM_PANGO)
-
-dnl ===================================================================
-dnl Test whether to build libgsf or rely on the system version
-dnl ===================================================================
-
-if test "$ENABLE_LIBRSVG" != NO; then
-    AC_MSG_CHECKING([whether to use the system libgsf])
-
-    dnl As long as the only thing we need libgsf for is below librsvg (is
-    dnl it?), use the same --enable-librsvg (possibly implied by
-    dnl --with-system-libs) to override this.
-
-    if test "$SYSTEM_LIBRSVG" = YES; then
-        SYSTEM_LIBGSF=YES
-    elif test "$enable_librsvg" = fully-internal; then
-        SYSTEM_LIBGSF=NO
-    else
-        case "$_os" in
-        WINNT|Darwin|iOS|Android)
-            SYSTEM_LIBGSF=NO
-            ;;
-        *)
-            SYSTEM_LIBGSF=YES
-            ;;
-        esac
-    fi
-
-    if test "$SYSTEM_LIBGSF" = YES; then
-        AC_MSG_RESULT([yes])
-    else
-        AC_MSG_RESULT([no])
-        BUILD_TYPE="$BUILD_TYPE LIBGSF"
-    fi
-else
-    SYSTEM_LIBGSF=NO
-fi
-AC_SUBST(SYSTEM_LIBGSF)
 
 dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version
diff --git a/gdk-pixbuf/README b/gdk-pixbuf/README
deleted file mode 100644
index 0af0a8229585..000000000000
--- a/gdk-pixbuf/README
+++ /dev/null
@@ -1,10 +0,0 @@
-GdkPixbuf is a library for image loading and pixel buffer manipulation.
-And it's provides a number of features:
-
-	- Image loading saving facilities.
-	- Rendering of a GdkPixBuf into various formats:
-	  drawables (windows, pixmaps), GdkRGB buffers.
-                - Fast scaling and compositing of pixbufs.
-                - Simple animation loading (ie. animated GIFs)
-
-See Also [ http://developer.gnome.org/gdk-pixbuf/stable/ ]
-\ No newline at end of file
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch
deleted file mode 100644
index a6f6a84d95ae..000000000000
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch
+++ /dev/null
@@ -1,463 +0,0 @@
---- misc/gdk-pixbuf-2.23.0/config.h.win32	2011-03-24 04:59:07.000000000 +0100
-+++ misc/build/gdk-pixbuf-2.23.0/config.h.win32	2011-03-22 01:58:24.296875000 +0100
-@@ -1 +1,126 @@
--dummy
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define to 1 if translation of program messages to the user's native
-+   language is requested. */
-+#undef ENABLE_NLS
-+
-+/* Define if gio can sniff image data */
-+#undef GDK_PIXBUF_USE_GIO_MIME
-+
-+/* The prefix for our gettext translation domains. */
-+#define GETTEXT_PACKAGE "intl.dll"
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-+
-+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-+   CoreFoundation framework. */
-+#undef HAVE_CFLOCALECOPYCURRENT
-+
-+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-+   the CoreFoundation framework. */
-+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-+
-+/* Define if the GNU dcgettext() function is already present or preinstalled.
-+   */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#define HAVE_GETTEXT 1
-+
-+/* Define if you have the iconv() function and it works. */
-+#define HAVE_ICONV 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 is libjpeg supports progressive JPEG */
-+#define HAVE_PROGRESSIVE_JPEG 1
-+
-+/* Define to 1 if sigsetjmp is available */
-+#undef HAVE_SIGSETJMP
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if sys/sysinfo.h is available */
-+#undef HAVE_SYS_SYSINFO_H
-+
-+/* Define to 1 if sys/systeminfo.h is available */
-+#undef HAVE_SYS_SYSTEMINFO_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if gmodule works and should be used */
-+#undef USE_GMODULE
-+
-+/* Whether to load modules via .la files rather than directly */
-+#undef USE_LA_MODULES
-+
-+/* Define to 1 if medialib is available and should be used */
-+#undef USE_MEDIALIB
-+
-+/* Define to 1 if medialib 2.5 is available */
-+#undef USE_MEDIALIB25
-+
-+/* Define to 1 if XXM is available and should be used */
-+#undef USE_MMX
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const    
---- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
-@@ -30,6 +30,10 @@
- #include <pngstruct.h>
- #include "gdk-pixbuf-private.h"
- 
-+#ifndef png_jmpbuf
-+#  define png_jmpbuf(png_ptr) ((png_ptr)->png_jmpbuf)
-+#endif
-+
- 
- 
- static gboolean
-@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_save_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf (png_save_ptr), 1);
- }
- 
- static void
-@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (png_ptr))) {
- 	    	g_free (rows);
- 
- 		if (pixbuf)
-@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                 return NULL;
-         }
-         
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
-         lc->error = error;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
-                 lc->error = NULL;
- 		return FALSE;
- 	} else {
-@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_read_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf (png_read_ptr), 1);
- }
- 
- static void
-@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
- 	       success = FALSE;
- 	       goto cleanup;
-        }
--       if (setjmp (png_ptr->jmpbuf)) {
-+       if (setjmp (png_jmpbuf (png_ptr))) {
- 	       success = FALSE;
- 	       goto cleanup;
-        }
-
---- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc	2010-06-25 23:40:10.000000000 +0200
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/makefile.msc	2011-03-24 06:13:30.515625000 +0100
-@@ -1,9 +1,19 @@
--TOP = ..\..
- PRJ_TOP = ..
-+GLIB_TOP =
- PACKAGE = gdk_pixbuf
- PKG_VER = $(GDK_PIXBUF_VER)
-+GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
-+LIBPNG_INC = -I$(OUTDIR)\inc\external\libpng
-+LIBJPEG_INC = -I$(OUTDIR)\inc\external\libjpeg
-+
-+INTL_LIB = $(OUTDIR)\lib\intl.lib
-+GLIB_LIB = $(OUTDIR)\lib\glib-2.0.lib $(OUTDIR)\lib\gobject-2.0.lib  $(OUTDIR)\lib\gmodule-2.0.lib  $(OUTDIR)\lib\gio-2.0.lib $(OUTDIR)\lib\gthread-2.0.lib	
-+LIBJPEG_LIB = $(OUTDIR)\lib\jpeg.lib
-+LIBPNG_LIB = $(OUTDIR)\lib\libpng.lib
-+ZLIB_LIB = $(OUTDIR)\lib\zlib.lib
-+GDIPLUS_LIB = gdiplus.lib
- 
--!INCLUDE $(TOP)/glib/build/win32/make.msc
-+!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc
- 
- !IFNDEF PERL
- PERL = perl
-@@ -13,22 +23,22 @@
- 
- # -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg  -DINCLUDE_tiff
- # but not yet -DINCLUDE_png 
--##USEGDIP=1
-+USEGDIP=1
- # to get _working_ include modules we need respective defines ...
- #   
- BUILT_IN_FORMATS = \
- !IFDEF USEGDIP
- 	-DINCLUDE_gdiplus \
- !ELSE
--	-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff \
-+	-DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg \
- !ENDIF
- 	-DINCLUDE_png \
- 	-DINCLUDE_xpm -DINCLUDE_wbmp \
- 	-DINCLUDE_pnm -DINCLUDE_ras
- 
--PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
-+PKG_CFLAGS = -FI$(PRJ_TOP)\msvc_recommended_pragmas.h \
- !IFNDEF USEGDIP
-- 	$(JPEG_CFLAGS) $(TIFF_CFLAGS) \
-+ 	$(JPEG_CFLAGS) \
- !ENDIF
- 	-I. -I.. $(GLIB_CFLAGS) \
- 	$(BUILT_IN_FORMATS) \
-@@ -39,13 +49,14 @@
- 	-UUSE_GMODULE # use built-in
- #	-DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
- 
--PKG_LINK = $(GLIB_LIBS) \
--!IFNDEF USEGDIP
--	$(TIFF_LIBS) $(JPEG_LIBS) \
--!ENDIF
--	$(PNG_LIBS) $(INTL_LIBS) \
--	pixops\pixops.lib \
-- 
-+PKG_LINK = 	$(INTL_LIB)		\
-+					$(GLIB_LIB)		\
-+					$(LIBPNG_LIB)	\
-+					$(LIBJPEG_LIB)	\
-+					$(ZLIB_LIB)		\
-+					$(GDIPLUS_LIB)	\
-+					pixops\pixops.lib
-+
- OBJECTS_NON_NATIVE = \
- 	io-bmp.obj \
- 	io-gif.obj \
-@@ -95,13 +106,13 @@
- 	gdk-pixbuf-transform.h
- 
- gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list
--	..\..\glib\gobject\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >gdk-pixbuf-marshal.h
-+	$(OUTDIR)\bin\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >gdk-pixbuf-marshal.h
- 
- gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.h gdk-pixbuf-marshal.list
--	..\..\glib\gobject\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >gdk-pixbuf-marshal.c
-+	$(OUTDIR)\bin\glib-genmarshal --prefix=_gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >gdk-pixbuf-marshal.c
- 
--gdk-pixbuf-alias.h: gdk-pixbuf.symbols
--	perl makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h
-+#gdk-pixbuf-alias.h: gdk-pixbuf.symbols
-+#	perl makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h
- 
- gdk_pixbuf.def: gdk-pixbuf.symbols makefile.msc
- 	echo EXPORTS > gdk_pixbuf.def
-@@ -109,14 +120,15 @@
- 	-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF \
- 	gdk-pixbuf.symbols >> gdk_pixbuf.def
- 
--gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
--	 perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
-+#gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
-+#	 perl makegdkpixbufalias.pl -def < gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
- 
- ## common stuff
- 
- INSTALL = copy
- 
--CFLAGS = -I. -DHAVE_CONFIG_H
-+CFLAGS = -I. $(SOLARINC) $(GLIB_INC) $(LIBPNG_INC) $(LIBJPEG_INC) \
-+    -DHAVE_CONFIG_H -DGDK_PIXBUF_LOCALEDIR="\"locale_dummy\""   
- 
- sub-pixops :
- 	cd pixops
-@@ -126,19 +138,19 @@
- ## targets
- all : \
- 	$(PRJ_TOP)\config.h \
--	gdk-pixbuf-alias.h \
--	gdk-pixbuf-aliasdef.c \
-+#	gdk-pixbuf-alias.h \
-+#	gdk-pixbuf-aliasdef.c \
- 	gdk-pixbuf-marshal.h \
- 	gdk-pixbuf-marshal.c \
- 	sub-pixops \
- 	lib$(PACKAGE)-$(PKG_VER)-0.dll \
--	$(PACKAGE)-$(PKG_VER)s.lib \
-+	$(PACKAGE)-$(PKG_VER)s.lib 
- #	make-inline-pixbuf.exe \
--	gdk-pixbuf-csource.exe \
--	test-gdk-pixbuf.exe
-+#	gdk-pixbuf-csource.exe \
-+#	test-gdk-pixbuf.exe
- 
- $(PACKAGE).res : $(PACKAGE).rc
--	rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
-+	rc -I $(SOLARINCLUDES) -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
- 
- $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
- 	lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
-@@ -160,7 +172,7 @@
- # gdk-pixbuf-enum-types.h
- #
- gdk-pixbuf-enum-types.h : $(gdk_pixbuf_headers) makefile.msc
--	$(PERL) $(GLIB)\gobject\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"         \
-@@ -171,8 +183,8 @@
- # gdk-pixbuf-enum-types.c
- #
- 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 \
-+		--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[] = {"       \
- 		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-@@ -188,10 +200,10 @@
- 	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
- 
- clean::
--	del config.h
--	del gdk-pixbuf-marshal.h
--	del gdk-pixbuf-marshal.c
--	del gdk-pixbuf-alaias.h
-+	rm config.h
-+	rm gdk-pixbuf-marshal.h
-+	rm gdk-pixbuf-marshal.c
-+	rm gdk-pixbuf-alaias.h
- 
- 
- 
---- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/makefile.msc	2010-06-25 23:40:10.000000000 +0200
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/makefile.msc	2011-03-24 06:03:59.062500000 +0100
-@@ -1,10 +1,11 @@
--TOP = ../../..
--PACKAGE = pixops
- PRJ_TOP = ..\..
-+PACKAGE = pixops
-+GLIB_TOP =
-+GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
- 
--!INCLUDE $(TOP)/glib/build/win32/make.msc
-+!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc
- 
--PKG_CFLAGS = -I.. $(GLIB_CFLAGS)
-+PKG_CFLAGS = -I.. $(SOLARINC) $(GLIB_INC) $(GLIB_CFLAGS)
- 
- OBJECTS = \
- 	pixops.obj \
-@@ -50,16 +51,16 @@
- 	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
- 
- clean::
--	del config.h
--	del *.exe
--	del *.obj
--	del *.dll
--	del *.lib
--	del *.err
--	del *.map
--	del *.sym
--	del *.exp
--	del *.lk1
--	del *.mk1
--	del *.pdb
--	del *.ilk
-+	rm config.h
-+	rm *.exe
-+	rm *.obj
-+	rm *.dll
-+	rm *.lib
-+	rm *.err
-+	rm *.map
-+	rm *.sym
-+	rm *.exp
-+	rm *.lk1
-+	rm *.mk1
-+	rm *.pdb
-+	rm *.ilk
---- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/pixops.c	2010-06-25 23:40:10.000000000 +0200
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/pixops/pixops.c	2011-03-22 01:58:24.281250000 +0100
-@@ -21,7 +21,7 @@
-  */
- #include "config.h"
- #include <math.h>
--#include <glib.h>
-+#include <glib-2.0\glib.h>
- 
- #include "pixops.h"
- #include "pixops-internal.h"
---- misc/gdk-pixbuf-2.23.0/msvc_recommended_pragmas.h	2011-03-24 04:59:07.625000000 +0100
-+++ misc/build/gdk-pixbuf-2.23.0/msvc_recommended_pragmas.h	2011-03-22 01:58:24.359375000 +0100
-@@ -1 +1,31 @@
--dummy
-+#ifndef _MSC_VER
-+#pragma error "This header is for Microsoft VC only."
-+#endif /* _MSC_VER */
-+
-+/* Make MSVC more pedantic, this is a recommended pragma list
-+ * from _Win32_Programming_ by Rector and Newcomer.
-+ */
-+#pragma warning(error:4002) /* too many actual parameters for macro */
-+#pragma warning(error:4003) /* not enough actual parameters for macro */
-+#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
-+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-+#pragma warning(1:4016)     /* no function return type; using int as default */
-+#pragma warning(error:4020) /* too many actual parameters */
-+#pragma warning(error:4021) /* too few actual parameters */
-+#pragma warning(error:4027) /* function declared without formal parameter list */
-+#pragma warning(error:4029) /* declared formal parameter list different from definition */
-+#pragma warning(error:4033) /* 'function' must return a value */
-+#pragma warning(error:4035) /* 'function' : no return value */
-+#pragma warning(error:4045) /* array bounds overflow */
-+#pragma warning(error:4047) /* different levels of indirection */
-+#pragma warning(error:4049) /* terminating line number emission */
-+#pragma warning(error:4053) /* An expression of type void was used as an operand */
-+#pragma warning(error:4071) /* no function prototype given */
-+#pragma warning(disable:4101) /* unreferenced local variable */
-+#pragma warning(error:4150)
-+
-+#pragma warning(disable:4244)	/* No possible loss of data warnings */
-+#pragma warning(disable:4305)   /* No truncation from int to char warnings */
-+
-+/* work around Microsoft's premature attempt to deprecate the C-Library */
-+#pragma warning(disable:4996)   /* This function or variable may be unsafe. */
diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
deleted file mode 100644
index fccd992da74f..000000000000
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ /dev/null
@@ -1,171 +0,0 @@
---- misc/gdk-pixbuf-2.23.0/configure	2010-12-23 15:18:11.000000000 +0100
-+++ misc/build/gdk-pixbuf-2.23.0/configure	2011-06-14 15:20:05.000000000 +0200
-@@ -16839,7 +16839,7 @@
- 
- 
- 
--
-+if false; then
- 
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then
-@@ -17158,14 +17158,18 @@
- 
- 
-   rm -f conf.glibtest
--
-+else
-+  GLIB_MKENUMS=glib-mkenums
-+  GLIB_GENMARSHAL=glib-genmarshal
-+  GOBJECT_QUERY=gobject-query
-+fi
- 
- # See if it's safe to turn G_DISABLE_DEPRECATED on.
--GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
--GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
--if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-+#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-+#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
-+#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
--fi
-+#fi
- 
- CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
- 
-@@ -17801,7 +17805,7 @@
-     for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5
- $as_echo_n "checking for $l... " >&6; }
--      if $PKG_CONFIG --exists $l ; then
-+      if false ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-         PNG='png'
-@@ -18206,8 +18210,8 @@
- $as_echo_n "checking if gio can sniff png... " >&6; }
-   gtk_save_LIBS="$LIBS"
-   gtk_save_CFLAGS="$CFLAGS"
--  LIBS="`$PKG_CONFIG --libs gio-2.0`"
--  CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-+  #LIBS="`$PKG_CONFIG --libs gio-2.0`"
-+  #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-   if test "$cross_compiling" = yes; then :
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-@@ -18622,8 +18626,8 @@
- GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
- GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
- GDK_PIXBUF_EXTRA_CFLAGS=
--GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-+GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
-+GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
- 
- 
- 
-@@ -18640,7 +18644,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
- 
--if $PKG_CONFIG --exists x11; then
-+if false; then
-    if true; then
-   USE_X11_TRUE=
-   USE_X11_FALSE='#'
---- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
-@@ -23,7 +23,9 @@
- 
- #include "config.h"
- #include <string.h>
-+#ifdef ENABLE_NLS
- #include <libintl.h>
-+#endif
- 
- #include "gdk-pixbuf-transform.h"
- #include "gdk-pixbuf-private.h"
-@@ -336,15 +338,19 @@
- const gchar *
- gdk_pixbuf_gettext (const gchar *msgid)
- {
-+#ifdef ENABLE_NLS
-         static gsize gettext_initialized = FALSE;
- 
-         if (G_UNLIKELY (g_once_init_enter (&gettext_initialized))) {
-                 bindtextdomain (GETTEXT_PACKAGE, GDK_PIXBUF_LOCALEDIR);
- #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-                 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- #endif
-                 g_once_init_leave (&gettext_initialized, TRUE);
-         }
- 
-         return g_dgettext (GETTEXT_PACKAGE, msgid);
-+#else
-+        return msgid;
-+#endif
- }
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 24 Jan 2011 10:39:22 +0000
-Subject: Use png_jmpbuf macro
-
-This makes the png loader compatible with libpng 1.5
-
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 79c81fd..76f3304 100644
---- misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
-+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/io-png.c
-@@ -183,7 +183,7 @@ png_simple_error_callback(png_structp png_save_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_save_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf (png_save_ptr), 1);
- }
- 
- static void
-@@ -287,7 +287,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
- 		return NULL;
- 	}
- 
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (png_ptr))) {
- 	    	g_free (rows);
- 
- 		if (pixbuf)
-@@ -459,7 +459,7 @@ gdk_pixbuf__png_image_begin_load (GdkPixbufModuleSizeFunc size_func,
-                 return NULL;
-         }
-         
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
- 		if (lc->png_info_ptr)
- 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
-                 g_free(lc);
-@@ -531,7 +531,7 @@ gdk_pixbuf__png_image_load_increment(gpointer context,
-         lc->error = error;
-         
-         /* Invokes our callbacks as needed */
--	if (setjmp (lc->png_read_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf (lc->png_read_ptr))) {
-                 lc->error = NULL;
- 		return FALSE;
- 	} else {
-@@ -769,7 +769,7 @@ png_error_callback(png_structp png_read_ptr,
-                              error_msg);
-         }
- 
--        longjmp (png_read_ptr->jmpbuf, 1);
-+        longjmp (png_jmpbuf (png_read_ptr), 1);
- }
- 
- static void
-@@ -978,7 +978,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
- 	       success = FALSE;
- 	       goto cleanup;
-        }
--       if (setjmp (png_ptr->jmpbuf)) {
-+       if (setjmp (png_jmpbuf (png_ptr))) {
- 	       success = FALSE;
- 	       goto cleanup;
-        }
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
deleted file mode 100644
index dec7ea4aa6ee..000000000000
--- a/gdk-pixbuf/makefile.mk
+++ /dev/null
@@ -1,128 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=gdk-pixbuf
-TARGET=so_gdk-pixbuf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_GDKPIXBUF)" == "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."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-GDKPIXBUFVERSION=2.23.0
-
-TARFILE_NAME=$(PRJNAME)-$(GDKPIXBUFVERSION)
-TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
-               
-.IF "$(OS)"=="MACOSX"
-
-PATCH_FILES=gdk-pixbuf-2.23.0.patch
-
-LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
-LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0
-EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                BASE_DEPENDENCIES_LIBS=" " \
-		GDK_PIXBUF_XLIB_DEP_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
-		GDK_PIXBUF_XLIB_DEP_LIBS=" " \
-                 ./configure --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
-                 CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
-                 LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
-                 --prefix=/@.__________________________________________________$(EXTRPATH) \
-                 --disable-nls \
-                 --disable-modules \
-                 --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
-                 --disable-glibtest --without-libtiff --without-libjasper
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
-.ENDIF
-
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=gdk-pixbuf/.libs/libgdk_pixbuf-2.0.0.dylib
-
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h
-OUT2INC+=gdk-pixbuf/gdk-pixdata.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h
-
-.ELIF "$(OS)"=="WNT"
-
-PATCH_FILES=gdk-pixbuf-2.23.0-win32.patch
-ADDITIONAL_FILES=config.h.win32 glib-mkenums.pl msvc_recommended_pragmas.h 
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-BUILD_DIR=./gdk-pixbuf
-BUILD_ACTION=unset debug; nmake -f makefile.msc
-
-OUT2LIB+=gdk-pixbuf/gdk_pixbuf-2.0.lib
-
-OUT2BIN+=gdk-pixbuf/libgdk_pixbuf-2.0-0.dll
-
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h
-OUT2INC+=gdk-pixbuf/gdk-pixdata.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h
-OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h
-
-.ELSE
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/gdk-pixbuf/prj/build.lst b/gdk-pixbuf/prj/build.lst
deleted file mode 100644
index 3064f623416e..000000000000
--- a/gdk-pixbuf/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-gp	gdk-pixbuf	: GLIB:glib GETTEXT:gettext JPEG:jpeg LIBPNG:libpng soltools NULL
-gp	gdk-pixbuf			    usr1	-	all	gp_mkout NULL
-gp	gdk-pixbuf			    nmake	-	all	gp_gdk-pixbuf NULL
diff --git a/gdk-pixbuf/prj/d.lst b/gdk-pixbuf/prj/d.lst
deleted file mode 100644
index a6dac87058e5..000000000000
--- a/gdk-pixbuf/prj/d.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0
-mkdir: %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf
-
-..\%__SRC%\inc\gdk-pixbuf-animation.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-animation.h
-..\%__SRC%\inc\gdk-pixbuf-features.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-features.h
-..\%__SRC%\inc\gdk-pixbuf-marshal.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-marshal.h
-..\%__SRC%\inc\gdk-pixbuf.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf.h
-..\%__SRC%\inc\gdk-pixbuf-core.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-core.h
-..\%__SRC%\inc\gdk-pixbuf-io.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-io.h
-..\%__SRC%\inc\gdk-pixbuf-simple-anim.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-simple-anim.h
-..\%__SRC%\inc\gdk-pixdata.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixdata.h
-..\%__SRC%\inc\gdk-pixbuf-enum-types.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-enum-types.h
-..\%__SRC%\inc\gdk-pixbuf-loader.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-loader.h
-..\%__SRC%\inc\gdk-pixbuf-transform.h %_DEST%\inc\external\gdk-pixbuf-2.0\gdk-pixbuf\gdk-pixbuf-transform.h
-
-..\%__SRC%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib
-symlink: %_DEST%\lib\libgdk_pixbuf-2.0.0.dylib %_DEST%\lib\libgdk_pixbuf-2.0.dylib
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\lib\gdk_pixbuf-2.0.lib %_DEST%\lib\gdk_pixbuf-2.0.lib
diff --git a/gdk-pixbuf/prj/dmake b/gdk-pixbuf/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gdk-pixbuf/prj/dmake
+++ /dev/null
diff --git a/gettext/README b/gettext/README
deleted file mode 100644
index e2466cacb214..000000000000
--- a/gettext/README
+++ /dev/null
@@ -1,5 +0,0 @@
-
-GNU `gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages.
-
-Seel Also [ http://www.gnu.org/software/gettext/manual/gettext.html ]
-
diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch
deleted file mode 100644
index 3f1cdf3ca308..000000000000
--- a/gettext/gettext-0.18.1.1.patch
+++ /dev/null
@@ -1,3640 +0,0 @@
---- misc/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/makefile.mk	Wed Aug 20 14:26:42 2008
-@@ -1,1 +1,110 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# 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=..$/..$/..$/..$/..$/..
-+PRJINC=..
-+PRJNAME=gettext
-+TARGET=intl
-+
-+#ENABLE_EXCEPTIONS=TRUE
-+VISIBILITY_HIDDEN=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
-+
-+# --- Settings ----------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+CFLAGS+=-c -DLOCALEDIR=\"./share/locale\" -DLOCALE_ALIAS_PATH=\"./share/locale\" -DLIBDIR=\"./lib\" 
-+CFLAGS+=-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"./lib\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate 
-+CFLAGS+=-DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I. -I..
-+
-+.IF "$(GUI)"=="WNT"
-+CFLAGS+=-DBUILDING_DLL -DDLL_EXPORT -DPIC
-+.ENDIF
-+
-+# --- Files -------------------------------------
-+
-+SLOFILES=\
-+	$(SLO)$/bindtextdom.obj \
-+	$(SLO)$/dcgettext.obj \
-+	$(SLO)$/dgettext.obj \
-+	$(SLO)$/gettext.obj \
-+	$(SLO)$/finddomain.obj \
-+	$(SLO)$/hash-string.obj \
-+	$(SLO)$/loadmsgcat.obj \
-+	$(SLO)$/localealias.obj \
-+	$(SLO)$/textdomain.obj \
-+	$(SLO)$/l10nflist.obj \
-+	$(SLO)$/explodename.obj \
-+	$(SLO)$/dcigettext.obj \
-+	$(SLO)$/dcngettext.obj \
-+	$(SLO)$/dngettext.obj \
-+	$(SLO)$/ngettext.obj \
-+	$(SLO)$/plural.obj \
-+	$(SLO)$/plural-exp.obj \
-+	$(SLO)$/localcharset.obj \
-+	$(SLO)$/threadlib.obj \
-+	$(SLO)$/lock.obj \
-+	$(SLO)$/relocatable.obj \
-+	$(SLO)$/langprefs.obj \
-+	$(SLO)$/localename.obj \
-+	$(SLO)$/log.obj \
-+	$(SLO)$/printf.obj \
-+	$(SLO)$/setlocale.obj \
-+	$(SLO)$/version.obj \
-+	$(SLO)$/osdep.obj \
-+	$(SLO)$/intl-compat.obj
-+
-+# --- Library -----------------------------------
-+
-+SHL1TARGET=	$(TARGET)
-+SHL1OBJS=$(SLOFILES)
-+SHL1STDLIBS=\
-+	Advapi32.lib
-+
-+
-+SHL1DEPN=
-+#SHL1IMPLIB=	i$(TARGET)
-+#SHL1USE_EXPORTS=name
-+
-+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=	$(SHL1TARGET)
-+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
-+			$(SLB)$/$(TARGET).lib
-+DEFLIB1NAME=$(TARGET)
-+
-+# --- Targets ----------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# --- filter file ------------------------------
-+
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+    @echo CLEAR_THE_FILE	> $@
-+
---- misc/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c	2010-06-06 14:49:57.000000000 +0200
-+++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/printf-parse.c	2011-03-09 11:51:02.615094200 +0100
-@@ -75,6 +74,9 @@
- # include "c-ctype.h"
- #endif
- 
-+typedef __int64 intmax_t;
-+
-+
- #ifdef STATIC
- STATIC
- #endif
---- misc/gettext-0.18.1.1/gettext-runtime/config.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/gettext-0.18.1.1/gettext-runtime/config.h	Wed Aug 20 14:26:42 2008
-@@ -1,1 +1,2560 @@
--dummy
-+#ifdef _WIN32
-+/* config.h.  Generated from config.h.in by configure.  */
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if the compiler is building for multiple architectures of Apple
-+   platforms at once. */
-+/* #undef AA_APPLE_UNIVERSAL_BUILD */
-+
-+/* Define to the number of bits in type 'ptrdiff_t'. */
-+#define BITSIZEOF_PTRDIFF_T 32
-+
-+/* Define to the number of bits in type 'sig_atomic_t'. */
-+#define BITSIZEOF_SIG_ATOMIC_T 32
-+
-+/* Define to the number of bits in type 'size_t'. */
-+#define BITSIZEOF_SIZE_T 32
-+
-+/* Define to the number of bits in type 'wchar_t'. */
-+#define BITSIZEOF_WCHAR_T 16
-+
-+/* Define to the number of bits in type 'wint_t'. */
-+#define BITSIZEOF_WINT_T 16
-+
-+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c' support on those systems.
-+   */
-+/* #undef CRAY_STACKSEG_END */
-+
-+/* Define if mono is the preferred C# implementation. */
-+/* #undef CSHARP_CHOICE_MONO */
-+
-+/* Define if pnet is the preferred C# implementation. */
-+/* #undef CSHARP_CHOICE_PNET */
-+
-+/* Define to 1 if using `alloca.c'. */
-+/* #undef C_ALLOCA */
-+
-+/* Define to 1 if // is a file system root distinct from /. */
-+#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1
-+
-+/* Define to 1 if translation of program messages to the user's native
-+   language is requested. */
-+#define ENABLE_NLS 1
-+
-+/* Define to 1 if the package shall run at any location in the file system. */
-+/* #undef ENABLE_RELOCATABLE */
-+
-+/* Define on systems for which file names may have a so-called `drive letter'
-+   prefix, define this to compute the length of that prefix, including the
-+   colon. */
-+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 1
-+
-+/* Define if the backslash character may also serve as a file name component
-+   separator. */
-+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 1
-+
-+/* Define if a drive letter prefix denotes a relative path if it is not
-+   followed by a file name component separator. */
-+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1
-+
-+/* Define to 1 if realpath() can malloc memory, always gives an absolute path,
-+   and handles trailing slash correctly. */
-+/* #undef FUNC_REALPATH_WORKS */
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module canonicalize-lgpl shall be considered present. */
-+#define GNULIB_CANONICALIZE_LGPL 1
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module fwriteerror shall be considered present. */
-+#define GNULIB_FWRITEERROR 1
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module sigpipe shall be considered present. */
-+#define GNULIB_SIGPIPE 1
-+
-+/* Define to 1 when the gnulib module canonicalize_file_name should be tested.
-+   */
-+#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1
-+
-+/* Define to 1 when the gnulib module environ should be tested. */
-+#define GNULIB_TEST_ENVIRON 1
-+
-+/* Define to 1 when the gnulib module getopt-gnu should be tested. */
-+#define GNULIB_TEST_GETOPT_GNU 1
-+
-+/* Define to 1 when the gnulib module lstat should be tested. */
-+#define GNULIB_TEST_LSTAT 1
-+
-+/* Define to 1 when the gnulib module malloc-posix should be tested. */
-+#define GNULIB_TEST_MALLOC_POSIX 1
-+
-+/* Define to 1 when the gnulib module mbrtowc should be tested. */
-+#define GNULIB_TEST_MBRTOWC 1
-+
-+/* Define to 1 when the gnulib module mbsinit should be tested. */
-+#define GNULIB_TEST_MBSINIT 1
-+
-+/* Define to 1 when the gnulib module mbslen should be tested. */
-+#define GNULIB_TEST_MBSLEN 1
-+
-+/* Define to 1 when the gnulib module mbsstr should be tested. */
-+#define GNULIB_TEST_MBSSTR 1
-+
-+/* Define to 1 when the gnulib module memchr should be tested. */
-+#define GNULIB_TEST_MEMCHR 1
-+
-+/* Define to 1 when the gnulib module readlink should be tested. */
-+#define GNULIB_TEST_READLINK 1
-+
-+/* Define to 1 when the gnulib module realpath should be tested. */
-+#define GNULIB_TEST_REALPATH 1
-+
-+/* Define to 1 when the gnulib module sigprocmask should be tested. */
-+#define GNULIB_TEST_SIGPROCMASK 1
-+
-+/* Define to 1 when the gnulib module stat should be tested. */
-+#define GNULIB_TEST_STAT 1
-+
-+/* Define to 1 when the gnulib module strerror should be tested. */
-+#define GNULIB_TEST_STRERROR 1
-+
-+/* Define to 1 when the gnulib module strnlen should be tested. */
-+#define GNULIB_TEST_STRNLEN 1
-+
-+/* Define to 1 when the gnulib module wcwidth should be tested. */
-+#define GNULIB_TEST_WCWIDTH 1
-+
-+/* Define to 1 if you have `alloca', as a function or macro. */
-+#define HAVE_ALLOCA 1
-+
-+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+/* #undef HAVE_ALLOCA_H */
-+
-+/* Define to 1 if you have the `argz_count' function. */
-+/* #undef HAVE_ARGZ_COUNT */
-+
-+/* Define to 1 if you have the <argz.h> header file. */
-+/* #undef HAVE_ARGZ_H */
-+
-+/* Define to 1 if you have the `argz_next' function. */
-+/* #undef HAVE_ARGZ_NEXT */
-+
-+/* Define to 1 if you have the `argz_stringify' function. */
-+/* #undef HAVE_ARGZ_STRINGIFY */
-+
-+/* Define to 1 if you have the `asprintf' function. */
-+/* #undef HAVE_ASPRINTF */
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#define HAVE_ATEXIT 1
-+
-+/* Define to 1 if you have the <bp-sym.h> header file. */
-+/* #undef HAVE_BP_SYM_H */
-+
-+/* Define to 1 if the compiler understands __builtin_expect. */
-+/* #undef HAVE_BUILTIN_EXPECT */
-+
-+/* Define to 1 if you have the `canonicalize_file_name' function. */
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
-+
-+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-+   CoreFoundation framework. */
-+/* #undef HAVE_CFLOCALECOPYCURRENT */
-+
-+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-+   the CoreFoundation framework. */
-+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-+
-+/* Define if the GNU dcgettext() function is already present or preinstalled.
-+   */
-+/* #undef HAVE_DCGETTEXT */
-+
-+/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_CLEARERR_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_FEOF_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FERROR_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FFLUSH_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FGETS_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FPUTC_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FPUTS_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FREAD_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FWRITE_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_GETCHAR_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_GETC_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-+   */
-+#define HAVE_DECL_GETENV 1
-+
-+/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you
-+   don't. */
-+/* #undef HAVE_DECL_GETOPT_CLIP */
-+
-+/* Define to 1 if you have the declaration of `optreset', and to 0 if you
-+   don't. */
-+/* #undef HAVE_DECL_OPTRESET */
-+
-+/* Define to 1 if you have the declaration of `program_invocation_name', and
-+   to 0 if you don't. */
-+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
-+
-+/* Define to 1 if you have the declaration of `program_invocation_short_name',
-+   and to 0 if you don't. */
-+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
-+
-+/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_PUTCHAR_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_PUTC_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_STRERROR 1
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_STRERROR_R 0
-+
-+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_STRNLEN 1
-+
-+/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_WCWIDTH 0
-+
-+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-+   don't. */
-+#define HAVE_DECL__SNPRINTF 1
-+
-+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-+   don't. */
-+#define HAVE_DECL__SNWPRINTF 1
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+/* #undef HAVE_DLFCN_H */
-+
-+/* Define if you have the declaration of environ. */
-+/* #undef HAVE_ENVIRON_DECL */
-+
-+/* Define to 1 if you have the <errno.h> header file. */
-+#define HAVE_ERRNO_H 1
-+
-+/* Define to 1 if you have the `fwprintf' function. */
-+#define HAVE_FWPRINTF 1
-+
-+/* Define to 1 if you have the `getcwd' function. */
-+#define HAVE_GETCWD 1
-+
-+/* Define to 1 if you have the `getegid' function. */
-+/* #undef HAVE_GETEGID */
-+
-+/* Define to 1 if you have the `geteuid' function. */
-+/* #undef HAVE_GETEUID */
-+
-+/* Define to 1 if you have the `getgid' function. */
-+/* #undef HAVE_GETGID */
-+
-+/* Define to 1 if you have the <getopt.h> header file. */
-+/* #undef HAVE_GETOPT_H */
-+
-+/* Define to 1 if you have the `getopt_long_only' function. */
-+/* #undef HAVE_GETOPT_LONG_ONLY */
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+/* #undef HAVE_GETPAGESIZE */
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+/* #undef HAVE_GETTEXT */
-+
-+/* Define to 1 if you have the `getuid' function. */
-+/* #undef HAVE_GETUID */
-+
-+/* Define if you have the iconv() function and it works. */
-+/* #undef HAVE_ICONV */
-+
-+/* Define to 1 if you have the <iconv.h> header file. */
-+/* #undef HAVE_ICONV_H */
-+
-+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-+/* #undef HAVE_INTMAX_T */
-+#ifndef _MSC_VER
-+#define HAVE_INTMAX_T 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTMAX_T */
-+#endif /* _MSC_VER */
-+
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+/* #undef HAVE_INTTYPES_H */
-+#ifndef _MSC_VER
-+#define HAVE_INTTYPES_H 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTTYPES_H */
-+#endif /* _MSC_VER */
-+
-+
-+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-+   declares uintmax_t. */
-+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
-+#ifndef _MSC_VER
-+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
-+#endif /* _MSC_VER */
-+
-+
-+/* Define to 1 if you have the `iswblank' function. */
-+/* #undef HAVE_ISWBLANK */
-+
-+/* Define to 1 if you have the `iswcntrl' function. */
-+#define HAVE_ISWCNTRL 1
-+
-+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-+/* #undef HAVE_LANGINFO_CODESET */
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+/* #undef HAVE_LC_MESSAGES */
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if the system has the type `long long int'. */
-+#define HAVE_LONG_LONG_INT 1
-+
-+/* Define to 1 if you have the `lstat' function. */
-+/* #undef HAVE_LSTAT */
-+
-+/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-+/* #undef HAVE_MACH_O_DYLD_H */
-+
-+/* Define if the 'malloc' function is POSIX compliant. */
-+/* #undef HAVE_MALLOC_POSIX */
-+
-+/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
-+   config.h and <sys/mman.h>. */
-+/* #undef HAVE_MAP_ANONYMOUS */
-+
-+/* Define to 1 if you have the `mbrtowc' function. */
-+#define HAVE_MBRTOWC 1
-+
-+/* Define to 1 if you have the `mbsinit' function. */
-+/* #undef HAVE_MBSINIT */
-+
-+/* Define to 1 if you have the `mbslen' function. */
-+/* #undef HAVE_MBSLEN */
-+
-+/* Define to 1 if <wchar.h> declares mbstate_t. */
-+#define HAVE_MBSTATE_T 1
-+
-+/* Define to 1 if you have the `memchr' function. */
-+#define HAVE_MEMCHR 1
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#define HAVE_MEMMOVE 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the `mempcpy' function. */
-+/* #undef HAVE_MEMPCPY */
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+/* #undef HAVE_MMAP */
-+
-+/* Define to 1 if you have the `mprotect' function. */
-+/* #undef HAVE_MPROTECT */
-+
-+/* Define to 1 if you have the `munmap' function. */
-+/* #undef HAVE_MUNMAP */
-+
-+/* Define to 1 if you have the `newlocale' function. */
-+/* #undef HAVE_NEWLOCALE */
-+
-+/* Define to 1 if you have the `pathconf' function. */
-+/* #undef HAVE_PATHCONF */
-+
-+/* Define if your printf() function supports format strings with positions. */
-+/* #undef HAVE_POSIX_PRINTF */
-+
-+/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-+/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */
-+
-+/* Define if the POSIX multithreading library has read/write locks. */
-+/* #undef HAVE_PTHREAD_RWLOCK */
-+
-+/* Define to 1 if you have the `putenv' function. */
-+#define HAVE_PUTENV 1
-+
-+/* Define to 1 if you have the <random.h> header file. */
-+/* #undef HAVE_RANDOM_H */
-+
-+/* Define to 1 if atoll is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_ATOLL */
-+
-+/* Define to 1 if btowc is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_BTOWC 1
-+
-+/* Define to 1 if canonicalize_file_name is declared even after undefining
-+   macros. */
-+/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */
-+
-+/* Define to 1 if chown is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_CHOWN */
-+
-+/* Define to 1 if dprintf is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_DPRINTF */
-+
-+/* Define to 1 if dup2 is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_DUP2 1
-+
-+/* Define to 1 if dup3 is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_DUP3 */
-+
-+/* Define to 1 if endusershell is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_ENDUSERSHELL */
-+
-+/* Define to 1 if environ is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_ENVIRON */
-+
-+/* Define to 1 if euidaccess is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_EUIDACCESS */
-+
-+/* Define to 1 if faccessat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FACCESSAT */
-+
-+/* Define to 1 if fchdir is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FCHDIR */
-+
-+/* Define to 1 if fchmodat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FCHMODAT */
-+
-+/* Define to 1 if fchownat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FCHOWNAT */
-+
-+/* Define to 1 if fpurge is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FPURGE */
-+
-+/* Define to 1 if fseeko is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FSEEKO */
-+
-+/* Define to 1 if fstatat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FSTATAT */
-+
-+/* Define to 1 if fsync is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FSYNC */
-+
-+/* Define to 1 if ftello is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FTELLO */
-+
-+/* Define to 1 if ftruncate is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FTRUNCATE */
-+
-+/* Define to 1 if futimens is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FUTIMENS */
-+
-+/* Define to 1 if getcwd is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETCWD */
-+
-+/* Define to 1 if getdelim is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETDELIM */
-+
-+/* Define to 1 if getdomainname is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETDOMAINNAME */
-+
-+/* Define to 1 if getdtablesize is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETDTABLESIZE */
-+
-+/* Define to 1 if getgroups is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETGROUPS */
-+
-+/* Define to 1 if gethostname is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETHOSTNAME */
-+
-+/* Define to 1 if getline is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETLINE */
-+
-+/* Define to 1 if getloadavg is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETLOADAVG */
-+
-+/* Define to 1 if getlogin is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETLOGIN */
-+
-+/* Define to 1 if getlogin_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETLOGIN_R */
-+
-+/* Define to 1 if getpagesize is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETPAGESIZE */
-+
-+/* Define to 1 if getsubopt is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETSUBOPT */
-+
-+/* Define to 1 if getusershell is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETUSERSHELL */
-+
-+/* Define to 1 if grantpt is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GRANTPT */
-+
-+/* Define to 1 if initstat_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_INITSTAT_R */
-+
-+/* Define to 1 if lchmod is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LCHMOD */
-+
-+/* Define to 1 if lchown is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LCHOWN */
-+
-+/* Define to 1 if link is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LINK */
-+
-+/* Define to 1 if linkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LINKAT */
-+
-+/* Define to 1 if lseek is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_LSEEK 1
-+
-+/* Define to 1 if lstat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LSTAT */
-+
-+/* Define to 1 if mbrlen is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBRLEN 1
-+
-+/* Define to 1 if mbrtowc is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBRTOWC 1
-+
-+/* Define to 1 if mbsinit is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBSINIT 1
-+
-+/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MBSNRTOWCS */
-+
-+/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBSRTOWCS 1
-+
-+/* Define to 1 if memmem is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMMEM */
-+
-+/* Define to 1 if mempcpy is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMPCPY */
-+
-+/* Define to 1 if memrchr is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMRCHR */
-+
-+/* Define to 1 if mkdirat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKDIRAT */
-+
-+/* Define to 1 if mkdtemp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKDTEMP */
-+
-+/* Define to 1 if mkfifo is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKFIFO */
-+
-+/* Define to 1 if mkfifoat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKFIFOAT */
-+
-+/* Define to 1 if mknod is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKNOD */
-+
-+/* Define to 1 if mknodat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKNODAT */
-+
-+/* Define to 1 if mkostemp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKOSTEMP */
-+
-+/* Define to 1 if mkostemps is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKOSTEMPS */
-+
-+/* Define to 1 if mkstemp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKSTEMP */
-+
-+/* Define to 1 if mkstemps is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKSTEMPS */
-+
-+/* Define to 1 if pipe2 is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_PIPE2 */
-+
-+/* Define to 1 if popen is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_POPEN */
-+
-+/* Define to 1 if pread is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_PREAD */
-+
-+/* Define to 1 if ptsname is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_PTSNAME */
-+
-+/* Define to 1 if pwrite is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_PWRITE */
-+
-+/* Define to 1 if random_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RANDOM_R */
-+
-+/* Define to 1 if rawmemchr is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RAWMEMCHR */
-+
-+/* Define to 1 if readlink is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_READLINK */
-+
-+/* Define to 1 if readlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_READLINKAT */
-+
-+/* Define to 1 if realpath is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_REALPATH */
-+
-+/* Define to 1 if renameat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RENAMEAT */
-+
-+/* Define to 1 if rmdir is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RMDIR */
-+
-+/* Define to 1 if rpmatch is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RPMATCH */
-+
-+/* Define to 1 if setenv is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SETENV */
-+
-+/* Define to 1 if setstate_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SETSTATE_R */
-+
-+/* Define to 1 if setusershell is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SETUSERSHELL */
-+
-+/* Define to 1 if sigaction is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGACTION */
-+
-+/* Define to 1 if sigaddset is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGADDSET */
-+
-+/* Define to 1 if sigdelset is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGDELSET */
-+
-+/* Define to 1 if sigemptyset is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGEMPTYSET */
-+
-+/* Define to 1 if sigfillset is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGFILLSET */
-+
-+/* Define to 1 if sigismember is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGISMEMBER */
-+
-+/* Define to 1 if sigpending is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGPENDING */
-+
-+/* Define to 1 if sigprocmask is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SIGPROCMASK */
-+
-+/* Define to 1 if sleep is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SLEEP */
-+
-+/* Define to 1 if snprintf is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SNPRINTF */
-+
-+/* Define to 1 if srandom_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SRANDOM_R */
-+
-+/* Define to 1 if stat is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STAT 1
-+
-+/* Define to 1 if stpcpy is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STPCPY */
-+
-+/* Define to 1 if stpncpy is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STPNCPY */
-+
-+/* Define to 1 if strcasestr is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRCASESTR */
-+
-+/* Define to 1 if strchrnul is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRCHRNUL */
-+
-+/* Define to 1 if strdup is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRDUP 1
-+
-+/* Define to 1 if strncat is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRNCAT 1
-+
-+/* Define to 1 if strndup is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRNDUP */
-+
-+/* Define to 1 if strnlen is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRNLEN 1
-+
-+/* Define to 1 if strpbrk is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRPBRK 1
-+
-+/* Define to 1 if strsep is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRSEP */
-+
-+/* Define to 1 if strsignal is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRSIGNAL */
-+
-+/* Define to 1 if strtod is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRTOD 1
-+
-+/* Define to 1 if strtok_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRTOK_R */
-+
-+/* Define to 1 if strtoll is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRTOLL */
-+
-+/* Define to 1 if strtoull is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRTOULL */
-+
-+/* Define to 1 if strverscmp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRVERSCMP */
-+
-+/* Define to 1 if symlink is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SYMLINK */
-+
-+/* Define to 1 if symlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SYMLINKAT */
-+
-+/* Define to 1 if tmpfile is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_TMPFILE 1
-+
-+/* Define to 1 if ttyname_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_TTYNAME_R */
-+
-+/* Define to 1 if unlink is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_UNLINK 1
-+
-+/* Define to 1 if unlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UNLINKAT */
-+
-+/* Define to 1 if unlockpt is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UNLOCKPT */
-+
-+/* Define to 1 if unsetenv is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UNSETENV */
-+
-+/* Define to 1 if usleep is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_USLEEP */
-+
-+/* Define to 1 if utimensat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UTIMENSAT */
-+
-+/* Define to 1 if vdprintf is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_VDPRINTF */
-+
-+/* Define to 1 if vsnprintf is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_VSNPRINTF 1
-+
-+/* Define to 1 if wcrtomb is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCRTOMB 1
-+
-+/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_WCSNRTOMBS */
-+
-+/* Define to 1 if wcsrtombs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCSRTOMBS 1
-+
-+/* Define to 1 if wctob is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCTOB 1
-+
-+/* Define to 1 if wcwidth is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_WCWIDTH */
-+
-+/* Define to 1 if you have the `readlink' function. */
-+/* #undef HAVE_READLINK */
-+
-+/* Define to 1 if you have the `realpath' function. */
-+/* #undef HAVE_REALPATH */
-+
-+/* Define to 1 if you have the <search.h> header file. */
-+#define HAVE_SEARCH_H 1
-+
-+/* Define to 1 if you have the `setenv' function. */
-+/* #undef HAVE_SETENV */
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-+#define HAVE_SIGNED_SIG_ATOMIC_T 1
-+
-+/* Define to 1 if 'wchar_t' is a signed integer type. */
-+/* #undef HAVE_SIGNED_WCHAR_T */
-+
-+/* Define to 1 if 'wint_t' is a signed integer type. */
-+/* #undef HAVE_SIGNED_WINT_T */
-+
-+/* Define to 1 if the system has the type `sigset_t'. */
-+/* #undef HAVE_SIGSET_T */
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+/* #undef HAVE_SNPRINTF */
-+
-+/* Define to 1 if stdbool.h conforms to C99. */
-+/* #undef HAVE_STDBOOL_H */
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#define HAVE_STDDEF_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+/* #undef HAVE_STDINT_H */
-+
-+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-+   uintmax_t. */
-+/* #undef HAVE_STDINT_H_WITH_UINTMAX */
-+
-+/* Define to 1 if you have the <stdio.h> header file. */
-+#define HAVE_STDIO_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+/* #undef HAVE_STPCPY */
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+/* #undef HAVE_STRCASECMP */
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#define HAVE_STRDUP 1
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+/* #undef HAVE_STRERROR_R */
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+/* #undef HAVE_STRINGS_H */
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strnlen' function. */
-+#define HAVE_STRNLEN 1
-+
-+/* Define to 1 if you have the `strtol' function. */
-+#define HAVE_STRTOL 1
-+
-+/* Define to 1 if you have the `strtoul' function. */
-+#define HAVE_STRTOUL 1
-+
-+/* Define to 1 if the system has the type `struct random_data'. */
-+/* #undef HAVE_STRUCT_RANDOM_DATA */
-+
-+/* Define to 1 if you have the <sys/bitypes.h> header file. */
-+/* #undef HAVE_SYS_BITYPES_H */
-+
-+/* Define to 1 if you have the <sys/inttypes.h> header file. */
-+/* #undef HAVE_SYS_INTTYPES_H */
-+
-+/* Define to 1 if you have the <sys/mman.h> header file. */
-+/* #undef HAVE_SYS_MMAN_H */
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+/* #undef HAVE_SYS_PARAM_H */
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+/* #undef HAVE_SYS_SOCKET_H */
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+/* #undef HAVE_SYS_TIME_H */
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#define HAVE_TIME_H 1
-+
-+/* Define to 1 if you have the `tsearch' function. */
-+/* #undef HAVE_TSEARCH */
-+
-+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-+/* #undef HAVE_UINTMAX_T */
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if the system has the type `unsigned long long int'. */
-+#define HAVE_UNSIGNED_LONG_LONG_INT 1
-+
-+/* Define to 1 if you have the `uselocale' function. */
-+/* #undef HAVE_USELOCALE */
-+
-+/* Define to 1 or 0, depending whether the compiler supports simple visibility
-+   declarations. */
-+#define HAVE_VISIBILITY 0
-+
-+/* Define to 1 if you have the <wchar.h> header file. */
-+#define HAVE_WCHAR_H 1
-+
-+/* Define if you have the 'wchar_t' type. */
-+#define HAVE_WCHAR_T 1
-+
-+/* Define to 1 if you have the `wcrtomb' function. */
-+#define HAVE_WCRTOMB 1
-+
-+/* Define to 1 if you have the `wcslen' function. */
-+#define HAVE_WCSLEN 1
-+
-+/* Define to 1 if you have the `wcsnlen' function. */
-+#define HAVE_WCSNLEN 1
-+
-+/* Define to 1 if you have the <wctype.h> header file. */
-+#define HAVE_WCTYPE_H 1
-+
-+/* Define to 1 if you have the `wcwidth' function. */
-+/* #undef HAVE_WCWIDTH */
-+
-+/* Define to 1 if you have the <winsock2.h> header file. */
-+#define HAVE_WINSOCK2_H 1
-+
-+/* Define if you have the 'wint_t' type. */
-+#define HAVE_WINT_T 1
-+
-+/* Define to 1 if O_NOATIME works. */
-+#define HAVE_WORKING_O_NOATIME 0
-+
-+/* Define to 1 if O_NOFOLLOW works. */
-+#define HAVE_WORKING_O_NOFOLLOW 0
-+
-+/* Define to 1 if the system has the type `_Bool'. */
-+/* #undef HAVE__BOOL */
-+
-+/* Define to 1 if you have the `_NSGetExecutablePath' function. */
-+/* #undef HAVE__NSGETEXECUTABLEPATH */
-+
-+/* Define to 1 if you have the `__fsetlocking' function. */
-+/* #undef HAVE___FSETLOCKING */
-+
-+/* Define as const if the declaration of iconv() needs const. */
-+/* #undef ICONV_CONST */
-+
-+/* Define to a symbolic name denoting the flavor of iconv_open()
-+   implementation. */
-+/* #undef ICONV_FLAVOR */
-+
-+/* Define to the value of ${prefix}, as a string. */
-+#define INSTALLPREFIX "."
-+
-+/* Define if integer division by zero raises signal SIGFPE. */
-+#define INTDIV0_RAISES_SIGFPE 0
-+
-+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
-+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-+#else
-+# define ISSLASH(C) ((C) == '/')
-+#endif
-+
-+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-+   slash. */
-+/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#define LT_OBJDIR ".libs/"
-+
-+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
-+#define MALLOC_0_IS_NONNULL 1
-+
-+/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-+/* #undef MAP_ANONYMOUS */
-+
-+/* Define if the mbrtowc function has the NULL string argument bug. */
-+/* #undef MBRTOWC_NULL_ARG_BUG */
-+
-+/* Define if the mbrtowc function does not return 0 for a NUL character. */
-+/* #undef MBRTOWC_NUL_RETVAL_BUG */
-+
-+/* Define if the mbrtowc function returns a wrong return value. */
-+/* #undef MBRTOWC_RETVAL_BUG */
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#define NO_MINUS_C_MINUS_O 1
-+
-+/* Name of package */
-+#define PACKAGE "gettext-runtime"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME ""
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING ""
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME ""
-+
-+/* Define to the home page for this package. */
-+#define PACKAGE_URL ""
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION ""
-+
-+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-+/* #undef PRI_MACROS_BROKEN */
-+
-+/* Define if the pthread_in_use() detection is hard. */
-+/* #undef PTHREAD_IN_USE_DETECTION_HARD */
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'ptrdiff_t'. */
-+#define PTRDIFF_T_SUFFIX 
-+
-+/* Define to 1 if readlink fails to recognize a trailing slash. */
-+/* #undef READLINK_TRAILING_SLASH_BUG */
-+
-+/* Define to 1 if stat needs help when passed a directory name with a trailing
-+   slash */
-+#define REPLACE_FUNC_STAT_DIR 1
-+
-+/* Define to 1 if stat needs help when passed a file name with a trailing
-+   slash */
-+/* #undef REPLACE_FUNC_STAT_FILE */
-+
-+/* Define this to 1 if strerror is broken. */
-+#define REPLACE_STRERROR 1
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'sig_atomic_t'. */
-+#define SIG_ATOMIC_T_SUFFIX 
-+
-+/* Define as the maximum value of type 'size_t', if the system doesn't define
-+   it. */
-+#ifndef SIZE_MAX
-+/* # undef SIZE_MAX */
-+#endif
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'size_t'. */
-+#define SIZE_T_SUFFIX u
-+
-+/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at runtime.
-+	STACK_DIRECTION > 0 => grows toward higher addresses
-+	STACK_DIRECTION < 0 => grows toward lower addresses
-+	STACK_DIRECTION = 0 => direction of growth unknown */
-+/* #undef STACK_DIRECTION */
-+
-+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-+/* #undef STAT_MACROS_BROKEN */
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to 1 if strerror_r returns char *. */
-+/* #undef STRERROR_R_CHAR_P */
-+
-+/* Define to the prefix of C symbols at the assembler and linker level, either
-+   an underscore or empty. */
-+#define USER_LABEL_PREFIX 
-+
-+/* Define if the POSIX multithreading library can be used. */
-+/* #undef USE_POSIX_THREADS */
-+
-+/* Define if references to the POSIX multithreading library should be made
-+   weak. */
-+/* #undef USE_POSIX_THREADS_WEAK */
-+
-+/* Define if the GNU Pth multithreading library can be used. */
-+/* #undef USE_PTH_THREADS */
-+
-+/* Define if references to the GNU Pth multithreading library should be made
-+   weak. */
-+/* #undef USE_PTH_THREADS_WEAK */
-+
-+/* Define if the old Solaris multithreading library can be used. */
-+/* #undef USE_SOLARIS_THREADS */
-+
-+/* Define if references to the old Solaris multithreading library should be
-+   made weak. */
-+/* #undef USE_SOLARIS_THREADS_WEAK */
-+
-+/* Define to 1 if you want getc etc. to use unlocked I/O if available.
-+   Unlocked I/O can improve performance in unithreaded apps, but it is not
-+   safe for multithreaded apps. */
-+#define USE_UNLOCKED_IO 1
-+
-+/* Define if the Win32 multithreading API can be used. */
-+/* #undef USE_WIN32_THREADS */
-+
-+/* Version number of package */
-+#define VERSION "0.18.1"
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wchar_t'. */
-+#define WCHAR_T_SUFFIX 
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wint_t'. */
-+#define WINT_T_SUFFIX 
-+
-+/* Define to 1 if on MINIX. */
-+/* #undef _MINIX */
-+
-+/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+/* #undef _POSIX_1_SOURCE */
-+
-+/* Define to 1 if you need to in order for `stat' and other things to work. */
-+/* #undef _POSIX_SOURCE */
-+
-+/* Define to 500 only on HP-UX. */
-+/* #undef _XOPEN_SOURCE */
-+
-+/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# define _ALL_SOURCE 1
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# define _GNU_SOURCE 1
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# define _POSIX_PTHREAD_SEMANTICS 1
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# define _TANDEM_SOURCE 1
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# define __EXTENSIONS__ 1
-+#endif
-+
-+
-+/* Define to rpl_ if the getopt replacement functions and variables should be
-+   used. */
-+#define __GETOPT_PREFIX rpl_
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#define gid_t int
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#define inline __inline
-+#endif
-+
-+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+   __APPLE__ && __MACH__ test for MacOS X.
-+   __APPLE_CC__ tests for the Apple compiler and its version.
-+   __STDC_VERSION__ tests for the C99 mode.  */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif
-+
-+/* Define to a type if <wchar.h> does not define. */
-+/* #undef mbstate_t */
-+
-+/* Define to the type of st_nlink in struct stat, or a supertype. */
-+#define nlink_t int
-+
-+/* Define as the type of the result of subtracting two pointers, if the system
-+   doesn't define it. */
-+/* #undef ptrdiff_t */
-+
-+/* Define to the equivalent of the C99 'restrict' keyword, or to
-+   nothing if this is not supported.  Do not define if restrict is
-+   supported directly.  */
-+#define restrict /**/
-+/* Work around a bug in Sun C++: it does not support _Restrict or
-+   __restrict__, even though the corresponding Sun C compiler ends up with
-+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-+   previous line.  Perhaps some future version of Sun C++ will work with
-+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+# define __restrict__
-+#endif
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* Define as a signed type of the same size as size_t. */
-+#define ssize_t int
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#define uid_t int
-+
-+/* Define to unsigned long or unsigned long long if <stdint.h> and
-+   <inttypes.h> don't define. */
-+#define uintmax_t unsigned long long
-+
-+/* Define as a marker that can be attached to declarations that might not
-+    be used.  This helps to reduce warnings, such as from
-+    GCC -Wunused-parameter.  */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _GL_UNUSED __attribute__ ((__unused__))
-+#else
-+# define _GL_UNUSED
-+#endif
-+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-+   is a misnomer outside of parameter lists.  */
-+#define _UNUSED_PARAMETER_ _GL_UNUSED
-+
-+
-+
-+#define __libc_lock_t                   gl_lock_t
-+#define __libc_lock_define              gl_lock_define
-+#define __libc_lock_define_initialized  gl_lock_define_initialized
-+#define __libc_lock_init                gl_lock_init
-+#define __libc_lock_lock                gl_lock_lock
-+#define __libc_lock_unlock              gl_lock_unlock
-+#define __libc_lock_recursive_t                   gl_recursive_lock_t
-+#define __libc_lock_define_recursive              gl_recursive_lock_define
-+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-+#define __libc_lock_init_recursive                gl_recursive_lock_init
-+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-+#define glthread_in_use  libintl_thread_in_use
-+#define glthread_lock_init_func     libintl_lock_init_func
-+#define glthread_lock_lock_func     libintl_lock_lock_func
-+#define glthread_lock_unlock_func   libintl_lock_unlock_func
-+#define glthread_lock_destroy_func  libintl_lock_destroy_func
-+#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-+#define glthread_rwlock_init_func              libintl_rwlock_init_func
-+#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-+#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-+#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-+#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-+#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-+#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-+#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-+#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-+#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-+#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-+#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-+#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-+#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-+#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-+#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-+#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-+#define glthread_once_func            libintl_once_func
-+#define glthread_once_singlethreaded  libintl_once_singlethreaded
-+#define glthread_once_multithreaded   libintl_once_multithreaded
-+
-+
-+
-+/* On Windows, variables that may be in a DLL must be marked specially.  */
-+#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
-+# define DLL_VARIABLE __declspec (dllimport)
-+#else
-+# define DLL_VARIABLE
-+#endif
-+
-+/* Extra OS/2 (emx+gcc) defines.  */
-+#ifdef __EMX__
-+# include "intl/os2compat.h"
-+#endif
-+
-+#elif defined (__APPLE__)
-+/* config.h.  Generated from config.h.in by configure.  */
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if the compiler is building for multiple architectures of Apple
-+   platforms at once. */
-+/* #undef AA_APPLE_UNIVERSAL_BUILD */
-+
-+/* Define to the number of bits in type 'ptrdiff_t'. */
-+#define BITSIZEOF_PTRDIFF_T 32
-+
-+/* Define to the number of bits in type 'sig_atomic_t'. */
-+#define BITSIZEOF_SIG_ATOMIC_T 32
-+
-+/* Define to the number of bits in type 'size_t'. */
-+#define BITSIZEOF_SIZE_T 32
-+
-+/* Define to the number of bits in type 'wchar_t'. */
-+#define BITSIZEOF_WCHAR_T 32
-+
-+/* Define to the number of bits in type 'wint_t'. */
-+#define BITSIZEOF_WINT_T 32
-+
-+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c' support on those systems.
-+   */
-+/* #undef CRAY_STACKSEG_END */
-+
-+/* Define if mono is the preferred C# implementation. */
-+/* #undef CSHARP_CHOICE_MONO */
-+
-+/* Define if pnet is the preferred C# implementation. */
-+/* #undef CSHARP_CHOICE_PNET */
-+
-+/* Define to 1 if using `alloca.c'. */
-+/* #undef C_ALLOCA */
-+
-+/* Define to 1 if // is a file system root distinct from /. */
-+/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */
-+
-+/* Define to 1 if translation of program messages to the user's native
-+   language is requested. */
-+#define ENABLE_NLS 1
-+
-+/* Define to 1 if the package shall run at any location in the file system. */
-+/* #undef ENABLE_RELOCATABLE */
-+
-+/* Define on systems for which file names may have a so-called `drive letter'
-+   prefix, define this to compute the length of that prefix, including the
-+   colon. */
-+#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0
-+
-+/* Define if the backslash character may also serve as a file name component
-+   separator. */
-+#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0
-+
-+/* Define if a drive letter prefix denotes a relative path if it is not
-+   followed by a file name component separator. */
-+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
-+
-+/* Define to 1 if realpath() can malloc memory, always gives an absolute path,
-+   and handles trailing slash correctly. */
-+/* #undef FUNC_REALPATH_WORKS */
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module canonicalize-lgpl shall be considered present. */
-+#define GNULIB_CANONICALIZE_LGPL 1
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module fwriteerror shall be considered present. */
-+#define GNULIB_FWRITEERROR 1
-+
-+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-+   whether the gnulib module sigpipe shall be considered present. */
-+#define GNULIB_SIGPIPE 1
-+
-+/* Define to 1 when the gnulib module canonicalize_file_name should be tested.
-+   */
-+#define GNULIB_TEST_CANONICALIZE_FILE_NAME 1
-+
-+/* Define to 1 when the gnulib module environ should be tested. */
-+#define GNULIB_TEST_ENVIRON 1
-+
-+/* Define to 1 when the gnulib module getopt-gnu should be tested. */
-+#define GNULIB_TEST_GETOPT_GNU 1
-+
-+/* Define to 1 when the gnulib module lstat should be tested. */
-+#define GNULIB_TEST_LSTAT 1
-+
-+/* Define to 1 when the gnulib module malloc-posix should be tested. */
-+#define GNULIB_TEST_MALLOC_POSIX 1
-+
-+/* Define to 1 when the gnulib module mbrtowc should be tested. */
-+#define GNULIB_TEST_MBRTOWC 1
-+
-+/* Define to 1 when the gnulib module mbsinit should be tested. */
-+#define GNULIB_TEST_MBSINIT 1
-+
-+/* Define to 1 when the gnulib module mbslen should be tested. */
-+#define GNULIB_TEST_MBSLEN 1
-+
-+/* Define to 1 when the gnulib module mbsstr should be tested. */
-+#define GNULIB_TEST_MBSSTR 1
-+
-+/* Define to 1 when the gnulib module memchr should be tested. */
-+#define GNULIB_TEST_MEMCHR 1
-+
-+/* Define to 1 when the gnulib module readlink should be tested. */
-+#define GNULIB_TEST_READLINK 1
-+
-+/* Define to 1 when the gnulib module realpath should be tested. */
-+#define GNULIB_TEST_REALPATH 1
-+
-+/* Define to 1 when the gnulib module sigprocmask should be tested. */
-+#define GNULIB_TEST_SIGPROCMASK 1
-+
-+/* Define to 1 when the gnulib module stat should be tested. */
-+#define GNULIB_TEST_STAT 1
-+
-+/* Define to 1 when the gnulib module strerror should be tested. */
-+#define GNULIB_TEST_STRERROR 1
-+
-+/* Define to 1 when the gnulib module strnlen should be tested. */
-+#define GNULIB_TEST_STRNLEN 1
-+
-+/* Define to 1 when the gnulib module wcwidth should be tested. */
-+#define GNULIB_TEST_WCWIDTH 1
-+
-+/* Define to 1 if you have `alloca', as a function or macro. */
-+#define HAVE_ALLOCA 1
-+
-+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+#define HAVE_ALLOCA_H 1
-+
-+/* Define to 1 if you have the `argz_count' function. */
-+/* #undef HAVE_ARGZ_COUNT */
-+
-+/* Define to 1 if you have the <argz.h> header file. */
-+/* #undef HAVE_ARGZ_H */
-+
-+/* Define to 1 if you have the `argz_next' function. */
-+/* #undef HAVE_ARGZ_NEXT */
-+
-+/* Define to 1 if you have the `argz_stringify' function. */
-+/* #undef HAVE_ARGZ_STRINGIFY */
-+
-+/* Define to 1 if you have the `asprintf' function. */
-+#define HAVE_ASPRINTF 1
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#define HAVE_ATEXIT 1
-+
-+/* Define to 1 if you have the <bp-sym.h> header file. */
-+/* #undef HAVE_BP_SYM_H */
-+
-+/* Define to 1 if the compiler understands __builtin_expect. */
-+#define HAVE_BUILTIN_EXPECT 1
-+
-+/* Define to 1 if you have the `canonicalize_file_name' function. */
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
-+
-+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-+   CoreFoundation framework. */
-+#define HAVE_CFLOCALECOPYCURRENT 1
-+
-+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-+   the CoreFoundation framework. */
-+#define HAVE_CFPREFERENCESCOPYAPPVALUE 1
-+
-+/* Define if the GNU dcgettext() function is already present or preinstalled.
-+   */
-+/* #undef HAVE_DCGETTEXT */
-+
-+/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_CLEARERR_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_FEOF_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FERROR_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FFLUSH_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FGETS_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FPUTC_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FPUTS_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FREAD_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_FWRITE_UNLOCKED 0
-+
-+/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_GETCHAR_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_GETC_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-+   */
-+#define HAVE_DECL_GETENV 1
-+
-+/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you
-+   don't. */
-+/* #undef HAVE_DECL_GETOPT_CLIP */
-+
-+/* Define to 1 if you have the declaration of `optreset', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_OPTRESET 1
-+
-+/* Define to 1 if you have the declaration of `program_invocation_name', and
-+   to 0 if you don't. */
-+#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
-+
-+/* Define to 1 if you have the declaration of `program_invocation_short_name',
-+   and to 0 if you don't. */
-+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
-+
-+/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
-+   you don't. */
-+#define HAVE_DECL_PUTCHAR_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_PUTC_UNLOCKED 1
-+
-+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-+   don't. */
-+/* #undef HAVE_DECL_STRERROR */
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_STRERROR_R 1
-+
-+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_STRNLEN 0
-+
-+/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
-+   don't. */
-+#define HAVE_DECL_WCWIDTH 1
-+
-+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-+   don't. */
-+#define HAVE_DECL__SNPRINTF 0
-+
-+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-+   don't. */
-+#define HAVE_DECL__SNWPRINTF 0
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define HAVE_DLFCN_H 1
-+
-+/* Define if you have the declaration of environ. */
-+/* #undef HAVE_ENVIRON_DECL */
-+
-+/* Define to 1 if you have the <errno.h> header file. */
-+#define HAVE_ERRNO_H 1
-+
-+/* Define to 1 if you have the `fwprintf' function. */
-+#define HAVE_FWPRINTF 1
-+
-+/* Define to 1 if you have the `getcwd' function. */
-+#define HAVE_GETCWD 1
-+
-+/* Define to 1 if you have the `getegid' function. */
-+#define HAVE_GETEGID 1
-+
-+/* Define to 1 if you have the `geteuid' function. */
-+#define HAVE_GETEUID 1
-+
-+/* Define to 1 if you have the `getgid' function. */
-+#define HAVE_GETGID 1
-+
-+/* Define to 1 if you have the <getopt.h> header file. */
-+#define HAVE_GETOPT_H 1
-+
-+/* Define to 1 if you have the `getopt_long_only' function. */
-+#define HAVE_GETOPT_LONG_ONLY 1
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#define HAVE_GETPAGESIZE 1
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+/* #undef HAVE_GETTEXT */
-+
-+/* Define to 1 if you have the `getuid' function. */
-+#define HAVE_GETUID 1
-+
-+/* Define if you have the iconv() function and it works. */
-+#define HAVE_ICONV 1
-+
-+/* Define to 1 if you have the <iconv.h> header file. */
-+#define HAVE_ICONV_H 1
-+
-+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-+#define HAVE_INTMAX_T 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-+   declares uintmax_t. */
-+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-+
-+/* Define to 1 if you have the `iswblank' function. */
-+#define HAVE_ISWBLANK 1
-+
-+/* Define to 1 if you have the `iswcntrl' function. */
-+#define HAVE_ISWCNTRL 1
-+
-+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-+#define HAVE_LANGINFO_CODESET 1
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#define HAVE_LC_MESSAGES 1
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if the system has the type `long long int'. */
-+#define HAVE_LONG_LONG_INT 1
-+
-+/* Define to 1 if you have the `lstat' function. */
-+#define HAVE_LSTAT 1
-+
-+/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-+/* #undef HAVE_MACH_O_DYLD_H */
-+
-+/* Define if the 'malloc' function is POSIX compliant. */
-+#define HAVE_MALLOC_POSIX 1
-+
-+/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
-+   config.h and <sys/mman.h>. */
-+#define HAVE_MAP_ANONYMOUS 1
-+
-+/* Define to 1 if you have the `mbrtowc' function. */
-+#define HAVE_MBRTOWC 1
-+
-+/* Define to 1 if you have the `mbsinit' function. */
-+#define HAVE_MBSINIT 1
-+
-+/* Define to 1 if you have the `mbslen' function. */
-+/* #undef HAVE_MBSLEN */
-+
-+/* Define to 1 if <wchar.h> declares mbstate_t. */
-+#define HAVE_MBSTATE_T 1
-+
-+/* Define to 1 if you have the `memchr' function. */
-+#define HAVE_MEMCHR 1
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#define HAVE_MEMMOVE 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the `mempcpy' function. */
-+/* #undef HAVE_MEMPCPY */
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#define HAVE_MMAP 1
-+
-+/* Define to 1 if you have the `mprotect' function. */
-+#define HAVE_MPROTECT 1
-+
-+/* Define to 1 if you have the `munmap' function. */
-+#define HAVE_MUNMAP 1
-+
-+/* Define to 1 if you have the `newlocale' function. */
-+#define HAVE_NEWLOCALE 1
-+
-+/* Define to 1 if you have the `pathconf' function. */
-+#define HAVE_PATHCONF 1
-+
-+/* Define if your printf() function supports format strings with positions. */
-+#define HAVE_POSIX_PRINTF 1
-+
-+/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-+#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-+
-+/* Define if the POSIX multithreading library has read/write locks. */
-+#define HAVE_PTHREAD_RWLOCK 1
-+
-+/* Define to 1 if you have the `putenv' function. */
-+#define HAVE_PUTENV 1
-+
-+/* Define to 1 if you have the <random.h> header file. */
-+/* #undef HAVE_RANDOM_H */
-+
-+/* Define to 1 if atoll is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_ATOLL 1
-+
-+/* Define to 1 if btowc is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_BTOWC 1
-+
-+/* Define to 1 if canonicalize_file_name is declared even after undefining
-+   macros. */
-+/* #undef HAVE_RAW_DECL_CANONICALIZE_FILE_NAME */
-+
-+/* Define to 1 if chown is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_CHOWN 1
-+
-+/* Define to 1 if dprintf is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_DPRINTF */
-+
-+/* Define to 1 if dup2 is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_DUP2 1
-+
-+/* Define to 1 if dup3 is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_DUP3 */
-+
-+/* Define to 1 if endusershell is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_ENDUSERSHELL 1
-+
-+/* Define to 1 if environ is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_ENVIRON */
-+
-+/* Define to 1 if euidaccess is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_EUIDACCESS */
-+
-+/* Define to 1 if faccessat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FACCESSAT */
-+
-+/* Define to 1 if fchdir is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FCHDIR 1
-+
-+/* Define to 1 if fchmodat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FCHMODAT */
-+
-+/* Define to 1 if fchownat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FCHOWNAT */
-+
-+/* Define to 1 if fpurge is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FPURGE 1
-+
-+/* Define to 1 if fseeko is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FSEEKO 1
-+
-+/* Define to 1 if fstatat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FSTATAT */
-+
-+/* Define to 1 if fsync is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FSYNC 1
-+
-+/* Define to 1 if ftello is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FTELLO 1
-+
-+/* Define to 1 if ftruncate is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_FTRUNCATE 1
-+
-+/* Define to 1 if futimens is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_FUTIMENS */
-+
-+/* Define to 1 if getcwd is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETCWD 1
-+
-+/* Define to 1 if getdelim is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETDELIM */
-+
-+/* Define to 1 if getdomainname is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETDOMAINNAME 1
-+
-+/* Define to 1 if getdtablesize is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETDTABLESIZE 1
-+
-+/* Define to 1 if getgroups is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETGROUPS 1
-+
-+/* Define to 1 if gethostname is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETHOSTNAME 1
-+
-+/* Define to 1 if getline is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_GETLINE */
-+
-+/* Define to 1 if getloadavg is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETLOADAVG 1
-+
-+/* Define to 1 if getlogin is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETLOGIN 1
-+
-+/* Define to 1 if getlogin_r is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETLOGIN_R 1
-+
-+/* Define to 1 if getpagesize is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETPAGESIZE 1
-+
-+/* Define to 1 if getsubopt is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETSUBOPT 1
-+
-+/* Define to 1 if getusershell is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GETUSERSHELL 1
-+
-+/* Define to 1 if grantpt is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_GRANTPT 1
-+
-+/* Define to 1 if initstat_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_INITSTAT_R */
-+
-+/* Define to 1 if lchmod is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LCHMOD */
-+
-+/* Define to 1 if lchown is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_LCHOWN 1
-+
-+/* Define to 1 if link is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_LINK 1
-+
-+/* Define to 1 if linkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_LINKAT */
-+
-+/* Define to 1 if lseek is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_LSEEK 1
-+
-+/* Define to 1 if lstat is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_LSTAT 1
-+
-+/* Define to 1 if mbrlen is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBRLEN 1
-+
-+/* Define to 1 if mbrtowc is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBRTOWC 1
-+
-+/* Define to 1 if mbsinit is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBSINIT 1
-+
-+/* Define to 1 if mbsnrtowcs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBSNRTOWCS 1
-+
-+/* Define to 1 if mbsrtowcs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MBSRTOWCS 1
-+
-+/* Define to 1 if memmem is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMMEM */
-+
-+/* Define to 1 if mempcpy is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMPCPY */
-+
-+/* Define to 1 if memrchr is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MEMRCHR */
-+
-+/* Define to 1 if mkdirat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKDIRAT */
-+
-+/* Define to 1 if mkdtemp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKDTEMP */
-+
-+/* Define to 1 if mkfifo is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MKFIFO 1
-+
-+/* Define to 1 if mkfifoat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKFIFOAT */
-+
-+/* Define to 1 if mknod is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MKNOD 1
-+
-+/* Define to 1 if mknodat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKNODAT */
-+
-+/* Define to 1 if mkostemp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKOSTEMP */
-+
-+/* Define to 1 if mkostemps is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKOSTEMPS */
-+
-+/* Define to 1 if mkstemp is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_MKSTEMP 1
-+
-+/* Define to 1 if mkstemps is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_MKSTEMPS */
-+
-+/* Define to 1 if pipe2 is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_PIPE2 */
-+
-+/* Define to 1 if popen is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_POPEN 1
-+
-+/* Define to 1 if pread is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_PREAD 1
-+
-+/* Define to 1 if ptsname is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_PTSNAME 1
-+
-+/* Define to 1 if pwrite is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_PWRITE 1
-+
-+/* Define to 1 if random_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RANDOM_R */
-+
-+/* Define to 1 if rawmemchr is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RAWMEMCHR */
-+
-+/* Define to 1 if readlink is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_READLINK 1
-+
-+/* Define to 1 if readlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_READLINKAT */
-+
-+/* Define to 1 if realpath is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_REALPATH 1
-+
-+/* Define to 1 if renameat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RENAMEAT */
-+
-+/* Define to 1 if rmdir is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_RMDIR 1
-+
-+/* Define to 1 if rpmatch is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_RPMATCH */
-+
-+/* Define to 1 if setenv is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SETENV 1
-+
-+/* Define to 1 if setstate_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SETSTATE_R */
-+
-+/* Define to 1 if setusershell is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SETUSERSHELL 1
-+
-+/* Define to 1 if sigaction is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGACTION 1
-+
-+/* Define to 1 if sigaddset is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGADDSET 1
-+
-+/* Define to 1 if sigdelset is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGDELSET 1
-+
-+/* Define to 1 if sigemptyset is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGEMPTYSET 1
-+
-+/* Define to 1 if sigfillset is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGFILLSET 1
-+
-+/* Define to 1 if sigismember is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGISMEMBER 1
-+
-+/* Define to 1 if sigpending is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGPENDING 1
-+
-+/* Define to 1 if sigprocmask is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SIGPROCMASK 1
-+
-+/* Define to 1 if sleep is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SLEEP 1
-+
-+/* Define to 1 if snprintf is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SNPRINTF 1
-+
-+/* Define to 1 if srandom_r is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SRANDOM_R */
-+
-+/* Define to 1 if stat is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STAT 1
-+
-+/* Define to 1 if stpcpy is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STPCPY 1
-+
-+/* Define to 1 if stpncpy is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STPNCPY */
-+
-+/* Define to 1 if strcasestr is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRCASESTR 1
-+
-+/* Define to 1 if strchrnul is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRCHRNUL */
-+
-+/* Define to 1 if strdup is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRDUP 1
-+
-+/* Define to 1 if strncat is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRNCAT 1
-+
-+/* Define to 1 if strndup is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRNDUP */
-+
-+/* Define to 1 if strnlen is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRNLEN */
-+
-+/* Define to 1 if strpbrk is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRPBRK 1
-+
-+/* Define to 1 if strsep is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRSEP 1
-+
-+/* Define to 1 if strsignal is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRSIGNAL 1
-+
-+/* Define to 1 if strtod is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRTOD 1
-+
-+/* Define to 1 if strtok_r is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRTOK_R 1
-+
-+/* Define to 1 if strtoll is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRTOLL 1
-+
-+/* Define to 1 if strtoull is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_STRTOULL 1
-+
-+/* Define to 1 if strverscmp is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_STRVERSCMP */
-+
-+/* Define to 1 if symlink is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_SYMLINK 1
-+
-+/* Define to 1 if symlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_SYMLINKAT */
-+
-+/* Define to 1 if tmpfile is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_TMPFILE 1
-+
-+/* Define to 1 if ttyname_r is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_TTYNAME_R 1
-+
-+/* Define to 1 if unlink is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_UNLINK 1
-+
-+/* Define to 1 if unlinkat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UNLINKAT */
-+
-+/* Define to 1 if unlockpt is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_UNLOCKPT 1
-+
-+/* Define to 1 if unsetenv is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_UNSETENV 1
-+
-+/* Define to 1 if usleep is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_USLEEP 1
-+
-+/* Define to 1 if utimensat is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_UTIMENSAT */
-+
-+/* Define to 1 if vdprintf is declared even after undefining macros. */
-+/* #undef HAVE_RAW_DECL_VDPRINTF */
-+
-+/* Define to 1 if vsnprintf is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_VSNPRINTF 1
-+
-+/* Define to 1 if wcrtomb is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCRTOMB 1
-+
-+/* Define to 1 if wcsnrtombs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCSNRTOMBS 1
-+
-+/* Define to 1 if wcsrtombs is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCSRTOMBS 1
-+
-+/* Define to 1 if wctob is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCTOB 1
-+
-+/* Define to 1 if wcwidth is declared even after undefining macros. */
-+#define HAVE_RAW_DECL_WCWIDTH 1
-+
-+/* Define to 1 if you have the `readlink' function. */
-+#define HAVE_READLINK 1
-+
-+/* Define to 1 if you have the `realpath' function. */
-+#define HAVE_REALPATH 1
-+
-+/* Define to 1 if you have the <search.h> header file. */
-+#define HAVE_SEARCH_H 1
-+
-+/* Define to 1 if you have the `setenv' function. */
-+#define HAVE_SETENV 1
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-+#define HAVE_SIGNED_SIG_ATOMIC_T 1
-+
-+/* Define to 1 if 'wchar_t' is a signed integer type. */
-+#define HAVE_SIGNED_WCHAR_T 1
-+
-+/* Define to 1 if 'wint_t' is a signed integer type. */
-+#define HAVE_SIGNED_WINT_T 1
-+
-+/* Define to 1 if the system has the type `sigset_t'. */
-+/* #undef HAVE_SIGSET_T */
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#define HAVE_SNPRINTF 1
-+
-+/* Define to 1 if stdbool.h conforms to C99. */
-+#define HAVE_STDBOOL_H 1
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#define HAVE_STDDEF_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-+   uintmax_t. */
-+#define HAVE_STDINT_H_WITH_UINTMAX 1
-+
-+/* Define to 1 if you have the <stdio.h> header file. */
-+#define HAVE_STDIO_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+#define HAVE_STPCPY 1
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#define HAVE_STRCASECMP 1
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#define HAVE_STRDUP 1
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#define HAVE_STRERROR_R 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strnlen' function. */
-+/* #undef HAVE_STRNLEN */
-+
-+/* Define to 1 if you have the `strtol' function. */
-+#define HAVE_STRTOL 1
-+
-+/* Define to 1 if you have the `strtoul' function. */
-+#define HAVE_STRTOUL 1
-+
-+/* Define to 1 if the system has the type `struct random_data'. */
-+/* #undef HAVE_STRUCT_RANDOM_DATA */
-+
-+/* Define to 1 if you have the <sys/bitypes.h> header file. */
-+/* #undef HAVE_SYS_BITYPES_H */
-+
-+/* Define to 1 if you have the <sys/inttypes.h> header file. */
-+/* #undef HAVE_SYS_INTTYPES_H */
-+
-+/* Define to 1 if you have the <sys/mman.h> header file. */
-+#define HAVE_SYS_MMAN_H 1
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#define HAVE_SYS_PARAM_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#define HAVE_TIME_H 1
-+
-+/* Define to 1 if you have the `tsearch' function. */
-+#define HAVE_TSEARCH 1
-+
-+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-+#define HAVE_UINTMAX_T 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if the system has the type `unsigned long long int'. */
-+#define HAVE_UNSIGNED_LONG_LONG_INT 1
-+
-+/* Define to 1 if you have the `uselocale' function. */
-+#define HAVE_USELOCALE 1
-+
-+/* Define to 1 or 0, depending whether the compiler supports simple visibility
-+   declarations. */
-+#define HAVE_VISIBILITY 1
-+
-+/* Define to 1 if you have the <wchar.h> header file. */
-+#define HAVE_WCHAR_H 1
-+
-+/* Define if you have the 'wchar_t' type. */
-+#define HAVE_WCHAR_T 1
-+
-+/* Define to 1 if you have the `wcrtomb' function. */
-+#define HAVE_WCRTOMB 1
-+
-+/* Define to 1 if you have the `wcslen' function. */
-+#define HAVE_WCSLEN 1
-+
-+/* Define to 1 if you have the `wcsnlen' function. */
-+/* #undef HAVE_WCSNLEN */
-+
-+/* Define to 1 if you have the <wctype.h> header file. */
-+#define HAVE_WCTYPE_H 1
-+
-+/* Define to 1 if you have the `wcwidth' function. */
-+#define HAVE_WCWIDTH 1
-+
-+/* Define to 1 if you have the <winsock2.h> header file. */
-+/* #undef HAVE_WINSOCK2_H */
-+
-+/* Define if you have the 'wint_t' type. */
-+#define HAVE_WINT_T 1
-+
-+/* Define to 1 if O_NOATIME works. */
-+#define HAVE_WORKING_O_NOATIME 0
-+
-+/* Define to 1 if O_NOFOLLOW works. */
-+#define HAVE_WORKING_O_NOFOLLOW 1
-+
-+/* Define to 1 if the system has the type `_Bool'. */
-+#define HAVE__BOOL 1
-+
-+/* Define to 1 if you have the `_NSGetExecutablePath' function. */
-+/* #undef HAVE__NSGETEXECUTABLEPATH */
-+
-+/* Define to 1 if you have the `__fsetlocking' function. */
-+/* #undef HAVE___FSETLOCKING */
-+
-+/* Define as const if the declaration of iconv() needs const. */
-+#define ICONV_CONST const
-+
-+/* Define to a symbolic name denoting the flavor of iconv_open()
-+   implementation. */
-+/* #undef ICONV_FLAVOR */
-+
-+/* Define to the value of ${prefix}, as a string. */
-+#define INSTALLPREFIX "/Users/tml/lo-macosx/gettext/./unxmacxi.pro/misc"
-+
-+/* Define if integer division by zero raises signal SIGFPE. */
-+#define INTDIV0_RAISES_SIGFPE 1
-+
-+#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
-+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-+#else
-+# define ISSLASH(C) ((C) == '/')
-+#endif
-+
-+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-+   slash. */
-+/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#define LT_OBJDIR ".libs/"
-+
-+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
-+#define MALLOC_0_IS_NONNULL 1
-+
-+/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-+#define MAP_ANONYMOUS MAP_ANON
-+
-+/* Define if the mbrtowc function has the NULL string argument bug. */
-+/* #undef MBRTOWC_NULL_ARG_BUG */
-+
-+/* Define if the mbrtowc function does not return 0 for a NUL character. */
-+/* #undef MBRTOWC_NUL_RETVAL_BUG */
-+
-+/* Define if the mbrtowc function returns a wrong return value. */
-+/* #undef MBRTOWC_RETVAL_BUG */
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+/* #undef NO_MINUS_C_MINUS_O */
-+
-+/* Name of package */
-+#define PACKAGE "gettext-runtime"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME ""
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING ""
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME ""
-+
-+/* Define to the home page for this package. */
-+#define PACKAGE_URL ""
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION ""
-+
-+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-+/* #undef PRI_MACROS_BROKEN */
-+
-+/* Define if the pthread_in_use() detection is hard. */
-+/* #undef PTHREAD_IN_USE_DETECTION_HARD */
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'ptrdiff_t'. */
-+#define PTRDIFF_T_SUFFIX 
-+
-+/* Define to 1 if readlink fails to recognize a trailing slash. */
-+#define READLINK_TRAILING_SLASH_BUG 1
-+
-+/* Define to 1 if stat needs help when passed a directory name with a trailing
-+   slash */
-+/* #undef REPLACE_FUNC_STAT_DIR */
-+
-+/* Define to 1 if stat needs help when passed a file name with a trailing
-+   slash */
-+#define REPLACE_FUNC_STAT_FILE 1
-+
-+/* Define this to 1 if strerror is broken. */
-+/* #undef REPLACE_STRERROR */
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'sig_atomic_t'. */
-+#define SIG_ATOMIC_T_SUFFIX 
-+
-+/* Define as the maximum value of type 'size_t', if the system doesn't define
-+   it. */
-+#ifndef SIZE_MAX
-+/* # undef SIZE_MAX */
-+#endif
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'size_t'. */
-+#define SIZE_T_SUFFIX ul
-+
-+/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at runtime.
-+	STACK_DIRECTION > 0 => grows toward higher addresses
-+	STACK_DIRECTION < 0 => grows toward lower addresses
-+	STACK_DIRECTION = 0 => direction of growth unknown */
-+/* #undef STACK_DIRECTION */
-+
-+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-+/* #undef STAT_MACROS_BROKEN */
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to 1 if strerror_r returns char *. */
-+/* #undef STRERROR_R_CHAR_P */
-+
-+/* Define to the prefix of C symbols at the assembler and linker level, either
-+   an underscore or empty. */
-+#define USER_LABEL_PREFIX _
-+
-+/* Define if the POSIX multithreading library can be used. */
-+#define USE_POSIX_THREADS 1
-+
-+/* Define if references to the POSIX multithreading library should be made
-+   weak. */
-+/* #undef USE_POSIX_THREADS_WEAK */
-+
-+/* Define if the GNU Pth multithreading library can be used. */
-+/* #undef USE_PTH_THREADS */
-+
-+/* Define if references to the GNU Pth multithreading library should be made
-+   weak. */
-+/* #undef USE_PTH_THREADS_WEAK */
-+
-+/* Define if the old Solaris multithreading library can be used. */
-+/* #undef USE_SOLARIS_THREADS */
-+
-+/* Define if references to the old Solaris multithreading library should be
-+   made weak. */
-+/* #undef USE_SOLARIS_THREADS_WEAK */
-+
-+/* Define to 1 if you want getc etc. to use unlocked I/O if available.
-+   Unlocked I/O can improve performance in unithreaded apps, but it is not
-+   safe for multithreaded apps. */
-+#define USE_UNLOCKED_IO 1
-+
-+/* Define if the Win32 multithreading API can be used. */
-+/* #undef USE_WIN32_THREADS */
-+
-+/* Version number of package */
-+#define VERSION "0.18.1"
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wchar_t'. */
-+#define WCHAR_T_SUFFIX 
-+
-+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-+   'wint_t'. */
-+#define WINT_T_SUFFIX 
-+
-+/* Define to 1 if on MINIX. */
-+/* #undef _MINIX */
-+
-+/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+/* #undef _POSIX_1_SOURCE */
-+
-+/* Define to 1 if you need to in order for `stat' and other things to work. */
-+/* #undef _POSIX_SOURCE */
-+
-+/* Define to 500 only on HP-UX. */
-+/* #undef _XOPEN_SOURCE */
-+
-+/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# define _ALL_SOURCE 1
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# define _GNU_SOURCE 1
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# define _POSIX_PTHREAD_SEMANTICS 1
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# define _TANDEM_SOURCE 1
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# define __EXTENSIONS__ 1
-+#endif
-+
-+
-+/* Define to rpl_ if the getopt replacement functions and variables should be
-+   used. */
-+#define __GETOPT_PREFIX rpl_
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef gid_t */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+/* #undef inline */
-+#endif
-+
-+/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-+   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-+   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-+   __APPLE__ && __MACH__ test for MacOS X.
-+   __APPLE_CC__ tests for the Apple compiler and its version.
-+   __STDC_VERSION__ tests for the C99 mode.  */
-+#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-+# define __GNUC_STDC_INLINE__ 1
-+#endif
-+
-+/* Define to a type if <wchar.h> does not define. */
-+/* #undef mbstate_t */
-+
-+/* Define to the type of st_nlink in struct stat, or a supertype. */
-+/* #undef nlink_t */
-+
-+/* Define as the type of the result of subtracting two pointers, if the system
-+   doesn't define it. */
-+/* #undef ptrdiff_t */
-+
-+/* Define to the equivalent of the C99 'restrict' keyword, or to
-+   nothing if this is not supported.  Do not define if restrict is
-+   supported directly.  */
-+#define restrict __restrict
-+/* Work around a bug in Sun C++: it does not support _Restrict or
-+   __restrict__, even though the corresponding Sun C compiler ends up with
-+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-+   previous line.  Perhaps some future version of Sun C++ will work with
-+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-+#if defined __SUNPRO_CC && !defined __RESTRICT
-+# define _Restrict
-+# define __restrict__
-+#endif
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* Define as a signed type of the same size as size_t. */
-+/* #undef ssize_t */
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+/* #undef uid_t */
-+
-+/* Define to unsigned long or unsigned long long if <stdint.h> and
-+   <inttypes.h> don't define. */
-+/* #undef uintmax_t */
-+
-+/* Define as a marker that can be attached to declarations that might not
-+    be used.  This helps to reduce warnings, such as from
-+    GCC -Wunused-parameter.  */
-+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-+# define _GL_UNUSED __attribute__ ((__unused__))
-+#else
-+# define _GL_UNUSED
-+#endif
-+/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-+   is a misnomer outside of parameter lists.  */
-+#define _UNUSED_PARAMETER_ _GL_UNUSED
-+
-+
-+
-+#define __libc_lock_t                   gl_lock_t
-+#define __libc_lock_define              gl_lock_define
-+#define __libc_lock_define_initialized  gl_lock_define_initialized
-+#define __libc_lock_init                gl_lock_init
-+#define __libc_lock_lock                gl_lock_lock
-+#define __libc_lock_unlock              gl_lock_unlock
-+#define __libc_lock_recursive_t                   gl_recursive_lock_t
-+#define __libc_lock_define_recursive              gl_recursive_lock_define
-+#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-+#define __libc_lock_init_recursive                gl_recursive_lock_init
-+#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-+#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-+#define glthread_in_use  libintl_thread_in_use
-+#define glthread_lock_init_func     libintl_lock_init_func
-+#define glthread_lock_lock_func     libintl_lock_lock_func
-+#define glthread_lock_unlock_func   libintl_lock_unlock_func
-+#define glthread_lock_destroy_func  libintl_lock_destroy_func
-+#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-+#define glthread_rwlock_init_func              libintl_rwlock_init_func
-+#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-+#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-+#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-+#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-+#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-+#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-+#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-+#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-+#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-+#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-+#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-+#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-+#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-+#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-+#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-+#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-+#define glthread_once_func            libintl_once_func
-+#define glthread_once_singlethreaded  libintl_once_singlethreaded
-+#define glthread_once_multithreaded   libintl_once_multithreaded
-+
-+
-+
-+/* On Windows, variables that may be in a DLL must be marked specially.  */
-+#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
-+# define DLL_VARIABLE __declspec (dllimport)
-+#else
-+# define DLL_VARIABLE
-+#endif
-+
-+/* Extra OS/2 (emx+gcc) defines.  */
-+#ifdef __EMX__
-+# include "intl/os2compat.h"
-+#endif
-+#endif
---- misc/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/libgnuintl.h	Wed Aug 20 14:26:42 2008
-@@ -1,1 +1,477 @@
--dummy
-+/* Message catalogs for internationalization.
-+   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Library General Public License as published
-+   by the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   This program 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
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+   USA.  */
-+
-+#ifndef _LIBINTL_H
-+#define _LIBINTL_H 1
-+
-+#if 0 && BUILDING_LIBINTL
-+#define LIBINTL_DLL_EXPORTED __attribute__((__visibility__("default")))
-+#elif defined _MSC_VER && BUILDING_DLL
-+# define LIBINTL_DLL_EXPORTED __declspec(dllexport)
-+#else
-+#define LIBINTL_DLL_EXPORTED
-+#endif
-+
-+#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__)
-+# include <xlocale.h>
-+#endif
-+
-+/* The LC_MESSAGES locale category is the category used by the functions
-+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-+   On systems that don't define it, use an arbitrary value instead.
-+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-+   then includes <libintl.h> (i.e. this file!) and then only defines
-+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-+   in this case.  */
-+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-+# define LC_MESSAGES 1729
-+#endif
-+
-+/* We define an additional symbol to signal that we use the GNU
-+   implementation of gettext.  */
-+#define __USE_GNU_GETTEXT 1
-+
-+/* Provide information about the supported file formats.  Returns the
-+   maximum minor revision number supported for a given major revision.  */
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-+  ((major) == 0 || (major) == 1 ? 1 : -1)
-+
-+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-+   precedence over _conio_gettext.  */
-+#ifdef __DJGPP__
-+# undef gettext
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/* Version number: (major<<16) + (minor<<8) + subminor */
-+#define LIBINTL_VERSION 0x001201
-+extern LIBINTL_DLL_EXPORTED
-+#ifdef _WIN32
-+  __declspec (dllimport)
-+#endif
-+  int libintl_version;
-+
-+
-+/* We redirect the functions to those prefixed with "libintl_".  This is
-+   necessary, because some systems define gettext/textdomain/... in the C
-+   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-+   If we used the unprefixed names, there would be cases where the
-+   definition in the C library would override the one in the libintl.so
-+   shared library.  Recall that on ELF systems, the symbols are looked
-+   up in the following order:
-+     1. in the executable,
-+     2. in the shared libraries specified on the link command line, in order,
-+     3. in the dependencies of the shared libraries specified on the link
-+        command line,
-+     4. in the dlopen()ed shared libraries, in the order in which they were
-+        dlopen()ed.
-+   The definition in the C library would override the one in libintl.so if
-+   either
-+     * -lc is given on the link command line and -lintl isn't, or
-+     * -lc is given on the link command line before -lintl, or
-+     * libintl.so is a dependency of a dlopen()ed shared library but not
-+       linked to the executable at link time.
-+   Since Solaris gettext() behaves differently than GNU gettext(), this
-+   would be unacceptable.
-+
-+   The redirection happens by default through macros in C, so that &gettext
-+   is independent of the compilation unit, but through inline functions in
-+   C++, in order not to interfere with the name mangling of class fields or
-+   class methods called 'gettext'.  */
-+
-+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-+   If he doesn't, we choose the method.  A third possible method is
-+   _INTL_REDIRECT_ASM, supported only by GCC.  */
-+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-+# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-+#  define _INTL_REDIRECT_ASM
-+# else
-+#  ifdef __cplusplus
-+#   define _INTL_REDIRECT_INLINE
-+#  else
-+#   define _INTL_REDIRECT_MACROS
-+#  endif
-+# endif
-+#endif
-+/* Auxiliary macros.  */
-+#ifdef _INTL_REDIRECT_ASM
-+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-+# define _INTL_STRINGIFY(prefix) #prefix
-+#else
-+# define _INTL_ASM(cname)
-+#endif
-+
-+/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-+   its n-th argument literally.  This enables GCC to warn for example about
-+   printf (gettext ("foo %y")).  */
-+#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
-+# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-+#else
-+# define _INTL_MAY_RETURN_STRING_ARG(n)
-+#endif
-+
-+/* Look up MSGID in the current default message catalog for the current
-+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-+   text).  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_gettext (const char *__msgid)
-+       _INTL_MAY_RETURN_STRING_ARG (1);
-+static inline char *gettext (const char *__msgid)
-+{
-+  return libintl_gettext (__msgid);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define gettext libintl_gettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *gettext (const char *__msgid)
-+       _INTL_ASM (libintl_gettext)
-+       _INTL_MAY_RETURN_STRING_ARG (1);
-+#endif
-+
-+/* Look up MSGID in the DOMAINNAME message catalog for the current
-+   LC_MESSAGES locale.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_dgettext (const char *__domainname, const char *__msgid)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *dgettext (const char *__domainname, const char *__msgid)
-+{
-+  return libintl_dgettext (__domainname, __msgid);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dgettext libintl_dgettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *dgettext (const char *__domainname, const char *__msgid)
-+       _INTL_ASM (libintl_dgettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-+   locale.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-+                                int __category)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *dcgettext (const char *__domainname, const char *__msgid,
-+                               int __category)
-+{
-+  return libintl_dcgettext (__domainname, __msgid, __category);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dcgettext libintl_dcgettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *dcgettext (const char *__domainname, const char *__msgid,
-+                        int __category)
-+       _INTL_ASM (libintl_dcgettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+
-+/* Similar to `gettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-+                               unsigned long int __n)
-+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-+                              unsigned long int __n)
-+{
-+  return libintl_ngettext (__msgid1, __msgid2, __n);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define ngettext libintl_ngettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *ngettext (const char *__msgid1, const char *__msgid2,
-+                       unsigned long int __n)
-+       _INTL_ASM (libintl_ngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+/* Similar to `dgettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-+                                const char *__msgid2, unsigned long int __n)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+static inline char *dngettext (const char *__domainname, const char *__msgid1,
-+                               const char *__msgid2, unsigned long int __n)
-+{
-+  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dngettext libintl_dngettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *dngettext (const char *__domainname,
-+                        const char *__msgid1, const char *__msgid2,
-+                        unsigned long int __n)
-+       _INTL_ASM (libintl_dngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+#endif
-+
-+/* Similar to `dcgettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext (const char *__domainname,
-+                                 const char *__msgid1, const char *__msgid2,
-+                                 unsigned long int __n, int __category)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+static inline char *dcngettext (const char *__domainname,
-+                                const char *__msgid1, const char *__msgid2,
-+                                unsigned long int __n, int __category)
-+{
-+  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dcngettext libintl_dcngettext
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *dcngettext (const char *__domainname,
-+                         const char *__msgid1, const char *__msgid2,
-+                         unsigned long int __n, int __category)
-+       _INTL_ASM (libintl_dcngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+#endif
-+
-+
-+
-+/* Set the current default message catalog to DOMAINNAME.
-+   If DOMAINNAME is null, return the current default.
-+   If DOMAINNAME is "", reset to the default of "messages".  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_textdomain (const char *__domainname);
-+static inline char *textdomain (const char *__domainname)
-+{
-+  return libintl_textdomain (__domainname);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define textdomain libintl_textdomain
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *textdomain (const char *__domainname)
-+       _INTL_ASM (libintl_textdomain);
-+#endif
-+
-+/* Specify that the DOMAINNAME message catalog will be found
-+   in DIRNAME rather than in the system locale data base.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain (const char *__domainname,
-+                                     const char *__dirname);
-+static inline char *bindtextdomain (const char *__domainname,
-+                                    const char *__dirname)
-+{
-+  return libintl_bindtextdomain (__domainname, __dirname);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define bindtextdomain libintl_bindtextdomain
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *bindtextdomain (const char *__domainname, const char *__dirname)
-+       _INTL_ASM (libintl_bindtextdomain);
-+#endif
-+
-+/* Specify the character encoding in which the messages from the
-+   DOMAINNAME message catalog will be returned.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset (const char *__domainname,
-+                                              const char *__codeset);
-+static inline char *bind_textdomain_codeset (const char *__domainname,
-+                                             const char *__codeset)
-+{
-+  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-+#endif
-+extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset (const char *__domainname,
-+                                      const char *__codeset)
-+       _INTL_ASM (libintl_bind_textdomain_codeset);
-+#endif
-+
-+
-+
-+/* Support for format strings with positions in *printf(), following the
-+   POSIX/XSI specification.
-+   Note: These replacements for the *printf() functions are visible only
-+   in source files that #include <libintl.h> or #include "gettext.h".
-+   Packages that use *printf() in source files that don't refer to _()
-+   or gettext() but for which the format string could be the return value
-+   of _() or gettext() need to add this #include.  Oh well.  */
-+
-+#if !(defined __APPLE__ && defined __MACH__)
-+
-+#include <stdio.h>
-+#include <stddef.h>
-+
-+/* Get va_list.  */
-+#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
-+# include <stdarg.h>
-+#else
-+# include <varargs.h>
-+#endif
-+
-+#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef fprintf
-+#define fprintf libintl_fprintf
-+extern LIBINTL_DLL_EXPORTED int fprintf (FILE *, const char *, ...);
-+#endif
-+#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vfprintf
-+#define vfprintf libintl_vfprintf
-+extern LIBINTL_DLL_EXPORTED int vfprintf (FILE *, const char *, va_list);
-+#endif
-+
-+#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef printf
-+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-+/* Don't break __attribute__((format(printf,M,N))).
-+   This redefinition is only possible because the libc in NetBSD, Cygwin,
-+   mingw does not have a function __printf__.
-+   Alternatively, we could have done this redirection only when compiling with
-+   __GNUC__, together with a symbol redirection:
-+       extern LIBINTL_DLL_EXPORTED int printf (const char *, ...)
-+              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
-+   But doing it now would introduce a binary incompatibility with already
-+   distributed versions of libintl on these systems.  */
-+# define libintl_printf __printf__
-+#endif
-+#define printf libintl_printf
-+extern LIBINTL_DLL_EXPORTED int printf (const char *, ...);
-+#endif
-+#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vprintf
-+#define vprintf libintl_vprintf
-+extern LIBINTL_DLL_EXPORTED int vprintf (const char *, va_list);
-+#endif
-+
-+#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef sprintf
-+#define sprintf libintl_sprintf
-+extern LIBINTL_DLL_EXPORTED int sprintf (char *, const char *, ...);
-+#endif
-+#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vsprintf
-+#define vsprintf libintl_vsprintf
-+extern LIBINTL_DLL_EXPORTED int vsprintf (char *, const char *, va_list);
-+#endif
-+
-+#if 0
-+
-+#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef snprintf
-+#define snprintf libintl_snprintf
-+extern LIBINTL_DLL_EXPORTED int snprintf (char *, size_t, const char *, ...);
-+#endif
-+#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vsnprintf
-+#define vsnprintf libintl_vsnprintf
-+extern LIBINTL_DLL_EXPORTED int vsnprintf (char *, size_t, const char *, va_list);
-+#endif
-+
-+#endif
-+
-+#if 0
-+
-+#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef asprintf
-+#define asprintf libintl_asprintf
-+extern LIBINTL_DLL_EXPORTED int asprintf (char **, const char *, ...);
-+#endif
-+#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vasprintf
-+#define vasprintf libintl_vasprintf
-+extern LIBINTL_DLL_EXPORTED int vasprintf (char **, const char *, va_list);
-+#endif
-+
-+#endif
-+
-+#if 0
-+
-+#undef fwprintf
-+#define fwprintf libintl_fwprintf
-+extern LIBINTL_DLL_EXPORTED int fwprintf (FILE *, const wchar_t *, ...);
-+#undef vfwprintf
-+#define vfwprintf libintl_vfwprintf
-+extern LIBINTL_DLL_EXPORTED int vfwprintf (FILE *, const wchar_t *, va_list);
-+
-+#undef wprintf
-+#define wprintf libintl_wprintf
-+extern LIBINTL_DLL_EXPORTED int wprintf (const wchar_t *, ...);
-+#undef vwprintf
-+#define vwprintf libintl_vwprintf
-+extern LIBINTL_DLL_EXPORTED int vwprintf (const wchar_t *, va_list);
-+
-+#undef swprintf
-+#define swprintf libintl_swprintf
-+extern LIBINTL_DLL_EXPORTED int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-+#undef vswprintf
-+#define vswprintf libintl_vswprintf
-+extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-+
-+#endif
-+
-+#endif
-+
-+
-+/* Support for the locale chosen by the user.  */
-+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-+
-+#undef setlocale
-+#define setlocale libintl_setlocale
-+extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
-+
-+#if (defined __APPLE__ && defined __MACH__)
-+
-+#undef newlocale
-+#define newlocale libintl_newlocale
-+extern LIBINTL_DLL_EXPORTED locale_t newlocale (int, const char *, locale_t);
-+
-+#endif
-+
-+#endif
-+
-+
-+/* Support for relocatable packages.  */
-+
-+/* Sets the original and the current installation prefix of the package.
-+   Relocation simply replaces a pathname starting with the original prefix
-+   by the corresponding pathname with the current prefix instead.  Both
-+   prefixes should be directory names without trailing slash (i.e. use ""
-+   instead of "/").  */
-+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-+extern LIBINTL_DLL_EXPORTED void
-+       libintl_set_relocation_prefix (const char *orig_prefix,
-+                                      const char *curr_prefix);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* libintl.h */
-+
---- misc/gettext-0.18.1.1/gettext-runtime/intl/libintl.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/gettext-0.18.1.1/gettext-runtime/intl/libintl.h	Wed Aug 20 14:26:42 2008
-@@ -1 +1,465 @@
--dummy
-+/* Message catalogs for internationalization.
-+   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
-+
-+   This program is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU Library General Public License as published
-+   by the Free Software Foundation; either version 2, or (at your option)
-+   any later version.
-+
-+   This program 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
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-+   USA.  */
-+
-+#ifndef _LIBINTL_H
-+#define _LIBINTL_H 1
-+
-+#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__)
-+# include <xlocale.h>
-+#endif
-+
-+/* The LC_MESSAGES locale category is the category used by the functions
-+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-+   On systems that don't define it, use an arbitrary value instead.
-+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-+   then includes <libintl.h> (i.e. this file!) and then only defines
-+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-+   in this case.  */
-+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-+# define LC_MESSAGES 1729
-+#endif
-+
-+/* We define an additional symbol to signal that we use the GNU
-+   implementation of gettext.  */
-+#define __USE_GNU_GETTEXT 1
-+
-+/* Provide information about the supported file formats.  Returns the
-+   maximum minor revision number supported for a given major revision.  */
-+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-+  ((major) == 0 || (major) == 1 ? 1 : -1)
-+
-+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-+   precedence over _conio_gettext.  */
-+#ifdef __DJGPP__
-+# undef gettext
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/* Version number: (major<<16) + (minor<<8) + subminor */
-+#define LIBINTL_VERSION 0x001201
-+extern int libintl_version;
-+
-+
-+/* We redirect the functions to those prefixed with "libintl_".  This is
-+   necessary, because some systems define gettext/textdomain/... in the C
-+   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-+   If we used the unprefixed names, there would be cases where the
-+   definition in the C library would override the one in the libintl.so
-+   shared library.  Recall that on ELF systems, the symbols are looked
-+   up in the following order:
-+     1. in the executable,
-+     2. in the shared libraries specified on the link command line, in order,
-+     3. in the dependencies of the shared libraries specified on the link
-+        command line,
-+     4. in the dlopen()ed shared libraries, in the order in which they were
-+        dlopen()ed.
-+   The definition in the C library would override the one in libintl.so if
-+   either
-+     * -lc is given on the link command line and -lintl isn't, or
-+     * -lc is given on the link command line before -lintl, or
-+     * libintl.so is a dependency of a dlopen()ed shared library but not
-+       linked to the executable at link time.
-+   Since Solaris gettext() behaves differently than GNU gettext(), this
-+   would be unacceptable.
-+
-+   The redirection happens by default through macros in C, so that &gettext
-+   is independent of the compilation unit, but through inline functions in
-+   C++, in order not to interfere with the name mangling of class fields or
-+   class methods called 'gettext'.  */
-+
-+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-+   If he doesn't, we choose the method.  A third possible method is
-+   _INTL_REDIRECT_ASM, supported only by GCC.  */
-+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-+# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-+#  define _INTL_REDIRECT_ASM
-+# else
-+#  ifdef __cplusplus
-+#   define _INTL_REDIRECT_INLINE
-+#  else
-+#   define _INTL_REDIRECT_MACROS
-+#  endif
-+# endif
-+#endif
-+/* Auxiliary macros.  */
-+#ifdef _INTL_REDIRECT_ASM
-+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-+# define _INTL_STRINGIFY(prefix) #prefix
-+#else
-+# define _INTL_ASM(cname)
-+#endif
-+
-+/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-+   its n-th argument literally.  This enables GCC to warn for example about
-+   printf (gettext ("foo %y")).  */
-+#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
-+# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-+#else
-+# define _INTL_MAY_RETURN_STRING_ARG(n)
-+#endif
-+
-+/* Look up MSGID in the current default message catalog for the current
-+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-+   text).  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_gettext (const char *__msgid)
-+       _INTL_MAY_RETURN_STRING_ARG (1);
-+static inline char *gettext (const char *__msgid)
-+{
-+  return libintl_gettext (__msgid);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define gettext libintl_gettext
-+#endif
-+extern char *gettext (const char *__msgid)
-+       _INTL_ASM (libintl_gettext)
-+       _INTL_MAY_RETURN_STRING_ARG (1);
-+#endif
-+
-+/* Look up MSGID in the DOMAINNAME message catalog for the current
-+   LC_MESSAGES locale.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *dgettext (const char *__domainname, const char *__msgid)
-+{
-+  return libintl_dgettext (__domainname, __msgid);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dgettext libintl_dgettext
-+#endif
-+extern char *dgettext (const char *__domainname, const char *__msgid)
-+       _INTL_ASM (libintl_dgettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-+   locale.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-+                                int __category)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *dcgettext (const char *__domainname, const char *__msgid,
-+                               int __category)
-+{
-+  return libintl_dcgettext (__domainname, __msgid, __category);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dcgettext libintl_dcgettext
-+#endif
-+extern char *dcgettext (const char *__domainname, const char *__msgid,
-+                        int __category)
-+       _INTL_ASM (libintl_dcgettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+
-+/* Similar to `gettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-+                               unsigned long int __n)
-+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-+                              unsigned long int __n)
-+{
-+  return libintl_ngettext (__msgid1, __msgid2, __n);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define ngettext libintl_ngettext
-+#endif
-+extern char *ngettext (const char *__msgid1, const char *__msgid2,
-+                       unsigned long int __n)
-+       _INTL_ASM (libintl_ngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-+#endif
-+
-+/* Similar to `dgettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-+                                const char *__msgid2, unsigned long int __n)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+static inline char *dngettext (const char *__domainname, const char *__msgid1,
-+                               const char *__msgid2, unsigned long int __n)
-+{
-+  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dngettext libintl_dngettext
-+#endif
-+extern char *dngettext (const char *__domainname,
-+                        const char *__msgid1, const char *__msgid2,
-+                        unsigned long int __n)
-+       _INTL_ASM (libintl_dngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+#endif
-+
-+/* Similar to `dcgettext' but select the plural form corresponding to the
-+   number N.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_dcngettext (const char *__domainname,
-+                                 const char *__msgid1, const char *__msgid2,
-+                                 unsigned long int __n, int __category)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+static inline char *dcngettext (const char *__domainname,
-+                                const char *__msgid1, const char *__msgid2,
-+                                unsigned long int __n, int __category)
-+{
-+  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define dcngettext libintl_dcngettext
-+#endif
-+extern char *dcngettext (const char *__domainname,
-+                         const char *__msgid1, const char *__msgid2,
-+                         unsigned long int __n, int __category)
-+       _INTL_ASM (libintl_dcngettext)
-+       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-+#endif
-+
-+
-+
-+/* Set the current default message catalog to DOMAINNAME.
-+   If DOMAINNAME is null, return the current default.
-+   If DOMAINNAME is "", reset to the default of "messages".  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_textdomain (const char *__domainname);
-+static inline char *textdomain (const char *__domainname)
-+{
-+  return libintl_textdomain (__domainname);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define textdomain libintl_textdomain
-+#endif
-+extern char *textdomain (const char *__domainname)
-+       _INTL_ASM (libintl_textdomain);
-+#endif
-+
-+/* Specify that the DOMAINNAME message catalog will be found
-+   in DIRNAME rather than in the system locale data base.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_bindtextdomain (const char *__domainname,
-+                                     const char *__dirname);
-+static inline char *bindtextdomain (const char *__domainname,
-+                                    const char *__dirname)
-+{
-+  return libintl_bindtextdomain (__domainname, __dirname);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define bindtextdomain libintl_bindtextdomain
-+#endif
-+extern char *bindtextdomain (const char *__domainname, const char *__dirname)
-+       _INTL_ASM (libintl_bindtextdomain);
-+#endif
-+
-+/* Specify the character encoding in which the messages from the
-+   DOMAINNAME message catalog will be returned.  */
-+#ifdef _INTL_REDIRECT_INLINE
-+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-+                                              const char *__codeset);
-+static inline char *bind_textdomain_codeset (const char *__domainname,
-+                                             const char *__codeset)
-+{
-+  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-+}
-+#else
-+#ifdef _INTL_REDIRECT_MACROS
-+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-+#endif
-+extern char *bind_textdomain_codeset (const char *__domainname,
-+                                      const char *__codeset)
-+       _INTL_ASM (libintl_bind_textdomain_codeset);
-+#endif
-+
-+
-+
-+/* Support for format strings with positions in *printf(), following the
-+   POSIX/XSI specification.
-+   Note: These replacements for the *printf() functions are visible only
-+   in source files that #include <libintl.h> or #include "gettext.h".
-+   Packages that use *printf() in source files that don't refer to _()
-+   or gettext() but for which the format string could be the return value
-+   of _() or gettext() need to add this #include.  Oh well.  */
-+
-+#if !(defined __APPLE__ && defined __MACH__)
-+
-+#include <stdio.h>
-+#include <stddef.h>
-+
-+/* Get va_list.  */
-+#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
-+# include <stdarg.h>
-+#else
-+# include <varargs.h>
-+#endif
-+
-+#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef fprintf
-+#define fprintf libintl_fprintf
-+extern int fprintf (FILE *, const char *, ...);
-+#endif
-+#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vfprintf
-+#define vfprintf libintl_vfprintf
-+extern int vfprintf (FILE *, const char *, va_list);
-+#endif
-+
-+#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef printf
-+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-+/* Don't break __attribute__((format(printf,M,N))).
-+   This redefinition is only possible because the libc in NetBSD, Cygwin,
-+   mingw does not have a function __printf__.
-+   Alternatively, we could have done this redirection only when compiling with
-+   __GNUC__, together with a symbol redirection:
-+       extern int printf (const char *, ...)
-+              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
-+   But doing it now would introduce a binary incompatibility with already
-+   distributed versions of libintl on these systems.  */
-+# define libintl_printf __printf__
-+#endif
-+#define printf libintl_printf
-+extern int printf (const char *, ...);
-+#endif
-+#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vprintf
-+#define vprintf libintl_vprintf
-+extern int vprintf (const char *, va_list);
-+#endif
-+
-+#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef sprintf
-+#define sprintf libintl_sprintf
-+extern int sprintf (char *, const char *, ...);
-+#endif
-+#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vsprintf
-+#define vsprintf libintl_vsprintf
-+extern int vsprintf (char *, const char *, va_list);
-+#endif
-+
-+#if 0
-+
-+#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef snprintf
-+#define snprintf libintl_snprintf
-+extern int snprintf (char *, size_t, const char *, ...);
-+#endif
-+#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vsnprintf
-+#define vsnprintf libintl_vsnprintf
-+extern int vsnprintf (char *, size_t, const char *, va_list);
-+#endif
-+
-+#endif
-+
-+#if 0
-+
-+#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef asprintf
-+#define asprintf libintl_asprintf
-+extern int asprintf (char **, const char *, ...);
-+#endif
-+#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
-+#undef vasprintf
-+#define vasprintf libintl_vasprintf
-+extern int vasprintf (char **, const char *, va_list);
-+#endif
-+
-+#endif
-+
-+#if 0
-+
-+#undef fwprintf
-+#define fwprintf libintl_fwprintf
-+extern int fwprintf (FILE *, const wchar_t *, ...);
-+#undef vfwprintf
-+#define vfwprintf libintl_vfwprintf
-+extern int vfwprintf (FILE *, const wchar_t *, va_list);
-+
-+#undef wprintf
-+#define wprintf libintl_wprintf
-+extern int wprintf (const wchar_t *, ...);
-+#undef vwprintf
-+#define vwprintf libintl_vwprintf
-+extern int vwprintf (const wchar_t *, va_list);
-+
-+#undef swprintf
-+#define swprintf libintl_swprintf
-+extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-+#undef vswprintf
-+#define vswprintf libintl_vswprintf
-+extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-+
-+#endif
-+
-+#endif
-+
-+
-+/* Support for the locale chosen by the user.  */
-+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-+
-+#undef setlocale
-+#define setlocale libintl_setlocale
-+extern char *setlocale (int, const char *);
-+
-+#if (defined __APPLE__ && defined __MACH__)
-+
-+#undef newlocale
-+#define newlocale libintl_newlocale
-+extern locale_t newlocale (int, const char *, locale_t);
-+
-+#endif
-+
-+#endif
-+
-+
-+/* Support for relocatable packages.  */
-+
-+/* Sets the original and the current installation prefix of the package.
-+   Relocation simply replaces a pathname starting with the original prefix
-+   by the corresponding pathname with the current prefix instead.  Both
-+   prefixes should be directory names without trailing slash (i.e. use ""
-+   instead of "/").  */
-+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-+extern void
-+       libintl_set_relocation_prefix (const char *orig_prefix,
-+                                      const char *curr_prefix);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* libintl.h */
-+
diff --git a/gettext/gettext-0.18.1.1.stpncpy.patch b/gettext/gettext-0.18.1.1.stpncpy.patch
deleted file mode 100644
index a9400867a53e..000000000000
--- a/gettext/gettext-0.18.1.1.stpncpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/gettext-0.18.1.1/gettext-tools/configure	2010-06-06 22:12:20.000000000 +0200
-+++ misc/build/gettext-0.18.1.1/gettext-tools/configure	2011-08-12 22:46:06.000000000 +0200
-@@ -40606,7 +40606,9 @@
- #include <stdlib.h>
- #include <string.h> /* for strcpy */
- /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
-+#if !defined stpncpy /* see <https://savannah.gnu.org/bugs/index.php?33999> */
- extern char *stpncpy (char *dest, const char *src, size_t n);
-+#endif
- int main () {
-   const char *src = "Hello";
-   char dest[10];
diff --git a/gettext/makefile.mk b/gettext/makefile.mk
deleted file mode 100644
index 270ac6cc769e..000000000000
--- a/gettext/makefile.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=gettext
-TARGET=so_gettext
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_GETTEXT)" == "YES"
-all:
-	@echo "An already available installation of gettext should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-GETTEXTVERSION=0.18.1.1
-
-TARFILE_NAME=$(PRJNAME)-$(GETTEXTVERSION)
-TARFILE_MD5=3dd55b952826d2b32f51308f2f91aa89
-
-# see <https://savannah.gnu.org/bugs/index.php?33999>
-PATCH_FILES=gettext-0.18.1.1.stpncpy.patch
-
-
-.IF "$(OS)"=="MACOSX"
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=./configure --prefix=/@.__________________________________________________$(EXTRPATH) $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
-CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java
-CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(GNUMAKE)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=gettext-tools/intl/.libs/libintl.*.dylib
-OUT2LIB+=gettext-runtime/libasprintf/.libs/libasprintf.*.dylib
-OUT2LIB+=gettext-tools/gnulib-lib/.libs/libgettextlib-*.dylib
-OUT2LIB+=gettext-tools/src/.libs/libgettextsrc-*.dylib
-OUT2LIB+=gettext-tools/libgettextpo/.libs/libgettextpo.*.dylib
-
-OUT2INC+=gettext-tools/intl/libintl.h
-OUT2INC+=gettext-runtime/libasprintf/autosprintf.h
-OUT2INC+=gettext-tools/libgettextpo/gettext-po.h
-
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgattrib
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgcat
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgcmp
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgcomm
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgconv
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgen
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgexec
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgfilter
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgfmt
-OUT2BIN_NONE+=gettext-tools/src/.libs/msggrep
-OUT2BIN_NONE+=gettext-tools/src/.libs/msginit
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgmerge
-OUT2BIN_NONE+=gettext-tools/src/.libs/msgunfmt
-OUT2BIN_NONE+=gettext-tools/src/.libs/msguniq
-OUT2BIN_NONE+=gettext-tools/src/.libs/urlget
-OUT2BIN_NONE+=gettext-tools/src/.libs/xgettext
-
-.ELIF "$(OS)"=="IOS"
-
-BUILD_DIR=gettext-runtime/intl
-BUILD_ACTION=dmake
-.IF "$(VERBOSE)"!=""
-BUILD_ACTION+=VERBOSE=t
-.ENDIF
-PATCH_FILES=gettext-0.18.1.1.patch
-ADDITIONAL_FILES=\
-    gettext-runtime/intl/makefile.mk \
-    gettext-runtime/intl/libgnuintl.h \
-    gettext-runtime/intl/libintl.h \
-    gettext-runtime/config.h
-OUT2INC+=gettext-runtime/intl/libintl.h
-
-.ELIF "$(OS)"=="WNT"
-
-BUILD_DIR=gettext-runtime/intl
-BUILD_ACTION=dmake
-PATCH_FILES=gettext-0.18.1.1.patch
-ADDITIONAL_FILES=\
-    gettext-runtime/intl/makefile.mk \
-    gettext-runtime/intl/libgnuintl.h \
-    gettext-runtime/intl/libintl.h \
-    gettext-runtime/config.h
-OUT2INC+=gettext-runtime/intl/libintl.h
-.ELSE
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/gettext/prj/build.lst b/gettext/prj/build.lst
deleted file mode 100644
index 10d25eb8461f..000000000000
--- a/gettext/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-gt	gettext	: soltools NULL
-gt	gettext			    usr1	-	all	gt_mkout NULL
-gt	gettext			    nmake	-	all	gt_gettext NULL
diff --git a/gettext/prj/d.lst b/gettext/prj/d.lst
deleted file mode 100644
index 811b4b1c60fb..000000000000
--- a/gettext/prj/d.lst
+++ /dev/null
@@ -1,31 +0,0 @@
-mkdir: %_DEST%\inc\external
-..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
-..\%__SRC%\lib\libasprintf.0.dylib %_DEST%\lib\libasprintf.0.dylib
-symlink: %_DEST%\lib\libasprintf.0.dylib %_DEST%\lib\libasprintf.dylib
-..\%__SRC%\lib\libgettextpo.0.dylib %_DEST%\lib\libgettextpo.0.dylib
-symlink: %_DEST%\lib\libgettextpo.0.dylib %_DEST%\lib\libgettextpo.dylib
-..\%__SRC%\lib\libgettextsrc-0.18.1.dylib %_DEST%\lib\libgettextsrc-0.18.1.dylib
-symlink: %_DEST%\lib\libgettextsrc-0.18.1.dylib %_DEST%\lib\libgettextsrc.dylib
-..\%__SRC%\lib\libintl.8.dylib %_DEST%\lib\libintl.8.dylib
-symlink: %_DEST%\lib\libintl.8.dylib %_DEST%\lib\libintl.dylib
-..\%__SRC%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib\libgettextlib-0.18.1.dylib
-symlink: %_DEST%\lib\libgettextlib-0.18.1.dylib %_DEST%\lib\libgettextlib.dylib
-..\%__SRC%\lib\libintl.a %_DEST%\lib\libintl.a
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\bin\msgattrib %_DEST%\bin\msgattrib
-..\%__SRC%\bin\msgcat %_DEST%\bin\msgcat
-..\%__SRC%\bin\msgcmp %_DEST%\bin\msgcmp
-..\%__SRC%\bin\msgcomm %_DEST%\bin\msgcomm
-..\%__SRC%\bin\msgconv %_DEST%\bin\msgconv
-..\%__SRC%\bin\msgen %_DEST%\bin\msgen
-..\%__SRC%\bin\msgexec %_DEST%\bin\msgexec
-..\%__SRC%\bin\msgfilter %_DEST%\bin\msgfilter
-..\%__SRC%\bin\msgfmt %_DEST%\bin\msgfmt
-..\%__SRC%\bin\msggrep %_DEST%\bin\msggrep
-..\%__SRC%\bin\msginit %_DEST%\bin\msginit
-..\%__SRC%\bin\msgmerge %_DEST%\bin\msgmerge
-..\%__SRC%\bin\msgunfmt %_DEST%\bin\msgunfmt
-..\%__SRC%\bin\msguniq %_DEST%\bin\msguniq
-..\%__SRC%\bin\urlget %_DEST%\bin\urlget
-..\%__SRC%\bin\xgettext %_DEST%\bin\xgettext
-..\%__SRC%\lib\iintl_t1.lib %_DEST%\lib\intl.lib
diff --git a/gettext/prj/dmake b/gettext/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gettext/prj/dmake
+++ /dev/null
diff --git a/glib/README b/glib/README
deleted file mode 100644
index ef03b75dc349..000000000000
--- a/glib/README
+++ /dev/null
@@ -1,4 +0,0 @@
-GLib is a general-purpose utility library, which provides many useful data types, macros,
-type conversions, string utilities, file utilities, a main loop abstraction, and so on.
-
-From [ http://www.gtk.org/api/2.6/glib/glib.html ]
-\ No newline at end of file
diff --git a/glib/glib-2.28.1-win32-2.patch b/glib/glib-2.28.1-win32-2.patch
deleted file mode 100644
index ee4b868f6b1a..000000000000
--- a/glib/glib-2.28.1-win32-2.patch
+++ /dev/null
@@ -1,553 +0,0 @@
---- misc/glib-2.28.1/build/win32/make.msc	2011-04-01 16:52:15.676157900 +0200
-+++ misc/build/glib-2.28.1/build/win32/make.msc	2011-04-01 16:52:02.168385300 +0200
-@@ -55,7 +55,7 @@
- BABL_LIBS = $(BABL)\babl\babl-1.0.lib
- 
- # force inclusion of the _right_ cairoversion.h even when using without installation 
--CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO)
-+CAIRO_CFLAGS = -I $(CAIRO)\src -I $(CAIRO)
- CAIRO_LIBS = $(CAIRO)\src\libcairo.lib
- 
- DIRENT_CFLAGS = -I ..\build\win32\dirent
---- misc/glib-2.28.1/gobject/glib-mkenums	2011-04-01 16:52:15.155128100 +0200
-+++ misc/build/glib-2.28.1/gobject/glib-mkenums	2011-04-01 16:51:30.994602300 +0200
-@@ -1 +1,538 @@
--dummy
-+#! perl.exe
-+
-+use warnings;
-+use File::Basename;
-+use Safe;
-+
-+# glib-mkenums.pl 
-+# Information about the current enumeration
-+my $flags;			# Is enumeration a bitmask?
-+my $option_underscore_name;	# Overriden underscore variant of the enum name
-+				# for example to fix the cases we don't get the
-+				# mixed-case -> underscorized transform right.
-+my $option_lowercase_name;	# DEPRECATED.  A lower case name to use as part
-+				# of the *_get_type() function, instead of the
-+				# one that we guess. For instance, when an enum
-+				# uses abnormal capitalization and we can not
-+				# guess where to put the underscores.
-+my $seenbitshift;		# Have we seen bitshift operators?
-+my $enum_prefix;		# Prefix for this enumeration
-+my $enumname;			# Name for this enumeration
-+my $enumshort;			# $enumname without prefix
-+my $enumname_prefix;		# prefix of $enumname
-+my $enumindex = 0;		# Global enum counter
-+my $firstenum = 1;		# Is this the first enumeration per file?
-+my @entries;			# [ $name, $val ] for each entry
-+my $sandbox = Safe->new;        # sandbox for safe evaluation of expressions
-+
-+sub parse_trigraph {
-+    my $opts = shift;
-+    my @opts;
-+
-+    for $opt (split /\s*,\s*/, $opts) {
-+	$opt =~ s/^\s*//;
-+	$opt =~ s/\s*$//;
-+        my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;
-+	defined $val or $val = 1;
-+	push @opts, $key, $val;
-+    }
-+    @opts;
-+}
-+sub parse_entries {
-+    my $file = shift;
-+    my $file_name = shift;
-+    my $looking_for_name = 0;
-+    
-+    while (<$file>) {
-+	# read lines until we have no open comments
-+	while (m@/\*([^*]|\*(?!/))*$@) {
-+	    my $new;
-+	    defined ($new = <$file>) || die "Unmatched comment in $ARGV";
-+	    $_ .= $new;
-+	}
-+	# strip comments w/o options
-+	s@/\*(?!<)
-+	    ([^*]+|\*(?!/))*
-+	   \*/@@gx;
-+	
-+	# strip newlines
-+	s@\n@ @;
-+	
-+	# skip empty lines
-+	next if m@^\s*$@;
-+	
-+	if ($looking_for_name) {
-+	    if (/^\s*(\w+)/) {
-+		$enumname = $1;
-+		return 1;
-+	    }
-+	}
-+	
-+	# Handle include files
-+	if (/^\#include\s*<([^>]*)>/ ) {
-+            my $file= "../$1";
-+	    open NEWFILE, $file or die "Cannot open include file $file: $!\n";
-+	    
-+	    if (parse_entries (\*NEWFILE, $NEWFILE)) {
-+		return 1;
-+	    } else {
-+		next;
-+	    }
-+	}
-+	
-+	if (/^\s*\}\s*(\w+)/) {
-+	    $enumname = $1;
-+	    $enumindex++;
-+	    return 1;
-+	}
-+	
-+	if (/^\s*\}/) {
-+	    $enumindex++;
-+	    $looking_for_name = 1;
-+	    next;
-+	}
-+
-+        if (m@^\s*
-+              (\w+)\s*                   # name
-+              (?:=(                      # value
-+		   \s*\w+\s*\(.*\)\s*       # macro with multiple args
-+		   |                        # OR
-+                   (?:[^,/]|/(?!\*))*       # anything but a comma or comment
-+                  ))?,?\s*
-+              (?:/\*<                    # options
-+                (([^*]|\*(?!/))*)
-+               >\s*\*/)?,?
-+              \s*$
-+             @x) {
-+            my ($name, $value, $options) = ($1,$2,$3);
-+
-+	    if (!defined $flags && defined $value && $value =~ /<</) {
-+		$seenbitshift = 1;
-+	    }
-+
-+	    if (defined $options) {
-+		my %options = parse_trigraph($options);
-+		if (!defined $options{skip}) {
-+		    push @entries, [ $name, $value, $options{nick} ];
-+		}
-+	    } else {
-+		push @entries, [ $name, $value ];
-+	    }
-+	} elsif (m@^\s*\#@) {
-+	    # ignore preprocessor directives
-+	} else {
-+	    print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";
-+	}
-+    }
-+
-+    return 0;
-+}
-+
-+sub version {
-+    print "glib-mkenums version glib-@GLIB_VERSION@\n";
-+    print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";
-+    print "You may redistribute copies of glib-mkenums under the terms of\n";
-+    print "the GNU General Public License which can be found in the\n";
-+    print "GLib source package. Sources, examples and contact\n";
-+    print "information are available at http://www.gtk.org\n";
-+    exit 0;
-+}
-+sub usage {
-+    print "Usage:\n";
-+    print "  glib-mkenums [OPTION...] [FILES...]\n\n";
-+    print "Help Options:\n";
-+    print "  -h, --help            Show this help message\n\n";
-+    print "Utility Options:\n";
-+    print "  --fhead <text>        Output file header\n";
-+    print "  --fprod <text>        Per input file production\n";
-+    print "  --ftail <text>        Output file trailer\n";
-+    print "  --eprod <text>        Per enum text (produced prior to value itarations)\n";
-+    print "  --vhead <text>        Value header, produced before iterating over enum values\n";
-+    print "  --vprod <text>        Value text, produced for each enum value\n";
-+    print "  --vtail <text>        Value tail, produced after iterating over enum values\n";
-+    print "  --comments <text>     Comment structure\n";
-+    print "  --template file       Template file\n";
-+    print "  -v, --version         Print version informations\n\n";
-+    print "Production text substitutions:\n";
-+    print "  \@EnumName\@            PrefixTheXEnum\n";
-+    print "  \@enum_name\@           prefix_the_xenum\n";
-+    print "  \@ENUMNAME\@            PREFIX_THE_XENUM\n";
-+    print "  \@ENUMSHORT\@           THE_XENUM\n";
-+    print "  \@ENUMPREFIX\@          PREFIX\n";
-+    print "  \@VALUENAME\@           PREFIX_THE_XVALUE\n";
-+    print "  \@valuenick\@           the-xvalue\n";
-+    print "  \@valuenum\@            the integer value (limited support, Since: 2.26)\n";
-+    print "  \@type\@                either enum or flags\n";
-+    print "  \@Type\@                either Enum or Flags\n";
-+    print "  \@TYPE\@                either ENUM or FLAGS\n";
-+    print "  \@filename\@            name of current input file\n";
-+    print "  \@basename\@            base name of the current input file (Since: 2.22)\n";
-+    exit 0;
-+}
-+
-+# production variables:
-+my $fhead = "";   # output file header
-+my $fprod = "";   # per input file production
-+my $ftail = "";   # output file trailer
-+my $eprod = "";   # per enum text (produced prior to value itarations)
-+my $vhead = "";   # value header, produced before iterating over enum values
-+my $vprod = "";   # value text, produced for each enum value
-+my $vtail = "";   # value tail, produced after iterating over enum values
-+my $comment_tmpl = "";   # comment template
-+
-+sub read_template_file {
-+  my ($file) = @_;
-+  my %tmpl = ('file-header', $fhead, 
-+	      'file-production', $fprod, 
-+	      'file-tail', $ftail, 
-+	      'enumeration-production', $eprod,
-+	      'value-header', $vhead,
-+	      'value-production', $vprod,
-+	      'value-tail', $vtail,
-+	      'comment', $comment_tmpl);
-+  my $in = 'junk';
-+  open (FILE, $file) || die "Can't open $file: $!\n";
-+  while (<FILE>) {
-+    if (/^\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\//) {
-+      if (($in eq 'junk') && ($1 eq 'BEGIN') && (exists($tmpl{$2}))) {
-+	$in = $2;
-+	next;
-+      }
-+      elsif (($in eq $2) && ($1 eq 'END') && (exists($tmpl{$2}))) {
-+	$in = 'junk';
-+	next;
-+      } else {
-+	  die "Malformed template file $file\n";
-+      }
-+    }
-+    if (!($in eq 'junk')) {
-+	$tmpl{$in} .= $_;
-+    }
-+  }
-+  close (FILE);
-+  if (!($in eq 'junk')) {
-+      die "Malformed template file $file\n";
-+  }
-+  $fhead = $tmpl{'file-header'};
-+  $fprod = $tmpl{'file-production'};
-+  $ftail = $tmpl{'file-tail'};
-+  $eprod = $tmpl{'enumeration-production'};
-+  $vhead = $tmpl{'value-header'};
-+  $vprod = $tmpl{'value-production'};
-+  $vtail = $tmpl{'value-tail'};
-+  $comment_tmpl = $tmpl{'comment'};
-+
-+  # default to C-style comments
-+  $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq "";
-+}
-+
-+if (!defined $ARGV[0]) {
-+    usage;
-+}
-+while ($_=$ARGV[0],/^-/) {
-+    shift;
-+    last if /^--$/;
-+    if (/^--template$/)                      { read_template_file (shift); }
-+    elsif (/^--fhead$/)                      { $fhead = $fhead . shift }
-+    elsif (/^--fprod$/)                      { $fprod = $fprod . shift }
-+    elsif (/^--ftail$/)                      { $ftail = $ftail . shift }
-+    elsif (/^--eprod$/)                      { $eprod = $eprod . shift }
-+    elsif (/^--vhead$/)                      { $vhead = $vhead . shift }
-+    elsif (/^--vprod$/)                      { $vprod = $vprod . shift }
-+    elsif (/^--vtail$/)                      { $vtail = $vtail . shift }
-+    elsif (/^--comments$/)                   { $comment_tmpl = shift }
-+    elsif (/^--help$/ || /^-h$/ || /^-\?$/)  { usage; }
-+    elsif (/^--version$/ || /^-v$/)          { version; }
-+    else { usage; }
-+    last if not defined($ARGV[0]);
-+}
-+
-+# put auto-generation comment
-+{
-+    my $comment = $comment_tmpl;
-+    $comment =~ s/\@comment\@/Generated data (by glib-mkenums)/;
-+    print "\n" . $comment . "\n\n";
-+}
-+
-+if (length($fhead)) {
-+    my $prod = $fhead;
-+    my $base = basename ($ARGV[0]);
-+
-+    $prod =~ s/\@filename\@/$ARGV[0]/g;
-+    $prod =~ s/\@basename\@/$base/g;
-+    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+    chomp ($prod);
-+		
-+    print "$prod\n";
-+}
-+
-+while (<>) {
-+    if (eof) {
-+	close (ARGV);		# reset line numbering
-+	$firstenum = 1;		# Flag to print filename at next enum
-+    }
-+
-+    # read lines until we have no open comments
-+    while (m@/\*([^*]|\*(?!/))*$@) {
-+	my $new;
-+	defined ($new = <>) || die "Unmatched comment in $ARGV";
-+	$_ .= $new;
-+    }
-+    # strip comments w/o options
-+    s@/\*(?!<)
-+       ([^*]+|\*(?!/))*
-+       \*/@@gx;
-+	
-+    if (m@^\s*typedef\s+enum\s*
-+           ({)?\s*
-+           (?:/\*<
-+             (([^*]|\*(?!/))*)
-+            >\s*\*/)?
-+           \s*({)?
-+         @x) {
-+	if (defined $2) {
-+	    my %options = parse_trigraph ($2);
-+	    next if defined $options{skip};
-+	    $enum_prefix = $options{prefix};
-+	    $flags = $options{flags};
-+	    $option_lowercase_name = $options{lowercase_name};
-+	    $option_underscore_name = $options{underscore_name};
-+	} else {
-+	    $enum_prefix = undef;
-+	    $flags = undef;
-+	    $option_lowercase_name = undef;
-+	    $option_underscore_name = undef;
-+	}
-+	if (defined $option_lowercase_name) {
-+	    if (defined $option_underscore_name) {
-+		print STDERR "$0: $ARGV:$.: lowercase_name overriden with underscore_name\n";
-+		$option_lowercase_name = undef;
-+	    } else {
-+		print STDERR "$0: $ARGV:$.: lowercase_name is deprecated, use underscore_name\n";
-+	    }
-+	}
-+	# Didn't have trailing '{' look on next lines
-+	if (!defined $1 && !defined $4) {
-+	    while (<>) {
-+		if (s/^\s*\{//) {
-+		    last;
-+		}
-+	    }
-+	}
-+
-+	$seenbitshift = 0;
-+	@entries = ();
-+
-+	# Now parse the entries
-+	parse_entries (\*ARGV, $ARGV);
-+
-+	# figure out if this was a flags or enums enumeration
-+	if (!defined $flags) {
-+	    $flags = $seenbitshift;
-+	}
-+
-+	# Autogenerate a prefix
-+	if (!defined $enum_prefix) {
-+	    for (@entries) {
-+		my $nick = $_->[2];
-+		if (!defined $nick) {
-+		    my $name = $_->[0];
-+		    if (defined $enum_prefix) {
-+			my $tmp = ~ ($name ^ $enum_prefix);
-+			($tmp) = $tmp =~ /(^\xff*)/;
-+			$enum_prefix = $enum_prefix & $tmp;
-+		    } else {
-+			$enum_prefix = $name;
-+		    }
-+		}
-+	    }
-+	    if (!defined $enum_prefix) {
-+		$enum_prefix = "";
-+	    } else {
-+		# Trim so that it ends in an underscore
-+		$enum_prefix =~ s/_[^_]*$/_/;
-+	    }
-+	} else {
-+	    # canonicalize user defined prefixes
-+	    $enum_prefix = uc($enum_prefix);
-+	    $enum_prefix =~ s/-/_/g;
-+	    $enum_prefix =~ s/(.*)([^_])$/$1$2_/;
-+	}
-+	
-+	for $entry (@entries) {
-+	    my ($name,$num,$nick) = @{$entry};
-+            if (!defined $nick) {
-+ 	        ($nick = $name) =~ s/^$enum_prefix//;
-+	        $nick =~ tr/_/-/;
-+	        $nick = lc($nick);
-+	        @{$entry} = ($name, $num, $nick);
-+            }
-+	}
-+	
-+
-+	# Spit out the output
-+	if (defined $option_underscore_name) {
-+	    $enumlong = uc $option_underscore_name;
-+	    $enumsym = lc $option_underscore_name;
-+	    $enumshort = $enumlong;
-+	    $enumshort =~ s/^[A-Z][A-Z0-9]*_//;
-+
-+	    $enumname_prefix = $enumlong;
-+	    $enumname_prefix =~ s/$enumshort$//;
-+	} else {
-+	    # enumname is e.g. GMatchType
-+	    $enspace = $enumname;
-+	    $enspace =~ s/^([A-Z][a-z]*).*$/$1/;
-+
-+	    $enumshort = $enumname;
-+	    $enumshort =~ s/^[A-Z][a-z]*//;
-+	    $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;
-+	    $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;
-+	    $enumshort = uc($enumshort);
-+
-+	    $enumname_prefix = $enumname;
-+	    $enumname_prefix =~ s/^([A-Z][a-z]*).*$/$1/;
-+	    $enumname_prefix = uc($enumname_prefix);
-+
-+	    $enumlong = uc($enspace) . "_" . $enumshort;
-+	    $enumsym = lc($enspace) . "_" . lc($enumshort);
-+
-+	    if (defined($option_lowercase_name)) {
-+		$enumsym = $option_lowercase_name;
-+	    }
-+	}
-+
-+	if ($firstenum) {
-+	    $firstenum = 0;
-+	    
-+	    if (length($fprod)) {
-+		my $prod = $fprod;
-+		my $base = basename ($ARGV);
-+
-+		$prod =~ s/\@filename\@/$ARGV/g;
-+		$prod =~ s/\@basename\@/$base/g;
-+		$prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+		$prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+	        chomp ($prod);
-+		
-+		print "$prod\n";
-+	    }
-+	}
-+	
-+	if (length($eprod)) {
-+	    my $prod = $eprod;
-+
-+	    $prod =~ s/\@enum_name\@/$enumsym/g;
-+	    $prod =~ s/\@EnumName\@/$enumname/g;
-+	    $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-+	    $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-+	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-+	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-+	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-+	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-+	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+            chomp ($prod);
-+
-+	    print "$prod\n";
-+	}
-+
-+	if (length($vhead)) {
-+	    my $prod = $vhead;
-+
-+	    $prod =~ s/\@enum_name\@/$enumsym/g;
-+            $prod =~ s/\@EnumName\@/$enumname/g;
-+            $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-+            $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-+	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-+	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-+	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-+	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-+            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+            chomp ($prod);
-+	    
-+            print "$prod\n";
-+	}
-+
-+	if (length($vprod)) {
-+	    my $prod = $vprod;
-+            my $next_num = 0;
-+	    
-+	    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+	    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+	    for (@entries) {
-+		my ($name,$num,$nick) = @{$_};
-+		my $tmp_prod = $prod;
-+
-+                if ($prod =~ /\@valuenum\@/) {
-+                    # only attempt to eval the value if it is requested
-+                    # this prevents us from throwing errors otherwise
-+                    if (defined $num) {
-+                        # use sandboxed perl evaluation as a reasonable
-+                        # approximation to C constant folding
-+                        $num = $sandbox->reval ($num);
-+
-+                        # make sure it parsed to an integer
-+                        if (!defined $num or $num !~ /^-?\d+$/) {
-+                            die "Unable to parse enum value '$num'";
-+                        }
-+                    } else {
-+                        $num = $next_num;
-+                    }
-+
-+                    $tmp_prod =~ s/\@valuenum\@/$num/g;
-+                    $next_num = $num + 1;
-+                }
-+
-+		$tmp_prod =~ s/\@VALUENAME\@/$name/g;
-+		$tmp_prod =~ s/\@valuenick\@/$nick/g;
-+		if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }
-+		if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }
-+		if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }
-+		chomp ($tmp_prod);
-+
-+		print "$tmp_prod\n";
-+	    }
-+	}
-+
-+	if (length($vtail)) {
-+	    my $prod = $vtail;
-+
-+	    $prod =~ s/\@enum_name\@/$enumsym/g;
-+            $prod =~ s/\@EnumName\@/$enumname/g;
-+            $prod =~ s/\@ENUMSHORT\@/$enumshort/g;
-+            $prod =~ s/\@ENUMNAME\@/$enumlong/g;
-+	    $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;
-+	    if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }
-+	    if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }
-+	    if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }
-+            $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+            $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+            chomp ($prod);
-+	    
-+            print "$prod\n";
-+	}
-+    }
-+}
-+
-+if (length($ftail)) {
-+    my $prod = $ftail;
-+    my $base = basename ($ARGV);
-+
-+    $prod =~ s/\@filename\@/$ARGV/g;
-+    $prod =~ s/\@basename\@/$base/g;
-+    $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;
-+    $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;
-+    chomp ($prod);
-+		
-+    print "$prod\n";
-+}
-+
-+# put auto-generation comment
-+{
-+    my $comment = $comment_tmpl;
-+    $comment =~ s/\@comment\@/Generated data ends here/;
-+    print "\n" . $comment . "\n\n";
-+}
diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch
deleted file mode 100644
index 7cfd09bea7e1..000000000000
--- a/glib/glib-2.28.1-win32.patch
+++ /dev/null
@@ -1,1994 +0,0 @@
---- misc/glib-2.28.1/build/win32/dirent/makefile.msc	2009-04-01 01:04:20.000000000 +0200
-+++ misc/build/glib-2.28.1/build/win32/dirent/makefile.msc	2011-03-04 09:06:56.391118000 +0100
-@@ -1,10 +1,10 @@
- TOP = ..\..\..\..
- 
--!INCLUDE $(TOP)\glib\build\win32\make.msc
-+!INCLUDE ..\make.msc
- 
- dirent_OBJECTS = dirent.obj wdirent.obj
- 
--INCLUDES = -I.
-+INCLUDES = -I. $(SOLARINC) 
- 
- all : dirent.lib
- 
-@@ -12,5 +12,5 @@
- 	lib /out:dirent.lib /nodefaultlib $(dirent_OBJECTS)
- 
- clean::
--	del /f $(dirent_OBJECTS)
--	del /f dirent.lib
-+	rm /f $(dirent_OBJECTS)
-+	rm /f dirent.lib
---- misc/glib-2.28.1/build/win32/make.msc	2009-08-29 04:52:21.000000000 +0200
-+++ misc/build/glib-2.28.1/build/win32/make.msc	2011-03-04 12:36:27.513145100 +0100
-@@ -35,7 +35,7 @@
- XSLTPROC = d:\gnome-0\xsltproc
- 
- # paths and version numbers
--!INCLUDE $(TOP)\glib\build\win32\module.defs
-+!INCLUDE module.defs
- 
- ################
- # CFLAGS and LIBS for the packages in module.defs.
-@@ -58,8 +58,8 @@
- CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO)
- CAIRO_LIBS = $(CAIRO)\src\libcairo.lib
- 
--DIRENT_CFLAGS = -I $(GLIB)\build\win32\dirent
--DIRENT_LIBS = $(GLIB)\build\win32\dirent\dirent.lib
-+DIRENT_CFLAGS = -I ..\build\win32\dirent
-+DIRENT_LIBS = ..\build\win32\dirent\dirent.lib
- 
- !IFNDEF EXIF
- EXIF_CFLAGS = -I $(DEVTOP)\include 
-@@ -92,7 +92,7 @@
- # overide definition to use it as callable path
- GLIB = $(TOP)\glib
- 
--GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS)
-+GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS) $(SOLARINC)
- GLIB_LIBS = $(GLIB)\glib\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib $(GLIB)\gobject\gobject-$(GLIB_VER).lib $(GLIB)\gio\gio-$(GLIB_VER).lib
- GTHREAD_LIBS = $(GLIB)\gthread\gthread-$(GLIB_VER).lib
- 
-@@ -126,11 +126,11 @@
- LIBART_LIBS = $(LIBART)\art_lgpl_2.lib
- 
- !IFNDEF INTL
--INTL_CFLAGS = -I $(DEVTOP)\include
--INTL_LIBS = $(DEVTOP)\lib\intl.lib 
-+INTL_CFLAGS = -I $(OUTDIR)\inc\external
-+INTL_LIBS = $(OUTDIR)/lib/intl.lib 
- !ELSE
--INTL_CFLAGS = -I $(INTL)
--INTL_LIBS = $(INTL)\intl.lib 
-+INTL_CFLAGS = -I $(OUTDIR)\inc\external
-+INTL_LIBS = $(OUTDIR)/lib/intl.lib 
- !ENDIF
- 
- !IFDEF LCMS
-@@ -199,10 +199,10 @@
- 
- !IFDEF ZLIB
- ZLIB_CFLAGS = -I $(ZLIB)
--ZLIB_LIBS = $(ZLIB)\projects\visualc6\Win32_LIB_Release\zlib.lib
-+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
- !ELSE
--ZLIB_CFLAGS = -I $(DEVTOP)\include
--ZLIB_LIBS = $(DEVTOP)\lib\zdll.lib
-+ZLIB_CFLAGS = -I $(OUTDIR)\inc\external\zlib
-+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib
- !ENDIF
- 
- ################
---- misc/glib-2.28.1/gio/gzlibcompressor.c	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/gio/gzlibcompressor.c	2011-03-07 10:33:19.559189800 +0100
-@@ -25,7 +25,7 @@
- #include "gzlibcompressor.h"
- 
- #include <errno.h>
--#include <zlib.h>
-+#include <zlib/zlib.h>
- #include <string.h>
- 
- #include "gfileinfo.h"
-@@ -64,8 +64,10 @@
- 
-   GZlibCompressorFormat format;
-   int level;
-+#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-   z_stream zstream;
-   gz_header gzheader;
-+#endif
-   GFileInfo *file_info;
- };
- 
-@@ -73,7 +75,7 @@
- g_zlib_compressor_set_gzheader (GZlibCompressor *compressor)
- {
-   /* On win32, these functions were not exported before 1.2.4 */
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   const gchar *filename;
- 
-   if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
---- misc/glib-2.28.1/gio/gzlibdecompressor.c	2011-03-07 09:13:41.324890400 +0100
-+++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c	2011-03-04 11:28:39.712480200 +0100
-@@ -25,7 +25,7 @@
- #include "gzlibdecompressor.h"
- 
- #include <errno.h>
--#include <zlib.h>
-+#include <zlib/zlib.h>
- #include <string.h>
- 
- #include "gfileinfo.h"
-@@ -76,7 +76,7 @@
- g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor)
- {
-   /* On win32, these functions were not exported before 1.2.4 */
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP)
-     return;
- 
-@@ -376,7 +376,7 @@
-   *bytes_read = inbuf_size - decompressor->zstream.avail_in;
-   *bytes_written = outbuf_size - decompressor->zstream.avail_out;
- 
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   if (decompressor->header_data != NULL &&
-       decompressor->header_data->gzheader.done == 1)
-     {
---- misc/glib-2.28.1/gio/makefile.msc	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/gio/makefile.msc	2011-03-04 12:43:54.423706900 +0100
-@@ -3,9 +3,9 @@
- PRJ_TOP = ..
- PACKAGE = gio
- PKG_VER = 2.0
--!INCLUDE $(TOP)\glib\build\win32\make.msc
-+!INCLUDE ..\build\win32\make.msc
- 
--SUBDIRS = win32
-+SUBDIRS = win32 gvdb
- 
- sub-all: 
- 	for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
-@@ -18,13 +18,15 @@
- INCLUDES = \
- 	-FImsvc_recommended_pragmas.h \
- 	-I .. -I ..\glib -I ..\gmodule -I . \
--	$(INTL_CFLAGS)
-+	$(INTL_CFLAGS) \
-+	$(SOLARINC) \
- 
- DEFINES = \
- 	-DG_LOG_DOMAIN=\"GLib-GIO\" \
- 	-DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
- 	-DGIO_COMPILATION
- 
-+
- appinfo_sources = \
- 	gwin32appinfo.c gwin32appinfo.h
- 
-@@ -75,19 +77,50 @@
- 	$(NULL)
- 
- OBJECTS = \
-+	gaction.obj \
-+	gactiongroup.obj \
- 	gappinfo.obj \
-+	gapplication.obj \
-+	gapplicationcommandline.obj \
-+	gapplicationimpl-dbus.obj \
- 	gasynchelper.obj \
- 	gasyncinitable.obj \
- 	gasyncresult.obj \
- 	gbufferedinputstream.obj \
- 	gbufferedoutputstream.obj \
- 	gcancellable.obj \
-+	gcharsetconverter.obj \
- 	gcontenttype.obj \
-+	gconverter.obj \
-+	gconverterinputstream.obj \
-+	gconverteroutputstream.obj \
-+	gcredentials.obj \
- 	gdatainputstream.obj \
- 	gdataoutputstream.obj \
-+	gdbusaddress.obj \
-+	gdbusauth.obj \
-+	gdbusauthmechanism.obj \
-+	gdbusauthmechanismanon.obj \
-+	gdbusauthmechanismexternal.obj \
-+	gdbusauthmechanismsha1.obj \
-+	gdbusauthobserver.obj \
-+	gdbusconnection.obj \
-+	gdbuserror.obj \
-+	gdbusintrospection.obj \
-+	gdbusmessage.obj \
-+	gdbusmethodinvocation.obj \
-+	gdbusnameowning.obj \
-+	gdbusnamewatching.obj \
-+	gdbusprivate.obj \
-+	gdbusproxy.obj \
-+	gdbusserver.obj \
-+	gdbusutils.obj \
-+	gdelayedsettingsbackend.obj \
- #	gdesktopappinfo.obj \
- 	gdrive.obj \
- 	gdummyfile.obj \
-+	gdummyproxyresolver.obj \
-+	gdummytlsbackend.obj \
- 	gemblem.obj \
- 	gemblemedicon.obj \
- 	gfile.obj \
-@@ -112,20 +145,39 @@
- 	giomodule.obj \
- 	gioscheduler.obj \
- 	giostream.obj \
-+	gkeyfilesettingsbackend.obj \
- 	gloadableicon.obj \
- 	glocalfileiostream.obj \
- 	gmemoryinputstream.obj \
- 	gmemoryoutputstream.obj \
-+	gmemorysettingsbackend.obj \
- 	gmount.obj \
- 	gmountoperation.obj \
- 	gnativevolumemonitor.obj \
- 	gnetworkaddress.obj \
- 	gnetworkservice.obj \
-+	gnullsettingsbackend.obj \
- 	goutputstream.obj \
-+	gpermission.obj \
-+	gpollableinputstream.obj \
-+	gpollableoutputstream.obj \
- 	gpollfilemonitor.obj \
-+	gproxy.obj\
-+	gproxyaddress.obj \
-+	gproxyaddressenumerator.obj \
-+	gproxyresolver.obj \
-+	gregistrysettingsbackend.obj \
- 	gresolver.obj \
-+	gsettings-mapping.obj \
-+	gsettings-tool.obj \
-+	gsettings.obj \
-+	gsettingsbackend.obj \
-+	gsettingsschema.obj \
- 	gseekable.obj \
-+	gsimpleaction.obj \
-+	gsimpleactiongroup.obj \
- 	gsimpleasyncresult.obj \
-+	gsimplepermission.obj \
- 	gsocket.obj \
- 	gsocketaddress.obj \
- 	gsocketaddressenumerator.obj \
-@@ -135,13 +187,22 @@
- 	gsocketcontrolmessage.obj \
- 	gsocketlistener.obj \
- 	gsocketservice.obj \
-+	gsocks4aproxy.obj \
-+	gsocks4proxy.obj \
-+	gsocks5proxy.obj \
- 	gsocketinputstream.obj \
- 	gsocketoutputstream.obj \
- 	gsrvtarget.obj \
- 	gtcpconnection.obj \
-+	gtcpwrapperconnection.obj \
- 	gthreadedresolver.obj \
- 	gthreadedsocketservice.obj \
- 	gthemedicon.obj \
-+	gtlsbackend.obj \
-+	gtlscertificate.obj \
-+	gtlsclientconnection.obj \
-+	gtlsconnection.obj \
-+	gtlsserverconnection.obj \
- 	gunionvolumemonitor.obj \
- 	gvfs.obj \
- 	gvolume.obj \
-@@ -156,11 +217,15 @@
- 	glocalfilemonitor.obj \
- 	glocaldirectorymonitor.obj \
- 	gwin32appinfo.obj \
-+	gwin32outputstream.obj \
- 	\
- 	gio-marshal.obj \
-+	gwin32inputstream.obj \
- 	gwin32mount.obj \
- 	gwin32volumemonitor.obj \
--	gwin32resolver.obj 
-+	gwin32resolver.obj \
-+	gzlibdecompressor.obj \
-+	gzlibcompressor.obj
- 
- libgio_2_0_la_LIBADD = \
- 	$(top_builddir)/glib/libglib-2.0.la \
-@@ -190,14 +255,14 @@
- 
- gio-marshal.h: gio-marshal.list
- 	$(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \
--	&& copy /y xgen-gwmh gio-marshal.h \
--	&& del xgen-gwmh xgen-gwmh~
-+	&& cp xgen-gwmh gio-marshal.h \
-+	&& rm xgen-gwmh xgen-gwmh~
- 
- gio-marshal.c: gio-marshal.h
- 	echo #include "gio-marshal.h" >> xgen-gwmc \
- 	&& $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \
--	&& copy xgen-gwmc gio-marshal.c \
--	&& del xgen-gwmc xgen-gwmc~
-+	&& cp xgen-gwmc gio-marshal.c \
-+	&& rm xgen-gwmc xgen-gwmc~
- 
- local_sources = \
- 	glocaldirectorymonitor.c \
-@@ -228,11 +293,11 @@
- 	gio-marshal.c \
- 	gioenumtypes.h		\
- 	gioenumtypes.c		\
--	libgio-$(PKG_VER)-0.dll
-+	giolo.dll
- 
- 
- $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
--	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
-+	cp $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
- 
- gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
- 	$(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h
-@@ -245,14 +310,14 @@
- RESOURCE = $(PACKAGE).res
- 
- $(PACKAGE).res : $(PACKAGE).rc
--	rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc
-+	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo $(PACKAGE).res $(PACKAGE).rc
- 
--libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE)
--	$(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \
-+giolo.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) 
-+	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \
- 	..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \
--	win32\giowin32.lib \
--	$(INTL_LIBS) \
--	kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \
-+	win32\giowin32.lib gvdb\giogvdb.lib \
-+	$(INTL_LIBS) $(ZLIB_LIBS) \
-+	kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib shlwapi.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \
- 	/implib:gio-2.0.lib /def:$(PACKAGE).def
- 
- .c.obj :
---- misc/glib-2.28.1/glib/gatomic.c	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/glib/gatomic.c	2011-02-25 15:51:45.000000000 +0100
-@@ -28,6 +28,7 @@
- #endif
- 
- #include "gatomic.h"
-+#include "gthread.h"
- #include "gthreadprivate.h"
- 
- /**
---- misc/glib-2.28.1/glib/gnulib/makefile.msc	2009-04-01 01:04:20.000000000 +0200
-+++ misc/build/glib-2.28.1/glib/gnulib/makefile.msc	2011-03-04 08:37:50.624265900 +0100
-@@ -1,7 +1,7 @@
- TOP = ..\..\..
- !INCLUDE ..\..\build\win32\make.msc
- 
--INCLUDES = -I ..\.. -I ..
-+INCLUDES = -I ..\.. -I .. $(SOLARINC)
- DEFINES = -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT
- 
- OBJECTS = \
---- misc/glib-2.28.1/glib/makefile.msc	2011-02-18 16:34:53.000000000 +0100
-+++ misc/build/glib-2.28.1/glib/makefile.msc	2011-03-07 11:41:13.874227300 +0100
-@@ -7,7 +7,7 @@
- 
- ################################################################
- 
--INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ..
-+INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. $(SOLARINC)
- DEFINES = \
- 	-DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" \
- 	-DG_ENABLE_DEBUG -DPCRE_STATIC -DG_DISABLE_DEPRECATED \
-@@ -17,13 +17,11 @@
- 
- all :				\
- 	..\config.h		\
--	..\glibconfig.h	\
-+	glibconfig.h	\
- 	gnulib\gnulib.lib	\
- 	pcre\pcre.lib		\
--	libglib-2.0-0.dll \
-+	gliblo.dll \
--	glib-2.28s.lib \
--	gspawn-win32-helper.exe	\
--	gspawn-win32-helper-console.exe	\
-+	glib-2.28s.lib
- 
- 
- gnulib\gnulib.lib :
-@@ -37,37 +35,40 @@
- 	cd ..
- 
- glib_OBJECTS =			\
--	garray.obj		\
--	gasyncqueue.obj		\
--	gatomic.obj	\
--	gbacktrace.obj		\
--	gbase64.obj	\
-+	garray.obj \
-+	gasyncqueue.obj \
-+	gatomic.obj \
-+	gbacktrace.obj \
-+	gbase64.obj \
-+	gbitlock.obj \
- 	gbookmarkfile.obj \
-+	gbuffer.obj \
- 	gcache.obj \
--	gchecksum.obj	\
--	gcompletion.obj	\
-+	gchecksum.obj \
- 	gconvert.obj \
-+	gcompletion.obj \
- 	gdataset.obj \
- 	gdate.obj \
-+	gdatetime.obj \
- 	gdir.obj \
- 	gerror.obj \
- 	gfileutils.obj \
- 	ghash.obj \
--	ghostutils.obj \
- 	ghook.obj \
-+	ghostutils.obj \
- 	giochannel.obj \
- 	giowin32.obj \
--	gpoll.obj \
- 	gkeyfile.obj \
- 	glist.obj \
- 	gmain.obj \
--	gmappedfile.obj	\
-+	gmappedfile.obj \
- 	gmarkup.obj \
- 	gmem.obj \
- 	gmessages.obj \
- 	gnode.obj \
- 	goption.obj \
- 	gpattern.obj \
-+	gpoll.obj \
- 	gprimes.obj \
- 	gprintf.obj \
- 	gqsort.obj \
-@@ -88,22 +89,29 @@
- 	gthread.obj \
- 	gthreadpool.obj \
- 	gtimer.obj \
-+	gtimezone.obj \
- 	gtree.obj \
- 	gunibreak.obj \
- 	gunicollate.obj \
- 	gunidecomp.obj \
- 	guniprop.obj \
- 	gurifuncs.obj \
--	gutf8.obj		\
--	gutils.obj		\
--	gwin32.obj		\
-+	gutf8.obj \
-+	gutils.obj \
-+	gvariant-core.obj \
-+	gvariant-parser.obj \
-+	gvariant-serialiser.obj \
-+	gvariant.obj \
-+	gvarianttype.obj \
-+	gvarianttypeinfo.obj \
-+	gwin32.obj \
- 	localcharset.obj
- 
--..\glibconfig.h: ..\glibconfig.h.win32
--	copy ..\glibconfig.h.win32 ..\glibconfig.h
-+glibconfig.h: glibconfig.h.win32
-+	cp glibconfig.h.win32 glibconfig.h
- 
- ..\config.h: ..\config.h.win32
--	copy ..\config.h.win32 ..\config.h
-+	cp ..\config.h.win32 ..\config.h
- 
- localcharset.obj : libcharset\localcharset.c
- 	$(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c
-@@ -115,7 +123,7 @@
- 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def
- 
- glib.res : glib.rc
--	rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc
-+	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo glib.res glib.rc
- 
- ################ glib
- 
-@@ -124,20 +132,14 @@
- glib-2.28s.lib : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
- 	lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
- 
--libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
-+gliblo.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res 
- 	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \
- 	gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \
- 	$(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
- 
--gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-0.dll
--	$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
--
--gspawn-win32-helper-console.exe : gspawn-win32-helper.c libglib-2.0-0.dll
--	$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:console user32.lib
--
- ################ other stuff
- 
- clean::
--	del ..\config.h
--	del ..\glibconfig.h
-+	rm ..\config.h
-+	rm glibconfig.h
- 
---- misc/glib-2.28.1/glib/pcre/makefile.msc	2010-06-20 06:35:47.000000000 +0200
-+++ misc/build/glib-2.28.1/glib/pcre/makefile.msc	2011-03-04 09:06:02.748049800 +0100
-@@ -3,7 +3,8 @@
- 
- INCLUDES = \
-         -I ..\.. \
--        -I ..
-+        -I .. \
-+		$(SOLARINC)
-         
- DEFINES = \
-         -DPCRE_STATIC \
-@@ -18,10 +19,24 @@
-         -DMAX_NAME_COUNT=10000 \
-         -DMAX_DUPLENGTH=30000 \
-         -DLINK_SIZE=2 \
--        -DEBCDIC=0 \
-         -DPOSIX_MALLOC_THRESHOLD=10
- 
- OBJECTS = \
-+	pcre_chartables.obj \
-+	pcre_compile.obj \
-+	pcre_config.obj \
-+	pcre_dfa_exec.obj \
-+	pcre_exec.obj \
-+	pcre_fullinfo.obj \
-+	pcre_get.obj \
-+	pcre_globals.obj \
-+	pcre_newline.obj \
-+	pcre_ord2utf8.obj \
-+	pcre_study.obj \
-+	pcre_tables.obj \
-+	pcre_try_flipped.obj \
-+	pcre_ucp_searchfuncs.obj \
-+	pcre_xclass.obj \
- 
- 
- all : pcre.lib
---- misc/glib-2.28.1/gmodule/makefile.msc	2011-02-18 16:34:58.000000000 +0100
-+++ misc/build/glib-2.28.1/gmodule/makefile.msc	2011-03-04 08:43:06.896355600 +0100
-@@ -7,12 +7,12 @@
- 
- ################################################################
- 
--INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
-+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
- DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\"
- 
- all : \
- 	gmoduleconf.h \
--	libgmodule-2.0-0.dll
-+	gmodulelo.dll
- 
- gmodule_OBJECTS = \
- 	gmodule.obj
-@@ -16,22 +16,22 @@
- 
- gmodule_OBJECTS = \
- 	gmodule.obj
--gmodule.def: gmodule.symbols
--	echo EXPORTS > gmodule.def
--	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
--		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
--		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
--
-+gmodule.def: gmodule.symbols
-+	echo EXPORTS > gmodule.def
-+	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
-+		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
-+		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
-+
- 
- gmoduleconf.h: gmoduleconf.h.win32
--	copy gmoduleconf.h.win32 gmoduleconf.h
-+	cp gmoduleconf.h.win32 gmoduleconf.h
- 
- gmodule.res : gmodule.rc
--	rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
-+	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc
- 
--libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
-+gmodulelo.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
- 	$(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \
- 	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
- 
- clean::
--	del gmoduleconf.h
-+	rm gmoduleconf.h
---- misc/glib-2.28.1/gobject/makefile.msc	2011-02-18 16:35:05.000000000 +0100
-+++ misc/build/glib-2.28.1/gobject/makefile.msc	2011-03-04 12:33:52.399273100 +0100
---- misc/glib-2.28.1/gobject/makefile.msc	2011-02-18 16:35:05.000000000 +0100
-+++ misc/build/glib-2.28.1/gobject/makefile.msc	2011-03-09 09:29:52.712284300 +0100
-@@ -7,23 +7,22 @@
- 
- ################################################################
- 
--INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
-+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
- DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \
- 		-DG_ENABLE_DEBUG
- #		-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS
- #		-DG_DISABLE_CAST_CHECKS
- 
- all :				\
- 	glib-genmarshal.exe     \
- 	gmarshal.h              \
--	gmarshal.c              \
- 	gmarshal.strings \
--	gobject-query.exe \
--	libgobject-2.0-0.dll	\
-+	gobjectlo.dll	\
- 	gobject-2.28s.lib \
--	testgobject.exe
- 
- gobject_OBJECTS =		\
-+	gatomicarray.obj \
-+	gbinding.obj \
- 	gboxed.obj		\
- 	gclosure.obj		\
- 	genums.obj		\
-@@ -47,21 +49,18 @@
- 		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def
- 
- gobject.res : gobject.rc
--	rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc
-+	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gobject.res gobject.rc
- 
- gmarshal.h : gmarshal.list glib-genmarshal.exe
- 	echo #ifndef __G_MARSHAL_H__ > xgen-gmh
- 	echo #define __G_MARSHAL_H__ >> xgen-gmh
- 	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --header >> xgen-gmh
- 	echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh
--	copy xgen-gmh gmarshal.h
--
--gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
--	glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
-+	cp xgen-gmh gmarshal.h
- 
--libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res
-+gobjectlo.dll : $(gobject_OBJECTS) gobject.def gobject.res
- 	$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \
--	..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@
-+	..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@
- 
- gobject-2.28s.lib : $(gobject_OBJECTS) 
- 	lib /out:$@ $(gobject_OBJECTS)
---- misc/glib-2.28.1/gthread/makefile.msc	2011-02-18 16:35:00.000000000 +0100
-+++ misc/build/glib-2.28.1/gthread/makefile.msc	2011-03-04 08:43:06.900355800 +0100
-@@ -7,10 +7,10 @@
- 
- ################################################################
- 
--INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
-+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC)
- DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
- all : \
--	libgthread-2.0-0.dll
-+	gthreadlo.dll
- 
- gthread_OBJECTS = \
- 	gthread-impl.obj
-@@ -19,8 +19,8 @@
- 	$(CC) -c $(CFLAGS) gthread-impl.c
- 
- gthread.res : gthread.rc
--	rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc
-+	rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc
- 
--libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res
-+gthreadlo.dll : $(gthread_OBJECTS) gthread.def gthread.res
- 	$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
- 	..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
---- misc/glib-2.28.1/makefile.msc	2009-04-01 01:04:20.000000000 +0200
-+++ misc/build/glib-2.28.1/makefile.msc	2011-03-04 09:11:06.663432800 +0100
-@@ -1,7 +1,7 @@
- ## Makefile for building the GLib dlls with Microsoft C
- ## Use: nmake -f makefile.msc
- 
--PARTS = glib gmodule gthread gobject gio tests
-+PARTS = "build\win32\dirent" glib gmodule gthread gobject gio tests 
- 
- all : \
- 	config.h \
-@@ -22,7 +22,7 @@
- 	@cd ..
- 
- config.h: config.h.win32
--	copy config.h.win32 config.h
-+	cp config.h.win32 config.h
- 
--glibconfig.h: glibconfig.h.win32
--	copy glibconfig.h.win32 glibconfig.h
-+glibconfig.h: glib/glibconfig.h.win32
-+	cp glib/glibconfig.h.win32 glib/glibconfig.h
---- misc/glib-2.28.1/tests/makefile.msc	2011-02-18 16:35:43.000000000 +0100
-+++ misc/build/glib-2.28.1/tests/makefile.msc	2011-03-04 08:33:02.079762100 +0100
-@@ -7,7 +7,7 @@
- 
- ################################################################
- 
--INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule
-+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule $(SOLARINC)
- DEFINES = -DHAVE_CONFIG_H -DENABLE_REGEX
- 
- NONAUTOMATIC_TESTS = \
-@@ -79,7 +79,7 @@
- 	libmoduletestplugin_a.dll \
- 	libmoduletestplugin_b.dll
- 
--all :	$(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
-+all :	
- 
- .c.exe :
- 	$(CC) $(CFLAGS) -c $<
---- misc/glib-2.28.1/glib/glibconfig.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/glib/glibconfig.h	Wed Aug 20 14:26:42 2008
-@@ -1 +1,285 @@
--dummy
-+/* glibconfig.h.win32.in. Originally merged from two versions of
-+ * glibconfig.h, generated by the GLib configure script, for gcc and
-+ * MSVC.
-+ */
-+
-+/* glibconfig.h
-+ *
-+ * This is a generated file.  Please modify 'glibconfig.h.win32.in'
-+ */
-+
-+#ifndef __G_LIBCONFIG_H__
-+#define __G_LIBCONFIG_H__
-+
-+#include <glib/gmacros.h>
-+
-+#include <limits.h>
-+#include <float.h>
-+
-+G_BEGIN_DECLS
-+
-+#define G_MINFLOAT	FLT_MIN
-+#define G_MAXFLOAT	FLT_MAX
-+#define G_MINDOUBLE	DBL_MIN
-+#define G_MAXDOUBLE	DBL_MAX
-+#define G_MINSHORT	SHRT_MIN
-+#define G_MAXSHORT	SHRT_MAX
-+#define G_MAXUSHORT	USHRT_MAX
-+#define G_MININT	INT_MIN
-+#define G_MAXINT	INT_MAX
-+#define G_MAXUINT	UINT_MAX
-+#define G_MINLONG	LONG_MIN
-+#define G_MAXLONG	LONG_MAX
-+#define G_MAXULONG	ULONG_MAX
-+
-+typedef signed char gint8;
-+typedef unsigned char guint8;
-+typedef signed short gint16;
-+typedef unsigned short guint16;
-+#define G_GINT16_MODIFIER "h"
-+#define G_GINT16_FORMAT "hi"
-+#define G_GUINT16_FORMAT "hu"
-+typedef signed int gint32;
-+typedef unsigned int guint32;
-+#define G_GINT32_MODIFIER ""
-+#define G_GINT32_FORMAT "i"
-+#define G_GUINT32_FORMAT "u"
-+#define G_HAVE_GINT64 1          /* deprecated, always true */
-+
-+#ifndef _MSC_VER
-+G_GNUC_EXTENSION typedef signed long long gint64;
-+G_GNUC_EXTENSION typedef unsigned long long guint64;
-+#else /* _MSC_VER */
-+typedef signed __int64 gint64;
-+typedef unsigned __int64 guint64;
-+#endif /* _MSC_VER */
-+
-+#ifndef _MSC_VER
-+#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-+#else /* _MSC_VER */
-+#define G_GINT64_CONSTANT(val)	(val##i64)
-+#endif /* _MSC_VER */
-+#ifndef _MSC_VER
-+#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-+#else /* _MSC_VER */
-+#define G_GUINT64_CONSTANT(val)	(val##Ui64)
-+#endif /* _MSC_VER */
-+#define G_GINT64_MODIFIER "I64"
-+#define G_GINT64_FORMAT "I64i"
-+#define G_GUINT64_FORMAT "I64u"
-+
-+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
-+
-+#define GLIB_SIZEOF_VOID_P 8
-+#define GLIB_SIZEOF_LONG   4
-+#define GLIB_SIZEOF_SIZE_T 8
-+
-+typedef signed long long gssize;
-+typedef unsigned long long gsize;
-+#define G_GSIZE_MODIFIER "I64"
-+#define G_GSSIZE_FORMAT "I64d"
-+#define G_GSIZE_FORMAT "I64u"
-+
-+#define G_MAXSIZE	G_MAXUINT64
-+#define G_MINSSIZE	G_MININT64
-+#define G_MAXSSIZE	G_MAXINT64
-+
-+#else
-+
-+#define GLIB_SIZEOF_VOID_P 4
-+#define GLIB_SIZEOF_LONG   4
-+#define GLIB_SIZEOF_SIZE_T 4
-+
-+typedef signed int gssize;
-+typedef unsigned int gsize;
-+#define G_GSIZE_MODIFIER ""
-+#define G_GSSIZE_FORMAT "i"
-+#define G_GSIZE_FORMAT "u"
-+
-+#define G_MAXSIZE	G_MAXUINT
-+#define G_MINSSIZE	G_MININT
-+#define G_MAXSSIZE	G_MAXINT
-+
-+#endif
-+
-+typedef gint64 goffset;
-+#define G_MINOFFSET	G_MININT64
-+#define G_MAXOFFSET	G_MAXINT64
-+
-+#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-+#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-+#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-+
-+
-+#ifndef _WIN64
-+
-+#define GPOINTER_TO_INT(p)	((gint)   (p))
-+#define GPOINTER_TO_UINT(p)	((guint)  (p))
-+
-+#define GINT_TO_POINTER(i)	((gpointer)  (i))
-+#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-+
-+typedef signed int gintptr;
-+typedef unsigned int guintptr;
-+
-+#define G_GINTPTR_MODIFIER      ""
-+#define G_GINTPTR_FORMAT        "i"
-+#define G_GUINTPTR_FORMAT       "u"
-+
-+#else
-+
-+#define GPOINTER_TO_INT(p)	((gint)  (gint64) (p))
-+#define GPOINTER_TO_UINT(p)	((guint) (guint64) (p))
-+
-+#define GINT_TO_POINTER(i)	((gpointer) (gint64) (i))
-+#define GUINT_TO_POINTER(u)	((gpointer) (guint64) (u))
-+
-+#ifndef _MSC_VER
-+typedef signed long long gintptr;
-+typedef unsigned long long guintptr;
-+#else
-+typedef signed __int64 gintptr;
-+typedef unsigned __int64 guintptr;
-+#endif
-+
-+#define G_GINTPTR_MODIFIER      "I64"
-+#define G_GINTPTR_FORMAT        "I64i"
-+#define G_GUINTPTR_FORMAT       "I64u"
-+
-+#endif
-+
-+#ifdef NeXT /* @#%@! NeXTStep */
-+# define g_ATEXIT(proc)	(!atexit (proc))
-+#else
-+# define g_ATEXIT(proc)	(atexit (proc))
-+#endif
-+
-+#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-+
-+#define GLIB_MAJOR_VERSION 2
-+#define GLIB_MINOR_VERSION 28
-+#define GLIB_MICRO_VERSION 1
-+
-+#define G_OS_WIN32
-+#define G_PLATFORM_WIN32
-+
-+
-+#ifndef _MSC_VER
-+#define G_VA_COPY	va_copy
-+#endif /* not _MSC_VER */
-+
-+#ifdef	__cplusplus
-+#define	G_HAVE_INLINE	1
-+#else	/* !__cplusplus */
-+#ifndef _MSC_VER
-+#define G_HAVE_INLINE 1
-+#endif /* _MSC_VER */
-+#define G_HAVE___INLINE 1
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define G_HAVE___INLINE__ 1
-+#endif /* !_MSC_VER and !__DMC__ */
-+#endif	/* !__cplusplus */
-+
-+#define G_CAN_INLINE	1
-+
-+#ifndef _MSC_VER
-+#define G_HAVE_ISO_VARARGS 1
-+
-+/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
-+ * is passed ISO vararg support is turned off, and there is no work
-+ * around to turn it on, so we unconditionally turn it off.
-+ */
-+#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-+#  undef G_HAVE_ISO_VARARGS
-+#endif
-+
-+#define G_HAVE_GNUC_VARARGS 1
-+#else /* _MSC_VER */
-+/* varargs macros available since msvc8 (vs2005) */
-+#  if _MSC_VER >= 1400
-+#    define G_HAVE_ISO_VARARGS 1
-+#   endif
-+#endif /* not _MSC_VER */
-+#define G_HAVE_GROWING_STACK 0
-+
-+#define G_GNUC_INTERNAL
-+
-+#define G_THREADS_ENABLED
-+#define G_THREADS_IMPL_WIN32
-+typedef struct _GMutex* GStaticMutex;
-+#define G_STATIC_MUTEX_INIT NULL
-+#define g_static_mutex_get_mutex(mutex) \
-+  (g_static_mutex_get_mutex_impl_shortcut (mutex))
-+/* This represents a system thread as used by the implementation. An
-+ * alien implementaion, as loaded by g_thread_init can only count on
-+ * "sizeof (gpointer)" bytes to store their info. We however need more
-+ * for some of our native implementations. */
-+typedef union _GSystemThread GSystemThread;
-+union _GSystemThread
-+{
-+#ifndef _WIN64
-+  char   data[4];
-+#else
-+  char   data[8];
-+#endif
-+  double dummy_double;
-+  void  *dummy_pointer;
-+  long   dummy_long;
-+};
-+
-+#define GINT16_TO_LE(val)	((gint16) (val))
-+#define GUINT16_TO_LE(val)	((guint16) (val))
-+#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-+#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-+#define GINT32_TO_LE(val)	((gint32) (val))
-+#define GUINT32_TO_LE(val)	((guint32) (val))
-+#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-+#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-+#define GINT64_TO_LE(val)	((gint64) (val))
-+#define GUINT64_TO_LE(val)	((guint64) (val))
-+#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-+#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
-+#define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
-+#define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
-+#define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
-+#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-+#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-+#define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
-+#define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
-+#define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-+#define GSIZE_TO_LE(val)	((gsize) GUINT32_TO_LE (val))
-+#define GSSIZE_TO_LE(val)	((gssize) GINT32_TO_LE (val))
-+#define GSIZE_TO_BE(val)	((gsize) GUINT32_TO_BE (val))
-+#define GSSIZE_TO_BE(val)	((gssize) GINT32_TO_BE (val))
-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
-+
-+#define GLIB_SYSDEF_POLLIN =1
-+#define GLIB_SYSDEF_POLLOUT =4
-+#define GLIB_SYSDEF_POLLPRI =2
-+#define GLIB_SYSDEF_POLLHUP =16
-+#define GLIB_SYSDEF_POLLERR =8
-+#define GLIB_SYSDEF_POLLNVAL =32
-+
-+#define G_MODULE_SUFFIX "dll"
-+
-+/* A GPid is an abstraction for a process "handle". It is *not* an
-+ * abstraction for a process identifier in general. GPid is used in
-+ * GLib only for descendant processes spawned with the g_spawn*
-+ * functions. On POSIX there is no "process handle" concept as such,
-+ * but on Windows a GPid is a handle to a process, a kind of pointer,
-+ * not a process identifier.
-+ */
-+typedef void * GPid;
-+
-+#define GLIB_SYSDEF_AF_UNIX 1
-+#define GLIB_SYSDEF_AF_INET 2
-+#define GLIB_SYSDEF_AF_INET6 23
-+
-+#define GLIB_SYSDEF_MSG_OOB       1
-+#define GLIB_SYSDEF_MSG_PEEK      2
-+#define GLIB_SYSDEF_MSG_DONTROUTE 4
-+
-+G_END_DECLS
-+
-+#endif /* GLIBCONFIG_H */
-+
---- misc/glib-2.28.1/gmodule/gmoduleconf.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/gmodule/gmoduleconf.h	Wed Aug 20 14:26:42 2008
-@@ -1 +1,45 @@
--dummy
-+/* GMODULE - GLIB wrapper code for dynamic module loading
-+ * Copyright (C) 1998 Tim Janik
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+#ifndef __G_MODULE_CONF_H__
-+#define __G_MODULE_CONF_H__
-+
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+
-+#define	G_MODULE_IMPL_NONE	0
-+#define	G_MODULE_IMPL_DL	1
-+#define	G_MODULE_IMPL_DLD	2
-+#define	G_MODULE_IMPL_WIN32	3
-+#define	G_MODULE_IMPL_OS2	4
-+#define	G_MODULE_IMPL_BEOS	5
-+#define	G_MODULE_IMPL_DYLD	6
-+
-+#define	G_MODULE_IMPL		G_MODULE_IMPL_WIN32
-+#undef	G_MODULE_HAVE_DLERROR
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+
-+#endif /* __G_MODULE_CONF_H__ */
-+
---- misc/glib-2.28.1/config.h	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/config.h	Wed Aug 20 14:26:42 2008
-@@ -1 +1,834 @@
--dummy
-+/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC.  */
-+/* config.h.  Generated by configure.  */
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if building universal (internal helper macro) */
-+/* #undef AC_APPLE_UNIVERSAL_BUILD */
-+
-+/* define if asm blocks can use numeric local labels */
-+/* #undef ASM_NUMERIC_LABELS */
-+
-+/* poll doesn't work on devices */
-+#define BROKEN_POLL 1
-+
-+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c' support on those systems.
-+   */
-+/* #undef CRAY_STACKSEG_END */
-+
-+/* Define to 1 if using `alloca.c'. */
-+/* #undef C_ALLOCA */
-+
-+/* Whether to disable memory pools */
-+/* #undef DISABLE_MEM_POOLS */
-+
-+/* Whether to enable GC friendliness by default */
-+/* #undef ENABLE_GC_FRIENDLY_DEFAULT */
-+
-+/* always defined to indicate that i18n is enabled */
-+#define ENABLE_NLS 1
-+
-+/* include GRegex */
-+#define ENABLE_REGEX /**/
-+
-+/* Define the gettext package to be used */
-+#define GETTEXT_PACKAGE "glib20"
-+
-+/* Define to the GLIB binary age */
-+#define GLIB_BINARY_AGE 2801
-+
-+/* Byte contents of gmutex */
-+/* #undef GLIB_BYTE_CONTENTS_GMUTEX */
-+
-+/* Define to the GLIB interface age */
-+#define GLIB_INTERFACE_AGE 1
-+
-+/* Define the location where the catalogs will be installed */
-+#define GLIB_LOCALE_DIR "NONE/share/locale"
-+
-+/* Define to the GLIB major version */
-+#define GLIB_MAJOR_VERSION 2
-+
-+/* Define to the GLIB micro version */
-+#define GLIB_MICRO_VERSION 1
-+
-+/* Define to the GLIB minor version */
-+#define GLIB_MINOR_VERSION 28
-+
-+/* The size of gmutex, as computed by sizeof. */
-+/* #undef GLIB_SIZEOF_GMUTEX */
-+
-+/* The size of system_thread, as computed by sizeof. */
-+#define GLIB_SIZEOF_SYSTEM_THREAD 4
-+
-+/* alpha atomic implementation */
-+/* #undef G_ATOMIC_ALPHA */
-+
-+/* arm atomic implementation */
-+/* #undef G_ATOMIC_ARM */
-+
-+/* cris atomic implementation */
-+/* #undef G_ATOMIC_CRIS */
-+
-+/* crisv32 atomic implementation */
-+/* #undef G_ATOMIC_CRISV32 */
-+
-+/* i486 atomic implementation */
-+#ifndef _MSC_VER
-+#define G_ATOMIC_I486 1
-+#endif /* _MSC_VER */
-+
-+/* ia64 atomic implementation */
-+/* #undef G_ATOMIC_IA64 */
-+
-+/* powerpc atomic implementation */
-+/* #undef G_ATOMIC_POWERPC */
-+
-+/* s390 atomic implementation */
-+/* #undef G_ATOMIC_S390 */
-+
-+/* sparcv9 atomic implementation */
-+/* #undef G_ATOMIC_SPARCV9 */
-+
-+/* x86_64 atomic implementation */
-+/* #undef G_ATOMIC_X86_64 */
-+
-+/* Have inline keyword */
-+#ifndef _MSC_VER
-+#define G_HAVE_INLINE 1
-+#else /* _MSC_VER */
-+/* #undef G_HAVE_INLINE */
-+#endif /* _MSC_VER */
-+
-+/* Have __inline keyword */
-+#define G_HAVE___INLINE 1
-+
-+/* Have __inline__ keyword */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define G_HAVE___INLINE__ 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef G_HAVE___INLINE__ */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Source file containing theread implementation */
-+#define G_THREAD_SOURCE "gthread-win32.c"
-+
-+/* A 'va_copy' style function */
-+#ifndef _MSC_VER
-+#define G_VA_COPY va_copy
-+#else /* _MSC_VER */
-+/* #undef G_VA_COPY */
-+#endif /* _MSC_VER */
-+
-+/* 'va_lists' cannot be copies as values */
-+/* #undef G_VA_COPY_AS_ARRAY */
-+
-+/* Define to 1 if you have `alloca', as a function or macro. */
-+#define HAVE_ALLOCA 1
-+
-+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+/* #undef HAVE_ALLOCA_H */
-+
-+/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-+/* #undef HAVE_ARPA_NAMESER_COMPAT_H */
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#define HAVE_ATEXIT 1
-+
-+/* Define to 1 if you have the <attr/xattr.h> header file. */
-+/* #undef HAVE_ATTR_XATTR_H */
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-+
-+/* Define if you have a version of the snprintf function with semantics as
-+   specified by the ISO C99 standard. */
-+/* #undef HAVE_C99_SNPRINTF */
-+
-+/* Define if you have a version of the vsnprintf function with semantics as
-+   specified by the ISO C99 standard. */
-+/* #undef HAVE_C99_VSNPRINTF */
-+
-+/* define to 1 if Carbon is available */
-+/* #undef HAVE_CARBON */
-+
-+/* Define to 1 if you have the `chown' function. */
-+/* #undef HAVE_CHOWN */
-+
-+/* Define to 1 if you have the `clock_gettime' function. */
-+/* #undef HAVE_CLOCK_GETTIME */
-+
-+/* Have nl_langinfo (CODESET) */
-+/* #undef HAVE_CODESET */
-+
-+/* Define to 1 if you have the <crt_externs.h> header file. */
-+/* #undef HAVE_CRT_EXTERNS_H */
-+
-+/* Define if dbus-1 is available */
-+/* #undef HAVE_DBUS1 */
-+
-+/* Define to 1 if you have the `dcgettext' function. */
-+#define HAVE_DCGETTEXT 1
-+
-+/* Define to 1 if you have the <dirent.h> header file. */
-+#ifndef _MSC_VER
-+#define HAVE_DIRENT_H 1
-+#else
-+/* #undef HAVE_DIRENT_H */
-+#endif
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+/* #undef HAVE_DLFCN_H */
-+
-+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-+/* #undef HAVE_DOPRNT */
-+
-+/* define for working do while(0) macros */
-+#define HAVE_DOWHILE_MACROS 1
-+
-+/* Define to 1 if you have the `endmntent' function. */
-+/* #undef HAVE_ENDMNTENT */
-+
-+/* Define to 1 if you have the `endservent' function. */
-+/* #undef HAVE_ENDSERVENT */
-+
-+/* Define if we have FAM */
-+/* #undef HAVE_FAM */
-+
-+/* Define to 1 if you have the <fam.h> header file. */
-+/* #undef HAVE_FAM_H */
-+
-+/* Define if we have FAMNoExists in fam */
-+/* #undef HAVE_FAM_NO_EXISTS */
-+
-+/* Define to 1 if you have the `fchmod' function. */
-+/* #undef HAVE_FCHMOD */
-+
-+/* Define to 1 if you have the `fchown' function. */
-+/* #undef HAVE_FCHOWN */
-+
-+/* Define to 1 if you have the `fdwalk' function. */
-+/* #undef HAVE_FDWALK */
-+
-+/* Define to 1 if you have the <float.h> header file. */
-+#define HAVE_FLOAT_H 1
-+
-+/* Define to 1 if you have the <fstab.h> header file. */
-+/* #undef HAVE_FSTAB_H */
-+
-+/* Define to 1 if you have the `fsync' function. */
-+/* #undef HAVE_FSYNC */
-+
-+/* we have the futex(2) system call */
-+/* #undef HAVE_FUTEX */
-+
-+/* Define to 1 if you have the `getcwd' function. */
-+#define HAVE_GETCWD 1
-+
-+/* Define to 1 if you have the `getc_unlocked' function. */
-+/* #undef HAVE_GETC_UNLOCKED */
-+
-+/* Define to 1 if you have the `getgrgid' function. */
-+/* #undef HAVE_GETGRGID */
-+
-+/* Define to 1 if you have the `getmntent_r' function. */
-+/* #undef HAVE_GETMNTENT_R */
-+
-+/* Define to 1 if you have the `getmntinfo' function. */
-+/* #undef HAVE_GETMNTINFO */
-+
-+/* Define to 1 if you have the `getprotobyname_r' function. */
-+/* #undef HAVE_GETPROTOBYNAME_R */
-+
-+/* Define to 1 if you have the `getpwuid' function. */
-+/* #undef HAVE_GETPWUID */
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#define HAVE_GETTEXT 1
-+
-+/* Define to 1 if you have the `gmtime_r' function. */
-+/* #undef HAVE_GMTIME_R */
-+
-+/* define to use system printf */
-+/* #undef HAVE_GOOD_PRINTF */
-+
-+/* Define to 1 if you have the <grp.h> header file. */
-+/* #undef HAVE_GRP_H */
-+
-+/* Define to 1 if you have the `hasmntopt' function. */
-+/* #undef HAVE_HASMNTOPT */
-+
-+/* Define to 1 if you have the `inotify_init1' function. */
-+/* #undef HAVE_INOTIFY_INIT1 */
-+
-+/* define to support printing 64-bit integers with format I64 */
-+#define HAVE_INT64_AND_I64 1
-+
-+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-+#ifndef _MSC_VER
-+#define HAVE_INTMAX_T 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTMAX_T */
-+#endif /* _MSC_VER */
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#ifndef _MSC_VER
-+#define HAVE_INTTYPES_H 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTTYPES_H */
-+#endif /* _MSC_VER */
-+
-+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-+   declares uintmax_t. */
-+#ifndef _MSC_VER
-+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
-+#endif /* _MSC_VER */
-+
-+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-+/* #undef HAVE_LANGINFO_CODESET */
-+
-+/* Define to 1 if you have the `lchmod' function. */
-+/* #undef HAVE_LCHMOD */
-+
-+/* Define to 1 if you have the `lchown' function. */
-+/* #undef HAVE_LCHOWN */
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+/* #undef HAVE_LC_MESSAGES */
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#define HAVE_LIMITS_H 1
-+
-+/* Define to 1 if you have the `link' function. */
-+/* #undef HAVE_LINK */
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#define HAVE_LOCALE_H 1
-+
-+/* Define to 1 if you have the `localtime_r' function. */
-+/* #undef HAVE_LOCALTIME_R */
-+
-+/* Define if you have the 'long double' type. */
-+#define HAVE_LONG_DOUBLE 1
-+
-+/* Define if you have the 'long long' type. */
-+#ifndef _MSC_VER
-+#define HAVE_LONG_LONG 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_LONG_LONG */
-+#endif /* _MSC_VER */
-+
-+/* define if system printf can print long long */
-+#define HAVE_LONG_LONG_FORMAT 1
-+
-+/* Define to 1 if you have the `lstat' function. */
-+/* #undef HAVE_LSTAT */
-+
-+/* Define to 1 if you have the <malloc.h> header file. */
-+#define HAVE_MALLOC_H 1
-+
-+/* Define to 1 if you have the `memalign' function. */
-+/* #undef HAVE_MEMALIGN */
-+
-+/* Define to 1 if you have the `memmem' function. */
-+/* #undef HAVE_MEMMEM */
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#define HAVE_MEMMOVE 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the `mmap' function. */
-+/* #undef HAVE_MMAP */
-+
-+/* Define to 1 if you have the <mntent.h> header file. */
-+/* #undef HAVE_MNTENT_H */
-+
-+/* Have a monotonic clock */
-+/* #undef HAVE_MONOTONIC_CLOCK */
-+
-+/* Define to 1 if you have the `nanosleep' function. */
-+/* #undef HAVE_NANOSLEEP */
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+/* #undef HAVE_NETDB_H */
-+
-+/* Have non-POSIX function getgrgid_r */
-+/* #undef HAVE_NONPOSIX_GETGRGID_R */
-+
-+/* Have non-POSIX function getpwuid_r */
-+/* #undef HAVE_NONPOSIX_GETPWUID_R */
-+
-+/* Define to 1 if you have the `nsleep' function. */
-+/* #undef HAVE_NSLEEP */
-+
-+/* Define to 1 if you have the `on_exit' function. */
-+/* #undef HAVE_ON_EXIT */
-+
-+/* Define to 1 if you have the `pipe2' function. */
-+/* #undef HAVE_PIPE2 */
-+
-+/* Define to 1 if you have the `poll' function. */
-+/* #undef HAVE_POLL */
-+
-+/* Have POSIX function getgrgid_r */
-+/* #undef HAVE_POSIX_GETGRGID_R */
-+
-+/* Have POSIX function getpwuid_r */
-+/* #undef HAVE_POSIX_GETPWUID_R */
-+
-+/* Define to 1 if you have the `posix_memalign' function. */
-+/* #undef HAVE_POSIX_MEMALIGN */
-+
-+/* Have function pthread_attr_setstacksize */
-+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-+
-+/* Define to 1 if the system has the type `ptrdiff_t'. */
-+#define HAVE_PTRDIFF_T 1
-+
-+/* Define to 1 if you have the <pwd.h> header file. */
-+/* #undef HAVE_PWD_H */
-+
-+/* Define to 1 if you have the `readlink' function. */
-+/* #undef HAVE_READLINK */
-+
-+/* Define to 1 if you have the <sched.h> header file. */
-+/* #undef HAVE_SCHED_H */
-+
-+/* Define to 1 if libselinux is available */
-+/* #undef HAVE_SELINUX */
-+
-+/* Define to 1 if you have the <selinux/selinux.h> header file. */
-+/* #undef HAVE_SELINUX_SELINUX_H */
-+
-+/* Define to 1 if you have the `setenv' function. */
-+/* #undef HAVE_SETENV */
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#define HAVE_SETLOCALE 1
-+
-+/* Define to 1 if you have the `setmntent' function. */
-+/* #undef HAVE_SETMNTENT */
-+
-+/* Define to 1 if you have the `setresuid' function. */
-+/* #undef HAVE_SETRESUID */
-+
-+/* Define to 1 if you have the `setreuid' function. */
-+/* #undef HAVE_SETREUID */
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#ifndef _MSC_VER
-+#define HAVE_SNPRINTF 1
-+#ifdef __DMC__
-+#define snprintf _snprintf
-+#endif
-+#else /* _MSC_VER */
-+/* #undef HAVE_SNPRINTF */
-+#endif /* _MSC_VER */
-+
-+/* Define to 1 if you have the `splice' function. */
-+/* #undef HAVE_SPLICE */
-+
-+/* Define to 1 if you have the `statfs' function. */
-+/* #undef HAVE_STATFS */
-+
-+/* Define to 1 if you have the `statvfs' function. */
-+/* #undef HAVE_STATVFS */
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#define HAVE_STDDEF_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#ifndef _MSC_VER
-+#define HAVE_STDINT_H 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_STDINT_H */
-+#endif /* _MSC_VER */
-+
-+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-+   uintmax_t. */
-+#ifndef _MSC_VER
-+#define HAVE_STDINT_H_WITH_UINTMAX 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_STDINT_H_WITH_UINTMAX */
-+#endif /* _MSC_VER */
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+/* #undef HAVE_STPCPY */
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define HAVE_STRCASECMP 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef HAVE_STRCASECMP */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Define to 1 if you have the `strerror' function. */
-+#define HAVE_STRERROR 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define HAVE_STRINGS_H 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef HAVE_STRINGS_H */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Have functions strlcpy and strlcat */
-+/* #undef HAVE_STRLCPY */
-+
-+/* Define to 1 if you have the `strncasecmp' function. */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define HAVE_STRNCASECMP 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef HAVE_STRNCASECMP */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Define to 1 if you have the `strndup' function. */
-+/* #undef HAVE_STRNDUP */
-+
-+/* Define to 1 if you have the `strsignal' function. */
-+/* #undef HAVE_STRSIGNAL */
-+
-+/* Define to 1 if `f_bavail' is member of `struct statfs'. */
-+/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */
-+
-+/* Define to 1 if `f_fstypename' is member of `struct statfs'. */
-+/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-+
-+/* Define to 1 if `f_basetype' is member of `struct statvfs'. */
-+/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-+
-+/* Define to 1 if `st_atimensec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */
-+
-+/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */
-+
-+/* Define to 1 if `st_blksize' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */
-+
-+/* Define to 1 if `st_blocks' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */
-+
-+/* Define to 1 if `st_ctimensec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */
-+
-+/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */
-+
-+/* Define to 1 if `st_mtimensec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
-+
-+/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */
-+/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
-+
-+/* Define to 1 if you have the `symlink' function. */
-+/* #undef HAVE_SYMLINK */
-+
-+/* Define to 1 if you have the <sys/inotify.h> header file. */
-+/* #undef HAVE_SYS_INOTIFY_H */
-+
-+/* Define to 1 if you have the <sys/mntctl.h> header file. */
-+/* #undef HAVE_SYS_MNTCTL_H */
-+
-+/* Define to 1 if you have the <sys/mnttab.h> header file. */
-+/* #undef HAVE_SYS_MNTTAB_H */
-+
-+/* Define to 1 if you have the <sys/mount.h> header file. */
-+/* #undef HAVE_SYS_MOUNT_H */
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define HAVE_SYS_PARAM_H 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef HAVE_SYS_PARAM_H */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Define to 1 if you have the <sys/poll.h> header file. */
-+/* #undef HAVE_SYS_POLL_H */
-+
-+/* Define to 1 if you have the <sys/prctl.h> header file. */
-+/* #undef HAVE_SYS_PRCTL_H */
-+
-+/* Define to 1 if you have the <sys/resource.h> header file. */
-+/* #undef HAVE_SYS_RESOURCE_H */
-+
-+/* found fd_set in sys/select.h */
-+/* #undef HAVE_SYS_SELECT_H */
-+
-+/* Define to 1 if you have the <sys/statfs.h> header file. */
-+/* #undef HAVE_SYS_STATFS_H */
-+
-+/* Define to 1 if you have the <sys/statvfs.h> header file. */
-+/* #undef HAVE_SYS_STATVFS_H */
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/sysctl.h> header file. */
-+/* #undef HAVE_SYS_SYSCTL_H */
-+
-+/* Define to 1 if you have the <sys/times.h> header file. */
-+/* #undef HAVE_SYS_TIMES_H */
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#ifndef _MSC_VER
-+#define HAVE_SYS_TIME_H 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_SYS_TIME_H */
-+#endif /* _MSC_VER */
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define to 1 if you have the <sys/uio.h> header file. */
-+/* #undef HAVE_SYS_UIO_H */
-+
-+/* Define to 1 if you have the <sys/vfstab.h> header file. */
-+/* #undef HAVE_SYS_VFSTAB_H */
-+
-+/* Define to 1 if you have the <sys/vfs.h> header file. */
-+/* #undef HAVE_SYS_VFS_H */
-+
-+/* Define to 1 if you have the <sys/vmount.h> header file. */
-+/* #undef HAVE_SYS_VMOUNT_H */
-+
-+/* Define to 1 if you have the <sys/wait.h> header file. */
-+/* #undef HAVE_SYS_WAIT_H */
-+
-+/* Define to 1 if you have the <sys/xattr.h> header file. */
-+/* #undef HAVE_SYS_XATTR_H */
-+
-+/* Define to 1 if you have the `timegm' function. */
-+/* #undef HAVE_TIMEGM */
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#ifndef _MSC_VER
-+#define HAVE_UNISTD_H 1
-+#else /* _MSC_VER */
-+/* #undef HAVE_UNISTD_H */
-+#endif /* _MSC_VER */
-+
-+/* Define if your printf function family supports positional parameters as
-+   specified by Unix98. */
-+/* #undef HAVE_UNIX98_PRINTF */
-+
-+/* Define to 1 if you have the `unsetenv' function. */
-+/* #undef HAVE_UNSETENV */
-+
-+/* Define to 1 if you have the `utimes' function. */
-+/* #undef HAVE_UTIMES */
-+
-+/* Define to 1 if you have the `valloc' function. */
-+/* #undef HAVE_VALLOC */
-+
-+/* Define to 1 if you have the <values.h> header file. */
-+#if !defined(_MSC_VER) && !defined(__DMC__)
-+#define HAVE_VALUES_H 1
-+#else /* _MSC_VER or __DMC__ */
-+/* #undef HAVE_VALUES_H */
-+#endif /* _MSC_VER or __DMC__ */
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#define HAVE_VASPRINTF 1
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#define HAVE_VPRINTF 1
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#ifndef _MSC_VER
-+#define HAVE_VSNPRINTF 1
-+#ifdef __DMC__
-+#define vsnprintf _vsnprintf
-+#endif
-+#else /* _MSC_VER */
-+/* #undef HAVE_VSNPRINTF */
-+#endif /* _MSC_VER */
-+
-+/* Define if you have the 'wchar_t' type. */
-+#define HAVE_WCHAR_T 1
-+
-+/* Define to 1 if you have the `wcslen' function. */
-+#define HAVE_WCSLEN 1
-+
-+/* Define if you have the 'wint_t' type. */
-+#define HAVE_WINT_T 1
-+
-+/* Have a working bcopy */
-+/* #undef HAVE_WORKING_BCOPY */
-+
-+/* Define to 1 if you have the <wspiapi.h> header file. */
-+#ifndef _MSC_VER
-+/* #undef HAVE_WSPIAPI_H */
-+#else
-+#define HAVE_WSPIAPI_H 1
-+#endif
-+
-+/* Define to 1 if xattr is available */
-+/* #undef HAVE_XATTR */
-+
-+/* Define to 1 if xattr API uses XATTR_NOFOLLOW */
-+/* #undef HAVE_XATTR_NOFOLLOW */
-+
-+/* Define to 1 if you have the `_NSGetEnviron' function. */
-+/* #undef HAVE__NSGETENVIRON */
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#define LT_OBJDIR ".libs/"
-+
-+/* Do we cache iconv descriptors */
-+#define NEED_ICONV_CACHE 1
-+
-+/* didn't find fd_set */
-+#define NO_FD_SET 1
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+/* #undef NO_MINUS_C_MINUS_O */
-+
-+/* global 'sys_errlist' not found */
-+#define NO_SYS_ERRLIST 1
-+
-+/* global 'sys_siglist' not found */
-+#define NO_SYS_SIGLIST 1
-+
-+/* global 'sys_siglist' not declared */
-+#define NO_SYS_SIGLIST_DECL 1
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib"
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "glib"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "glib 2.28.1"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "glib"
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "2.28.1"
-+
-+/* Maximum POSIX RT priority */
-+/* #undef POSIX_MAX_PRIORITY */
-+
-+/* define if posix_memalign() can allocate any size */
-+/* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
-+
-+/* Minimum POSIX RT priority */
-+/* #undef POSIX_MIN_PRIORITY */
-+
-+/* The POSIX RT yield function */
-+/* #undef POSIX_YIELD_FUNC */
-+
-+/* whether realloc (NULL,) works */
-+#define REALLOC_0_WORKS 1
-+
-+/* Define if you have correct malloc prototypes */
-+#ifndef _MSC_VER
-+#define SANE_MALLOC_PROTOS 1
-+#else /* _MSC_VER */
-+/* #undef SANE_MALLOC_PROTOS */
-+#endif /* _MSC_VER */
-+
-+/* The size of `char', as computed by sizeof. */
-+#define SIZEOF_CHAR 1
-+
-+/* The size of `int', as computed by sizeof. */
-+#define SIZEOF_INT 4
-+
-+/* The size of `long', as computed by sizeof. */
-+#define SIZEOF_LONG 4
-+
-+/* The size of `long long', as computed by sizeof. */
-+#ifndef _MSC_VER
-+#define SIZEOF_LONG_LONG 8
-+#else /* _MSC_VER */
-+#define SIZEOF_LONG_LONG 0
-+#endif /* _MSC_VER */
-+
-+/* The size of `short', as computed by sizeof. */
-+#define SIZEOF_SHORT 2
-+
-+/* The size of `size_t', as computed by sizeof. */
-+#define SIZEOF_SIZE_T 4
-+
-+/* The size of `void *', as computed by sizeof. */
-+#define SIZEOF_VOID_P 4
-+
-+/* The size of `__int64', as computed by sizeof. */
-+#define SIZEOF___INT64 8
-+
-+/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at runtime.
-+	STACK_DIRECTION > 0 => grows toward higher addresses
-+	STACK_DIRECTION < 0 => grows toward lower addresses
-+	STACK_DIRECTION = 0 => direction of growth unknown */
-+/* #undef STACK_DIRECTION */
-+
-+/* Number of arguments to statfs() */
-+/* #undef STATFS_ARGS */
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Using GNU libiconv */
-+/* #undef USE_LIBICONV_GNU */
-+
-+/* Using a native implementation of iconv in a separate library */
-+#define USE_LIBICONV_NATIVE 1
-+
-+/* using the system-supplied PCRE library */
-+/* #undef USE_SYSTEM_PCRE */
-+
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+/* #  undef WORDS_BIGENDIAN */
-+# endif
-+#endif
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+/* #undef _FILE_OFFSET_BITS */
-+
-+/* Define for large files, on AIX-style hosts. */
-+/* #undef _LARGE_FILES */
-+
-+/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-+/* #undef _XOPEN_SOURCE */
-+
-+/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-+/* #undef _XOPEN_SOURCE_EXTENDED */
-+
-+/* Needed to get declarations for msg_control and msg_controllen on Solaris */
-+/* #undef __EXTENSIONS__ */
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */
-+/* #undef intmax_t */
-+
-+/* Define to empty if the C compiler doesn't support this keyword. */
-+/* #undef signed */
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
---- misc/glib-2.28.1/gio/gvdb/makefile.msc	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/gio/gvdb/makefile.msc	Wed Aug 20 14:26:42 2008
-@@ -1 +1,24 @@
--dummy
-+TOP = ..\..\..
-+
-+!INCLUDE ..\..\build\win32\make.msc
-+
-+INCLUDES = \
-+	-FImsvc_recommended_pragmas.h \
-+	-I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \
-+	$(INTL_CFLAGS) \
-+	$(SOLARINC)
-+
-+DEFINES = \
-+	-DG_LOG_DOMAIN=\"GLib-GIO\" \
-+	-DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
-+	-DGIO_COMPILATION
-+
-+OBJECTS = \
-+	gvdb-reader.obj \
-+	gvdb-builder.obj 
-+
-+all : giogvdb.lib
-+
-+giogvdb.lib : $(OBJECTS)
-+	lib -out:giogvdb.lib $(OBJECTS)
-+
---- misc/glib-2.28.1/gio/win32/makefile.msc	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/gio/win32/makefile.msc	Wed Aug 20 14:26:42 2008
-@@ -1 +1,27 @@
--dummy
-+TOP = ..\..\..
-+
-+!INCLUDE ..\..\build\win32\make.msc
-+
-+INCLUDES = \
-+	-FImsvc_recommended_pragmas.h \
-+	-I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \
-+	$(INTL_CFLAGS) \
-+	$(SOLARINC)
-+
-+DEFINES = \
-+	-DG_LOG_DOMAIN=\"GLib-GIO\" \
-+	-DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \
-+	-DGIO_COMPILATION
-+
-+OBJECTS = \
-+	gwin32directorymonitor.obj \
-+	gwinhttpfile.obj \
-+	gwinhttpfileinputstream.obj \
-+	gwinhttpfileoutputstream.obj \
-+	gwinhttpvfs.obj \
-+
-+all : giowin32.lib
-+
-+giowin32.lib : $(OBJECTS)
-+	lib -out:giowin32.lib $(OBJECTS)
-+
---- misc/glib-2.28.1/gobject/gmarshal.c	Wed Aug 20 14:33:55 2008
-+++ misc/build/glib-2.28.1/gobject/gmarshal.c	Wed Aug 20 14:26:42 2008
-@@ -1,4 +1,13 @@
-+#include "config.h"
- 
-+#include "gsourceclosure.h"
-+#include "gboxed.h"
-+#include "genums.h"
-+#include "gmarshal.h"
-+#include "gvalue.h"
-+#include "gvaluetypes.h"
-+#include "gparam.h"
-+#include "gobject.h"
- 
- #ifdef G_ENABLE_DEBUG
- #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
diff --git a/glib/glib-2.28.1.noise.patch b/glib/glib-2.28.1.noise.patch
deleted file mode 100644
index f42b08a97a64..000000000000
--- a/glib/glib-2.28.1.noise.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/glib-2.28.1/gio/tests/Makefile.in	2011-02-18 16:22:00.000000000 +0100
-+++ misc/build/glib-2.28.1/gio/tests/Makefile.in	2011-06-10 16:37:05.000000000 +0200
-@@ -1020,7 +1020,9 @@
- proxy_LDADD = $(progs_ldadd) \
- 	$(top_builddir)/gthread/libgthread-2.0.la
- 
-+ifneq ($(MSGFMT),)
- MISC_STUFF = test.mo
-+endif
- DISTCLEANFILES = \
- 	applications/mimeinfo.cache	\
- 	org.gtk.test.enums.xml		\
diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch
deleted file mode 100644
index 49a6faa9c2a5..000000000000
--- a/glib/glib-2.28.1.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- misc/glib-2.28.1/gio/gzlibcompressor.c	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/gio/gzlibcompressor.c	2011-02-25 15:59:17.000000000 +0100
-@@ -73,7 +73,7 @@
- g_zlib_compressor_set_gzheader (GZlibCompressor *compressor)
- {
-   /* On win32, these functions were not exported before 1.2.4 */
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   const gchar *filename;
- 
-   if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP ||
---- misc/glib-2.28.1/gio/gzlibdecompressor.c	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c	2011-02-25 16:00:43.000000000 +0100
-@@ -76,7 +76,7 @@
- g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor)
- {
-   /* On win32, these functions were not exported before 1.2.4 */
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP)
-     return;
- 
-@@ -376,7 +376,7 @@
-   *bytes_read = inbuf_size - decompressor->zstream.avail_in;
-   *bytes_written = outbuf_size - decompressor->zstream.avail_out;
- 
--#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240
-+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240
-   if (decompressor->header_data != NULL &&
-       decompressor->header_data->gzheader.done == 1)
-     {
---- misc/glib-2.28.1/glib/gatomic.c	2011-02-11 16:23:12.000000000 +0100
-+++ misc/build/glib-2.28.1/glib/gatomic.c	2011-02-25 15:51:45.000000000 +0100
-@@ -28,6 +28,7 @@
- #endif
- 
- #include "gatomic.h"
-+#include "gthread.h"
- #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
-
---- misc/glib-2.28.1/configure
-+++ misc/build/glib-2.28.1/configure
-@@ -7097,6 +7097,7 @@
- fi
- 
- 
-+if false; then
- # Need suitable python path for greport
- 
- 
-@@ -7325,6 +7326,7 @@
- 
- 
- 
-+fi
- 
- 
- 
-@@ -7988,6 +7988,7 @@
- CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS'
- 
- 
-+ if false; then
-    for ac_header in locale.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-@@ -8701,6 +8701,8 @@
- 
- LIBS="$INTLLIBS $LIBS"
- 
-+fi
-+
- GETTEXT_PACKAGE=glib20
- 
- 
---- misc/glib-2.28.1/Makefile.in
-+++ misc/build/glib-2.28.1/Makefile.in
-@@ -422,7 +422,7 @@
- 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
- TEST_PROGS = 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests
- DIST_SUBDIRS = $(SUBDIRS) build
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
---- misc/glib-2.28.1/glib/gi18n.h
-+++ misc/build/glib-2.28.1/glib/gi18n.h
-@@ -20,15 +20,10 @@
- #ifndef __G_I18N_H__
- #define __G_I18N_H__
- 
--#include <glib.h>
--
--#include <libintl.h>
--#include <string.h>
--
--#define  _(String) gettext (String)
--#define Q_(String) g_dpgettext (NULL, String, 0)
--#define N_(String) (String)
--#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
-+#define _(String) (String)
-+#define Q_(String) (String)
-+#define N_(String) (String)
-+#define C_(Context,String) (String)
- #define NC_(Context, String) (String)
- 
- #endif  /* __G_I18N_H__ */
---- misc/glib-2.28.1/gio/tests/gsettings.c
-+++ misc/build/glib-2.28.1/gio/tests/gsettings.c
-@@ -1,7 +1,9 @@
-+#include "config.h"
-+
- #include <stdlib.h>
- #include <locale.h>
--#include <libintl.h>
- #include <gio/gio.h>
-+#include "glibintl.h"
- #include <gstdio.h>
- #define G_SETTINGS_ENABLE_BACKEND
- #include <gio/gsettingsbackend.h>
---- misc/glib-2.28.1/gio/tests/gschema-compile.c
-+++ misc/build/glib-2.28.1/gio/tests/gschema-compile.c
-@@ -1,8 +1,10 @@
-+#include "config.h"
-+
- #include <stdlib.h>
- #include <unistd.h>
- #include <locale.h>
--#include <libintl.h>
- #include <gio/gio.h>
-+#include "glibintl.h"
- #include <gstdio.h>
- 
- typedef struct {
diff --git a/glib/makefile.mk b/glib/makefile.mk
deleted file mode 100644
index eb9a72a3307c..000000000000
--- a/glib/makefile.mk
+++ /dev/null
@@ -1,390 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=glib
-TARGET=so_glib
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_GLIB)" == "YES"
-all:
-	@echo "An already available installation of glib should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-GLIBVERSION=2.28.1
-
-TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION)
-TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
-
-
-.IF "$(OS)"!="WNT"
-PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch
-
-.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
-
-.IF "$(OS)"=="MACOSX" && "$(CROSS_COMPILING)"=="YES"
-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=yes
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
-    --prefix=/@.__________________________________________________$(EXTRPATH)
-.ELSE
-CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
-.END
-
-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) $(FRAMEWORK)"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
- 
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
-
-.IF "$(VERBOSE)"!=""
-VFLAG=V=1
-.ENDIF
-
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS)
-
-.IF "$(OS)"!="IOS"
-
-.IF "$(OS)" == "MACOSX"
-my_ext = .0$(DLLPOST)
-.ELSE
-my_ext = $(DLLPOST).0
-.END
-
-OUT2LIB+=gio/.libs/libgio-2.0$(my_ext)
-OUT2LIB+=glib/.libs/libglib-2.0$(my_ext)
-OUT2LIB+=gmodule/.libs/libgmodule-2.0$(my_ext)
-OUT2LIB+=gobject/.libs/libgobject-2.0$(my_ext)
-OUT2LIB+=gthread/.libs/libgthread-2.0$(my_ext)
-
-OUT2BIN_NONE+=gobject/glib-mkenums
-OUT2BIN_NONE+=gobject/.libs/glib-genmarshal
-OUT2BIN_NONE+=gio/.libs/glib-compile-schemas
-
-.ELSE
-
-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
-
-.ELSE
-
-CONVERTFILES=gobject/gmarshal.c
-
-PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch
-
-CONFIGURE_ACTION=
-
-ADDITIONAL_FILES= config.h \
-    gio/gvdb/makefile.msc \
-    gio/win32/makefile.msc \
-    glib/glibconfig.h \
-    gmodule/gmoduleconf.h \
-    gobject/glib-mkenums
-
-BUILD_ACTION=unset debug; nmake -f makefile.msc
-
-OUT2BIN+=gio$/giolo.dll
-OUT2BIN+=glib$/gliblo.dll
-OUT2BIN+=gmodule$/gmodulelo.dll
-OUT2BIN+=gobject$/gobjectlo.dll
-OUT2BIN+=gthread$/gthreadlo.dll
-OUT2BIN+=gobject$/glib-mkenums
-OUT2BIN+=gobject$/glib-genmarshal.exe
-
-OUT2LIB+=build/win32/dirent/dirent.lib
-OUT2LIB+=gio/gio-2.0.lib
-OUT2LIB+=gio/gvdb/giogvdb.lib
-OUT2LIB+=gio/win32/giowin32.lib
-OUT2LIB+=glib/glib-2.0.lib
-OUT2LIB+=glib/glib-2.28s.lib
-OUT2LIB+=glib/gnulib/gnulib.lib
-OUT2LIB+=glib/pcre/pcre.lib
-OUT2LIB+=gmodule/gmodule-2.0.lib
-OUT2LIB+=gobject/glib-genmarshal.lib
-OUT2LIB+=gobject/gobject-2.0.lib
-OUT2LIB+=gthread/gthread-2.0.lib
-
-.IF "$(OS)"=="WNT"
-OUT2INC+=build$/win32$/dirent/dirent.h
-.ENDIF
-OUT2INC+=build$/win32$/make.msc
-OUT2INC+=build$/win32$/module.defs
-
-.ENDIF
-
-OUT2INC+=glib/glib.h
-OUT2INC+=glib/glib-object.h
-OUT2INC+=glib/glibconfig.h
-OUT2INC+=gmodule/gmodule.h
-
-OUT2INC+=gio/gdesktopappinfo.h
-OUT2INC+=gio/gunixcredentialsmessage.h
-OUT2INC+=gio/gunixinputstream.h
-OUT2INC+=gio/gunixsocketaddress.h
-OUT2INC+=gio/gfiledescriptorbased.h
-OUT2INC+=gio/gunixfdlist.h
-OUT2INC+=gio/gunixmounts.h
-OUT2INC+=gio/gunixconnection.h
-OUT2INC+=gio/gunixfdmessage.h
-OUT2INC+=gio/gunixoutputstream.h
-
-
-OUT2INC+=gio/gaction.h
-OUT2INC+=gio/gfileicon.h
-OUT2INC+=gio/gproxyaddressenumerator.h
-OUT2INC+=gio/gactiongroup.h
-OUT2INC+=gio/gfileinfo.h
-OUT2INC+=gio/gproxyresolver.h
-OUT2INC+=gio/gappinfo.h
-OUT2INC+=gio/gfileinputstream.h
-OUT2INC+=gio/gresolver.h
-OUT2INC+=gio/gapplication.h
-OUT2INC+=gio/gfileiostream.h
-OUT2INC+=gio/gseekable.h
-OUT2INC+=gio/gapplicationcommandline.h
-OUT2INC+=gio/gfilemonitor.h
-OUT2INC+=gio/gsettings.h
-OUT2INC+=gio/gasyncinitable.h
-OUT2INC+=gio/gfilenamecompleter.h
-OUT2INC+=gio/gsettingsbackend.h
-OUT2INC+=gio/gasyncresult.h
-OUT2INC+=gio/gfileoutputstream.h
-OUT2INC+=gio/gsimpleaction.h
-OUT2INC+=gio/gbufferedinputstream.h
-OUT2INC+=gio/gfilterinputstream.h
-OUT2INC+=gio/gsimpleactiongroup.h
-OUT2INC+=gio/gbufferedoutputstream.h
-OUT2INC+=gio/gfilteroutputstream.h
-OUT2INC+=gio/gsimpleasyncresult.h
-OUT2INC+=gio/gcancellable.h
-OUT2INC+=gio/gicon.h
-OUT2INC+=gio/gsimplepermission.h
-OUT2INC+=gio/gcharsetconverter.h
-OUT2INC+=gio/ginetaddress.h
-OUT2INC+=gio/gsocket.h
-OUT2INC+=gio/gcontenttype.h
-OUT2INC+=gio/ginetsocketaddress.h
-OUT2INC+=gio/gsocketaddress.h
-OUT2INC+=gio/gconverter.h
-OUT2INC+=gio/ginitable.h
-OUT2INC+=gio/gsocketaddressenumerator.h
-OUT2INC+=gio/gconverterinputstream.h
-OUT2INC+=gio/ginputstream.h
-OUT2INC+=gio/gsocketclient.h
-OUT2INC+=gio/gconverteroutputstream.h
-OUT2INC+=gio/gio.h
-OUT2INC+=gio/gsocketconnectable.h
-OUT2INC+=gio/gcredentials.h
-OUT2INC+=gio/gioenums.h
-OUT2INC+=gio/gsocketconnection.h
-OUT2INC+=gio/gdatainputstream.h
-OUT2INC+=gio/gioenumtypes.h
-OUT2INC+=gio/gsocketcontrolmessage.h
-OUT2INC+=gio/gdataoutputstream.h
-OUT2INC+=gio/gioerror.h
-OUT2INC+=gio/gsocketlistener.h
-OUT2INC+=gio/gdbusaddress.h
-OUT2INC+=gio/giomodule.h
-OUT2INC+=gio/gsocketservice.h
-OUT2INC+=gio/gdbusauthobserver.h
-OUT2INC+=gio/gioscheduler.h
-OUT2INC+=gio/gsrvtarget.h
-OUT2INC+=gio/gdbusconnection.h
-OUT2INC+=gio/giostream.h
-OUT2INC+=gio/gtcpconnection.h
-OUT2INC+=gio/gdbuserror.h
-OUT2INC+=gio/giotypes.h
-OUT2INC+=gio/gtcpwrapperconnection.h
-OUT2INC+=gio/gdbusintrospection.h
-OUT2INC+=gio/gloadableicon.h
-OUT2INC+=gio/gthemedicon.h
-OUT2INC+=gio/gdbusmessage.h
-OUT2INC+=gio/gmemoryinputstream.h
-OUT2INC+=gio/gthreadedsocketservice.h
-OUT2INC+=gio/gdbusmethodinvocation.h
-OUT2INC+=gio/gmemoryoutputstream.h
-OUT2INC+=gio/gtlsbackend.h
-OUT2INC+=gio/gdbusnameowning.h
-OUT2INC+=gio/gmount.h
-OUT2INC+=gio/gtlscertificate.h
-OUT2INC+=gio/gdbusnamewatching.h
-OUT2INC+=gio/gmountoperation.h
-OUT2INC+=gio/gtlsclientconnection.h
-OUT2INC+=gio/gdbusproxy.h
-OUT2INC+=gio/gnativevolumemonitor.h
-OUT2INC+=gio/gtlsconnection.h
-OUT2INC+=gio/gdbusserver.h
-OUT2INC+=gio/gnetworkaddress.h
-OUT2INC+=gio/gtlsserverconnection.h
-OUT2INC+=gio/gdbusutils.h
-OUT2INC+=gio/gnetworkservice.h
-OUT2INC+=gio/gvfs.h
-OUT2INC+=gio/gdrive.h
-OUT2INC+=gio/goutputstream.h
-OUT2INC+=gio/gvolume.h
-OUT2INC+=gio/gemblem.h
-OUT2INC+=gio/gpermission.h
-OUT2INC+=gio/gvolumemonitor.h
-OUT2INC+=gio/gemblemedicon.h
-OUT2INC+=gio/gpollableinputstream.h
-OUT2INC+=gio/gzlibcompressor.h
-OUT2INC+=gio/gfile.h
-OUT2INC+=gio/gpollableoutputstream.h
-OUT2INC+=gio/gzlibdecompressor.h
-OUT2INC+=gio/gfileattribute.h
-OUT2INC+=gio/gproxy.h
-OUT2INC+=gio/gfileenumerator.h
-OUT2INC+=gio/gproxyaddress.h
-
-OUT2INC+=glib/galloca.h
-OUT2INC+=glib/gconvert.h
-OUT2INC+=glib/gi18n.h
-OUT2INC+=glib/goption.h
-OUT2INC+=glib/gscanner.h
-OUT2INC+=glib/gthreadpool.h
-OUT2INC+=glib/garray.h
-OUT2INC+=glib/gdataset.h
-OUT2INC+=glib/giochannel.h
-OUT2INC+=glib/gpattern.h
-OUT2INC+=glib/gsequence.h
-OUT2INC+=glib/gtimer.h
-OUT2INC+=glib/gasyncqueue.h
-OUT2INC+=glib/gdate.h
-OUT2INC+=glib/gkeyfile.h
-OUT2INC+=glib/gpoll.h
-OUT2INC+=glib/gshell.h
-OUT2INC+=glib/gtimezone.h
-OUT2INC+=glib/gatomic.h
-OUT2INC+=glib/gdatetime.h
-OUT2INC+=glib/glist.h
-OUT2INC+=glib/gprimes.h
-OUT2INC+=glib/gslice.h
-OUT2INC+=glib/gtree.h
-OUT2INC+=glib/gbacktrace.h
-OUT2INC+=glib/gdir.h
-OUT2INC+=glib/gmacros.h
-OUT2INC+=glib/gprintf.h
-OUT2INC+=glib/gslist.h
-OUT2INC+=glib/gtypes.h
-OUT2INC+=glib/gbase64.h
-OUT2INC+=glib/gerror.h
-OUT2INC+=glib/gmain.h
-OUT2INC+=glib/gqsort.h
-OUT2INC+=glib/gspawn.h
-OUT2INC+=glib/gunicode.h
-OUT2INC+=glib/gbitlock.h
-OUT2INC+=glib/gfileutils.h
-OUT2INC+=glib/gmappedfile.h
-OUT2INC+=glib/gquark.h
-OUT2INC+=glib/gstdio.h
-OUT2INC+=glib/gurifuncs.h
-OUT2INC+=glib/gbookmarkfile.h
-OUT2INC+=glib/ghash.h
-OUT2INC+=glib/gmarkup.h
-OUT2INC+=glib/gqueue.h
-OUT2INC+=glib/gstrfuncs.h
-OUT2INC+=glib/gutils.h
-OUT2INC+=glib/gcache.h
-OUT2INC+=glib/ghook.h
-OUT2INC+=glib/gmem.h
-OUT2INC+=glib/grand.h
-OUT2INC+=glib/gstring.h
-OUT2INC+=glib/gvariant.h
-OUT2INC+=glib/gchecksum.h
-OUT2INC+=glib/ghostutils.h
-OUT2INC+=glib/gmessages.h
-OUT2INC+=glib/gregex.h
-OUT2INC+=glib/gtestutils.h
-OUT2INC+=glib/gvarianttype.h
-OUT2INC+=glib/gcompletion.h
-OUT2INC+=glib/gi18n-lib.h
-OUT2INC+=glib/gnode.h
-OUT2INC+=glib/grel.h
-OUT2INC+=glib/gthread.h
-OUT2INC+=glib/gwin32.h
-
-
-OUT2INC+=gobject/gbinding.h
-OUT2INC+=gobject/gmarshal.h
-OUT2INC+=gobject/gparamspecs.h
-OUT2INC+=gobject/gtypemodule.h
-OUT2INC+=gobject/gvaluecollector.h
-OUT2INC+=gobject/gboxed.h
-OUT2INC+=gobject/gobject.h
-OUT2INC+=gobject/gsignal.h
-OUT2INC+=gobject/gtypeplugin.h
-OUT2INC+=gobject/gvaluetypes.h
-OUT2INC+=gobject/gclosure.h
-OUT2INC+=gobject/gobjectnotifyqueue.c  
-OUT2INC+=gobject/gsourceclosure.h
-OUT2INC+=gobject/gvalue.h
-OUT2INC+=gobject/genums.h
-OUT2INC+=gobject/gparam.h
-OUT2INC+=gobject/gtype.h
-OUT2INC+=gobject/gvaluearray.h
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/glib/prj/build.lst b/glib/prj/build.lst
deleted file mode 100644
index d8be54e59ee2..000000000000
--- a/glib/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-gl	glib	: GETTEXT:gettext ZLIB:zlib NULL
-gl	glib			    usr1	-	all	gl_mkout NULL
-gl	glib			    nmake	-	all	gl_glib NULL
diff --git a/glib/prj/d.lst b/glib/prj/d.lst
deleted file mode 100644
index cb207230b716..000000000000
--- a/glib/prj/d.lst
+++ /dev/null
@@ -1,252 +0,0 @@
-mkdir: %_DEST%\inc\external
-..\%__SRC%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.0.dylib
-symlink: %_DEST%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.dylib
-..\%__SRC%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.0.dylib
-symlink: %_DEST%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.dylib
-..\%__SRC%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.0.dylib
-symlink: %_DEST%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.dylib
-..\%__SRC%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.0.dylib
-symlink: %_DEST%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.dylib
-..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.0.dylib
-symlink: %_DEST%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.dylib
-..\%__SRC%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so.0
-symlink: %_DEST%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so
-..\%__SRC%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so.0
-symlink: %_DEST%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so
-..\%__SRC%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so.0
-symlink: %_DEST%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so
-..\%__SRC%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so.0
-symlink: %_DEST%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so
-..\%__SRC%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so.0
-symlink: %_DEST%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\bin\glib-mkenums %_DEST%\bin\glib-mkenums
-..\%__SRC%\bin\glib-genmarshal %_DEST%\bin\glib-genmarshal
-..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin\glib-genmarshal.exe
-..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin\glib-compile-schemas
-..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib\gio-2.0.lib
-..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib\gmodule-2.0.lib
-..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib\gthread-2.0.lib
-..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib\glib-2.0.lib
-..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib\gobject-2.0.lib
-..\%__SRC%\lib\dirent.lib %_DEST%\lib\dirent.lib
-
-mkdir: %_DEST%\inc\external\gio-unix-2.0
-mkdir: %_DEST%\inc\external\gio-unix-2.0\gio
-..\%__SRC%\inc\gdesktopappinfo.h %_DEST%\inc\external\gio-unix-2.0\gio\gdesktopappinfo.h
-..\%__SRC%\inc\gunixcredentialsmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixcredentialsmessage.h
-..\%__SRC%\inc\gunixinputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixinputstream.h
-..\%__SRC%\inc\gunixsocketaddress.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixsocketaddress.h
-..\%__SRC%\inc\gfiledescriptorbased.h %_DEST%\inc\external\gio-unix-2.0\gio\gfiledescriptorbased.h
-..\%__SRC%\inc\gunixfdlist.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdlist.h
-..\%__SRC%\inc\gunixmounts.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixmounts.h
-..\%__SRC%\inc\gunixconnection.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixconnection.h
-..\%__SRC%\inc\gunixfdmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdmessage.h
-..\%__SRC%\inc\gunixoutputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixoutputstream.h
-
-mkdir: %_DEST%\inc\external\glib-2.0
-..\%__SRC%\inc\glib-object.h %_DEST%\inc\external\glib-2.0\glib-object.h
-..\%__SRC%\inc\glib.h %_DEST%\inc\external\glib-2.0\glib.h
-..\%__SRC%\inc\glibconfig.h %_DEST%\inc\external\glib-2.0\glibconfig.h
-..\%__SRC%\inc\gmodule.h %_DEST%\inc\external\glib-2.0\gmodule.h
-..\%__SRC%\inc\make.msc %_DEST%\inc\external\glib-2.0\make.msc
-..\%__SRC%\inc\module.defs %_DEST%\inc\external\glib-2.0\module.defs
-..\%__SRC%\inc\dirent.h %_DEST%\inc\external\glib-2.0\dirent.h
-
-mkdir: %_DEST%\inc\external\glib-2.0\gio
-..\%__SRC%\inc\gaction.h %_DEST%\inc\external\glib-2.0\gio\gaction.h
-..\%__SRC%\inc\gfileicon.h %_DEST%\inc\external\glib-2.0\gio\gfileicon.h
-..\%__SRC%\inc\gproxyaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddressenumerator.h
-..\%__SRC%\inc\gactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gactiongroup.h
-..\%__SRC%\inc\gfileinfo.h %_DEST%\inc\external\glib-2.0\gio\gfileinfo.h
-..\%__SRC%\inc\gproxyresolver.h %_DEST%\inc\external\glib-2.0\gio\gproxyresolver.h
-..\%__SRC%\inc\gappinfo.h %_DEST%\inc\external\glib-2.0\gio\gappinfo.h
-..\%__SRC%\inc\gfileinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileinputstream.h
-..\%__SRC%\inc\gresolver.h %_DEST%\inc\external\glib-2.0\gio\gresolver.h
-..\%__SRC%\inc\gapplication.h %_DEST%\inc\external\glib-2.0\gio\gapplication.h
-..\%__SRC%\inc\gfileiostream.h %_DEST%\inc\external\glib-2.0\gio\gfileiostream.h
-..\%__SRC%\inc\gseekable.h %_DEST%\inc\external\glib-2.0\gio\gseekable.h
-..\%__SRC%\inc\gapplicationcommandline.h %_DEST%\inc\external\glib-2.0\gio\gapplicationcommandline.h
-..\%__SRC%\inc\gfilemonitor.h %_DEST%\inc\external\glib-2.0\gio\gfilemonitor.h
-..\%__SRC%\inc\gsettings.h %_DEST%\inc\external\glib-2.0\gio\gsettings.h
-..\%__SRC%\inc\gasyncinitable.h %_DEST%\inc\external\glib-2.0\gio\gasyncinitable.h
-..\%__SRC%\inc\gfilenamecompleter.h %_DEST%\inc\external\glib-2.0\gio\gfilenamecompleter.h
-..\%__SRC%\inc\gsettingsbackend.h %_DEST%\inc\external\glib-2.0\gio\gsettingsbackend.h
-..\%__SRC%\inc\gasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gasyncresult.h
-..\%__SRC%\inc\gfileoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileoutputstream.h
-..\%__SRC%\inc\gsimpleaction.h %_DEST%\inc\external\glib-2.0\gio\gsimpleaction.h
-..\%__SRC%\inc\gbufferedinputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedinputstream.h
-..\%__SRC%\inc\gfilterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilterinputstream.h
-..\%__SRC%\inc\gsimpleactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gsimpleactiongroup.h
-..\%__SRC%\inc\gbufferedoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedoutputstream.h
-..\%__SRC%\inc\gfilteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilteroutputstream.h
-..\%__SRC%\inc\gsimpleasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gsimpleasyncresult.h
-..\%__SRC%\inc\gcancellable.h %_DEST%\inc\external\glib-2.0\gio\gcancellable.h
-..\%__SRC%\inc\gicon.h %_DEST%\inc\external\glib-2.0\gio\gicon.h
-..\%__SRC%\inc\gsimplepermission.h %_DEST%\inc\external\glib-2.0\gio\gsimplepermission.h
-..\%__SRC%\inc\gcharsetconverter.h %_DEST%\inc\external\glib-2.0\gio\gcharsetconverter.h
-..\%__SRC%\inc\ginetaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetaddress.h
-..\%__SRC%\inc\gsocket.h %_DEST%\inc\external\glib-2.0\gio\gsocket.h
-..\%__SRC%\inc\gcontenttype.h %_DEST%\inc\external\glib-2.0\gio\gcontenttype.h
-..\%__SRC%\inc\ginetsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetsocketaddress.h
-..\%__SRC%\inc\gsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddress.h
-..\%__SRC%\inc\gconverter.h %_DEST%\inc\external\glib-2.0\gio\gconverter.h
-..\%__SRC%\inc\ginitable.h %_DEST%\inc\external\glib-2.0\gio\ginitable.h
-..\%__SRC%\inc\gsocketaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddressenumerator.h
-..\%__SRC%\inc\gconverterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverterinputstream.h
-..\%__SRC%\inc\ginputstream.h %_DEST%\inc\external\glib-2.0\gio\ginputstream.h
-..\%__SRC%\inc\gsocketclient.h %_DEST%\inc\external\glib-2.0\gio\gsocketclient.h
-..\%__SRC%\inc\gconverteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverteroutputstream.h
-..\%__SRC%\inc\gio.h %_DEST%\inc\external\glib-2.0\gio\gio.h
-..\%__SRC%\inc\gsocketconnectable.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnectable.h
-..\%__SRC%\inc\gcredentials.h %_DEST%\inc\external\glib-2.0\gio\gcredentials.h
-..\%__SRC%\inc\gioenums.h %_DEST%\inc\external\glib-2.0\gio\gioenums.h
-..\%__SRC%\inc\gsocketconnection.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnection.h
-..\%__SRC%\inc\gdatainputstream.h %_DEST%\inc\external\glib-2.0\gio\gdatainputstream.h
-..\%__SRC%\inc\gioenumtypes.h %_DEST%\inc\external\glib-2.0\gio\gioenumtypes.h
-..\%__SRC%\inc\gsocketcontrolmessage.h %_DEST%\inc\external\glib-2.0\gio\gsocketcontrolmessage.h
-..\%__SRC%\inc\gdataoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gdataoutputstream.h
-..\%__SRC%\inc\gioerror.h %_DEST%\inc\external\glib-2.0\gio\gioerror.h
-..\%__SRC%\inc\gsocketlistener.h %_DEST%\inc\external\glib-2.0\gio\gsocketlistener.h
-..\%__SRC%\inc\gdbusaddress.h %_DEST%\inc\external\glib-2.0\gio\gdbusaddress.h
-..\%__SRC%\inc\giomodule.h %_DEST%\inc\external\glib-2.0\gio\giomodule.h
-..\%__SRC%\inc\gsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gsocketservice.h
-..\%__SRC%\inc\gdbusauthobserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusauthobserver.h
-..\%__SRC%\inc\gioscheduler.h %_DEST%\inc\external\glib-2.0\gio\gioscheduler.h
-..\%__SRC%\inc\gsrvtarget.h %_DEST%\inc\external\glib-2.0\gio\gsrvtarget.h
-..\%__SRC%\inc\gdbusconnection.h %_DEST%\inc\external\glib-2.0\gio\gdbusconnection.h
-..\%__SRC%\inc\giostream.h %_DEST%\inc\external\glib-2.0\gio\giostream.h
-..\%__SRC%\inc\gtcpconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpconnection.h
-..\%__SRC%\inc\gdbuserror.h %_DEST%\inc\external\glib-2.0\gio\gdbuserror.h
-..\%__SRC%\inc\giotypes.h %_DEST%\inc\external\glib-2.0\gio\giotypes.h
-..\%__SRC%\inc\gtcpwrapperconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpwrapperconnection.h
-..\%__SRC%\inc\gdbusintrospection.h %_DEST%\inc\external\glib-2.0\gio\gdbusintrospection.h
-..\%__SRC%\inc\gloadableicon.h %_DEST%\inc\external\glib-2.0\gio\gloadableicon.h
-..\%__SRC%\inc\gthemedicon.h %_DEST%\inc\external\glib-2.0\gio\gthemedicon.h
-..\%__SRC%\inc\gdbusmessage.h %_DEST%\inc\external\glib-2.0\gio\gdbusmessage.h
-..\%__SRC%\inc\gmemoryinputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryinputstream.h
-..\%__SRC%\inc\gthreadedsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gthreadedsocketservice.h
-..\%__SRC%\inc\gdbusmethodinvocation.h %_DEST%\inc\external\glib-2.0\gio\gdbusmethodinvocation.h
-..\%__SRC%\inc\gmemoryoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryoutputstream.h
-..\%__SRC%\inc\gtlsbackend.h %_DEST%\inc\external\glib-2.0\gio\gtlsbackend.h
-..\%__SRC%\inc\gdbusnameowning.h %_DEST%\inc\external\glib-2.0\gio\gdbusnameowning.h
-..\%__SRC%\inc\gmount.h %_DEST%\inc\external\glib-2.0\gio\gmount.h
-..\%__SRC%\inc\gtlscertificate.h %_DEST%\inc\external\glib-2.0\gio\gtlscertificate.h
-..\%__SRC%\inc\gdbusnamewatching.h %_DEST%\inc\external\glib-2.0\gio\gdbusnamewatching.h
-..\%__SRC%\inc\gmountoperation.h %_DEST%\inc\external\glib-2.0\gio\gmountoperation.h
-..\%__SRC%\inc\gtlsclientconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsclientconnection.h
-..\%__SRC%\inc\gdbusproxy.h %_DEST%\inc\external\glib-2.0\gio\gdbusproxy.h
-..\%__SRC%\inc\gnativevolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gnativevolumemonitor.h
-..\%__SRC%\inc\gtlsconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsconnection.h
-..\%__SRC%\inc\gdbusserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusserver.h
-..\%__SRC%\inc\gnetworkaddress.h %_DEST%\inc\external\glib-2.0\gio\gnetworkaddress.h
-..\%__SRC%\inc\gtlsserverconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsserverconnection.h
-..\%__SRC%\inc\gdbusutils.h %_DEST%\inc\external\glib-2.0\gio\gdbusutils.h
-..\%__SRC%\inc\gnetworkservice.h %_DEST%\inc\external\glib-2.0\gio\gnetworkservice.h
-..\%__SRC%\inc\gvfs.h %_DEST%\inc\external\glib-2.0\gio\gvfs.h
-..\%__SRC%\inc\gdrive.h %_DEST%\inc\external\glib-2.0\gio\gdrive.h
-..\%__SRC%\inc\goutputstream.h %_DEST%\inc\external\glib-2.0\gio\goutputstream.h
-..\%__SRC%\inc\gvolume.h %_DEST%\inc\external\glib-2.0\gio\gvolume.h
-..\%__SRC%\inc\gemblem.h %_DEST%\inc\external\glib-2.0\gio\gemblem.h
-..\%__SRC%\inc\gpermission.h %_DEST%\inc\external\glib-2.0\gio\gpermission.h
-..\%__SRC%\inc\gvolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gvolumemonitor.h
-..\%__SRC%\inc\gemblemedicon.h %_DEST%\inc\external\glib-2.0\gio\gemblemedicon.h
-..\%__SRC%\inc\gpollableinputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableinputstream.h
-..\%__SRC%\inc\gzlibcompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibcompressor.h
-..\%__SRC%\inc\gfile.h %_DEST%\inc\external\glib-2.0\gio\gfile.h
-..\%__SRC%\inc\gpollableoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableoutputstream.h
-..\%__SRC%\inc\gzlibdecompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibdecompressor.h
-..\%__SRC%\inc\gfileattribute.h %_DEST%\inc\external\glib-2.0\gio\gfileattribute.h
-..\%__SRC%\inc\gproxy.h %_DEST%\inc\external\glib-2.0\gio\gproxy.h
-..\%__SRC%\inc\gfileenumerator.h %_DEST%\inc\external\glib-2.0\gio\gfileenumerator.h
-..\%__SRC%\inc\gproxyaddress.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddress.h
-
-mkdir: %_DEST%\inc\external\glib-2.0\glib
-
-..\%__SRC%\inc\galloca.h %_DEST%\inc\external\glib-2.0\glib\galloca.h
-..\%__SRC%\inc\gconvert.h %_DEST%\inc\external\glib-2.0\glib\gconvert.h
-..\%__SRC%\inc\gi18n.h %_DEST%\inc\external\glib-2.0\glib\gi18n.h
-..\%__SRC%\inc\goption.h %_DEST%\inc\external\glib-2.0\glib\goption.h
-..\%__SRC%\inc\gscanner.h %_DEST%\inc\external\glib-2.0\glib\gscanner.h
-..\%__SRC%\inc\gthreadpool.h %_DEST%\inc\external\glib-2.0\glib\gthreadpool.h
-..\%__SRC%\inc\garray.h %_DEST%\inc\external\glib-2.0\glib\garray.h
-..\%__SRC%\inc\gdataset.h %_DEST%\inc\external\glib-2.0\glib\gdataset.h
-..\%__SRC%\inc\giochannel.h %_DEST%\inc\external\glib-2.0\glib\giochannel.h
-..\%__SRC%\inc\gpattern.h %_DEST%\inc\external\glib-2.0\glib\gpattern.h
-..\%__SRC%\inc\gsequence.h %_DEST%\inc\external\glib-2.0\glib\gsequence.h
-..\%__SRC%\inc\gtimer.h %_DEST%\inc\external\glib-2.0\glib\gtimer.h
-..\%__SRC%\inc\gasyncqueue.h %_DEST%\inc\external\glib-2.0\glib\gasyncqueue.h
-..\%__SRC%\inc\gdate.h %_DEST%\inc\external\glib-2.0\glib\gdate.h
-..\%__SRC%\inc\gkeyfile.h %_DEST%\inc\external\glib-2.0\glib\gkeyfile.h
-..\%__SRC%\inc\gpoll.h %_DEST%\inc\external\glib-2.0\glib\gpoll.h
-..\%__SRC%\inc\gshell.h %_DEST%\inc\external\glib-2.0\glib\gshell.h
-..\%__SRC%\inc\gtimezone.h %_DEST%\inc\external\glib-2.0\glib\gtimezone.h
-..\%__SRC%\inc\gatomic.h %_DEST%\inc\external\glib-2.0\glib\gatomic.h
-..\%__SRC%\inc\gdatetime.h %_DEST%\inc\external\glib-2.0\glib\gdatetime.h
-..\%__SRC%\inc\glist.h %_DEST%\inc\external\glib-2.0\glib\glist.h
-..\%__SRC%\inc\gprimes.h %_DEST%\inc\external\glib-2.0\glib\gprimes.h
-..\%__SRC%\inc\gslice.h %_DEST%\inc\external\glib-2.0\glib\gslice.h
-..\%__SRC%\inc\gtree.h %_DEST%\inc\external\glib-2.0\glib\gtree.h
-..\%__SRC%\inc\gbacktrace.h %_DEST%\inc\external\glib-2.0\glib\gbacktrace.h
-..\%__SRC%\inc\gdir.h %_DEST%\inc\external\glib-2.0\glib\gdir.h
-..\%__SRC%\inc\gmacros.h %_DEST%\inc\external\glib-2.0\glib\gmacros.h
-..\%__SRC%\inc\gprintf.h %_DEST%\inc\external\glib-2.0\glib\gprintf.h
-..\%__SRC%\inc\gslist.h %_DEST%\inc\external\glib-2.0\glib\gslist.h
-..\%__SRC%\inc\gtypes.h %_DEST%\inc\external\glib-2.0\glib\gtypes.h
-..\%__SRC%\inc\gbase64.h %_DEST%\inc\external\glib-2.0\glib\gbase64.h
-..\%__SRC%\inc\gerror.h %_DEST%\inc\external\glib-2.0\glib\gerror.h
-..\%__SRC%\inc\gmain.h %_DEST%\inc\external\glib-2.0\glib\gmain.h
-..\%__SRC%\inc\gqsort.h %_DEST%\inc\external\glib-2.0\glib\gqsort.h
-..\%__SRC%\inc\gspawn.h %_DEST%\inc\external\glib-2.0\glib\gspawn.h
-..\%__SRC%\inc\gunicode.h %_DEST%\inc\external\glib-2.0\glib\gunicode.h
-..\%__SRC%\inc\gbitlock.h %_DEST%\inc\external\glib-2.0\glib\gbitlock.h
-..\%__SRC%\inc\gfileutils.h %_DEST%\inc\external\glib-2.0\glib\gfileutils.h
-..\%__SRC%\inc\gmappedfile.h %_DEST%\inc\external\glib-2.0\glib\gmappedfile.h
-..\%__SRC%\inc\gquark.h %_DEST%\inc\external\glib-2.0\glib\gquark.h
-..\%__SRC%\inc\gstdio.h %_DEST%\inc\external\glib-2.0\glib\gstdio.h
-..\%__SRC%\inc\gurifuncs.h %_DEST%\inc\external\glib-2.0\glib\gurifuncs.h
-..\%__SRC%\inc\gbookmarkfile.h %_DEST%\inc\external\glib-2.0\glib\gbookmarkfile.h
-..\%__SRC%\inc\ghash.h %_DEST%\inc\external\glib-2.0\glib\ghash.h
-..\%__SRC%\inc\gmarkup.h %_DEST%\inc\external\glib-2.0\glib\gmarkup.h
-..\%__SRC%\inc\gqueue.h %_DEST%\inc\external\glib-2.0\glib\gqueue.h
-..\%__SRC%\inc\gstrfuncs.h %_DEST%\inc\external\glib-2.0\glib\gstrfuncs.h
-..\%__SRC%\inc\gutils.h %_DEST%\inc\external\glib-2.0\glib\gutils.h
-..\%__SRC%\inc\gcache.h %_DEST%\inc\external\glib-2.0\glib\gcache.h
-..\%__SRC%\inc\ghook.h %_DEST%\inc\external\glib-2.0\glib\ghook.h
-..\%__SRC%\inc\gmem.h %_DEST%\inc\external\glib-2.0\glib\gmem.h
-..\%__SRC%\inc\grand.h %_DEST%\inc\external\glib-2.0\glib\grand.h
-..\%__SRC%\inc\gstring.h %_DEST%\inc\external\glib-2.0\glib\gstring.h
-..\%__SRC%\inc\gvariant.h %_DEST%\inc\external\glib-2.0\glib\gvariant.h
-..\%__SRC%\inc\gchecksum.h %_DEST%\inc\external\glib-2.0\glib\gchecksum.h
-..\%__SRC%\inc\ghostutils.h %_DEST%\inc\external\glib-2.0\glib\ghostutils.h
-..\%__SRC%\inc\gmessages.h %_DEST%\inc\external\glib-2.0\glib\gmessages.h
-..\%__SRC%\inc\gregex.h %_DEST%\inc\external\glib-2.0\glib\gregex.h
-..\%__SRC%\inc\gtestutils.h %_DEST%\inc\external\glib-2.0\glib\gtestutils.h
-..\%__SRC%\inc\gvarianttype.h %_DEST%\inc\external\glib-2.0\glib\gvarianttype.h
-..\%__SRC%\inc\gcompletion.h %_DEST%\inc\external\glib-2.0\glib\gcompletion.h
-..\%__SRC%\inc\gi18n-lib.h %_DEST%\inc\external\glib-2.0\glib\gi18n-lib.h
-..\%__SRC%\inc\gnode.h %_DEST%\inc\external\glib-2.0\glib\gnode.h
-..\%__SRC%\inc\grel.h %_DEST%\inc\external\glib-2.0\glib\grel.h
-..\%__SRC%\inc\gthread.h %_DEST%\inc\external\glib-2.0\glib\gthread.h
-..\%__SRC%\inc\gwin32.h %_DEST%\inc\external\glib-2.0\glib\gwin32.h
-
-mkdir: %_DEST%\inc\external\glib-2.0\gobject
-..\%__SRC%\inc\gbinding.h %_DEST%\inc\external\glib-2.0\gobject\gbinding.h
-..\%__SRC%\inc\gmarshal.h %_DEST%\inc\external\glib-2.0\gobject\gmarshal.h
-..\%__SRC%\inc\gparamspecs.h %_DEST%\inc\external\glib-2.0\gobject\gparamspecs.h
-..\%__SRC%\inc\gtypemodule.h %_DEST%\inc\external\glib-2.0\gobject\gtypemodule.h
-..\%__SRC%\inc\gvaluecollector.h %_DEST%\inc\external\glib-2.0\gobject\gvaluecollector.h
-..\%__SRC%\inc\gboxed.h %_DEST%\inc\external\glib-2.0\gobject\gboxed.h
-..\%__SRC%\inc\gobject.h %_DEST%\inc\external\glib-2.0\gobject\gobject.h
-..\%__SRC%\inc\gsignal.h %_DEST%\inc\external\glib-2.0\gobject\gsignal.h
-..\%__SRC%\inc\gtypeplugin.h %_DEST%\inc\external\glib-2.0\gobject\gtypeplugin.h
-..\%__SRC%\inc\gvaluetypes.h %_DEST%\inc\external\glib-2.0\gobject\gvaluetypes.h
-..\%__SRC%\inc\gclosure.h %_DEST%\inc\external\glib-2.0\gobject\gclosure.h
-..\%__SRC%\inc\gobjectnotifyqueue.c %_DEST%\inc\external\glib-2.0\gobject\gobjectnotifyqueue.c  
-..\%__SRC%\inc\gsourceclosure.h %_DEST%\inc\external\glib-2.0\gobject\gsourceclosure.h
-..\%__SRC%\inc\gvalue.h %_DEST%\inc\external\glib-2.0\gobject\gvalue.h
-..\%__SRC%\inc\genums.h %_DEST%\inc\external\glib-2.0\gobject\genums.h
-..\%__SRC%\inc\gparam.h %_DEST%\inc\external\glib-2.0\gobject\gparam.h
-..\%__SRC%\inc\gtype.h %_DEST%\inc\external\glib-2.0\gobject\gtype.h
-..\%__SRC%\inc\gvaluearray.h %_DEST%\inc\external\glib-2.0\gobject\gvaluearray.h
-
diff --git a/glib/prj/dmake b/glib/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/glib/prj/dmake
+++ /dev/null
diff --git a/i18npool/CppunitTest_i18npool_test_languagetag.mk b/i18npool/CppunitTest_i18npool_test_languagetag.mk
index 610791cedbae..c6493303111a 100644
--- a/i18npool/CppunitTest_i18npool_test_languagetag.mk
+++ b/i18npool/CppunitTest_i18npool_test_languagetag.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
 ifeq ($(ENABLE_LIBLANGTAG),YES)
 $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
 	liblangtag \
-	glib \
 	libxml2 \
 ))
 $(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DENABLE_LIBLANGTAG))
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index d38a2384fecc..869c21aa637b 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\
 
 ifeq ($(ENABLE_LIBLANGTAG),YES)
 $(eval $(call gb_Library_add_defs,i18nisolang1,-DENABLE_LIBLANGTAG))
-$(eval $(call gb_Library_use_external,i18nisolang1,glib))
 $(eval $(call gb_Library_use_external,i18nisolang1,liblangtag))
 $(eval $(call gb_Library_use_external,i18nisolang1,libxml2))
 endif
diff --git a/libcroco/README b/libcroco/README
deleted file mode 100644
index 52a93c6ec29c..000000000000
--- a/libcroco/README
+++ /dev/null
@@ -1,4 +0,0 @@
-A general CSS parsing and manipulation library written in C for the GNOME project.
-
-From:
-[https://launchpad.net/libcroco]
diff --git a/libcroco/libcroco-0.6.2.patch b/libcroco/libcroco-0.6.2.patch
deleted file mode 100644
index e1e44392ce3e..000000000000
--- a/libcroco/libcroco-0.6.2.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- misc/libcroco-0.6.2/src/makefile.mk	Wed Aug 20 14:33:55 2008
-+++ misc/build/libcroco-0.6.2/src/makefile.mk	Wed Aug 20 14:26:42 2008
-@@ -1 +1,107 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# 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=..$/..$/..$/..$/..
-+#PRJINC=..
-+PRJNAME=libcroco
-+TARGET=libcroco-0.6-3
-+
-+#ENABLE_EXCEPTIONS=TRUE
-+VISIBILITY_HIDDEN=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
-+
-+# --- Settings ----------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+CFLAGS+=-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0
-+
-+# --- Files -------------------------------------
-+
-+SLOFILES=\
-+	$(SLO)$/cr-utils.obj \
-+	$(SLO)$/cr-input.obj \
-+	$(SLO)$/cr-enc-handler.obj \
-+	$(SLO)$/cr-num.obj \
-+	$(SLO)$/cr-rgb.obj \
-+	$(SLO)$/cr-token.obj \
-+	$(SLO)$/cr-tknzr.obj \
-+	$(SLO)$/cr-term.obj \
-+	$(SLO)$/cr-attr-sel.obj \
-+	$(SLO)$/cr-pseudo.obj \
-+	$(SLO)$/cr-additional-sel.obj \
-+	$(SLO)$/cr-simple-sel.obj \
-+	$(SLO)$/cr-selector.obj \
-+	$(SLO)$/cr-doc-handler.obj \
-+	$(SLO)$/cr-parser.obj \
-+	$(SLO)$/cr-declaration.obj \
-+	$(SLO)$/cr-statement.obj \
-+	$(SLO)$/cr-stylesheet.obj \
-+	$(SLO)$/cr-cascade.obj \
-+	$(SLO)$/cr-om-parser.obj \
-+	$(SLO)$/cr-style.obj \
-+	$(SLO)$/cr-sel-eng.obj \
-+	$(SLO)$/cr-fonts.obj \
-+	$(SLO)$/cr-prop-list.obj \
-+	$(SLO)$/cr-parsing-location.obj \
-+	$(SLO)$/cr-string.obj
-+
-+
-+# --- Library -----------------------------------
-+
-+SHL1TARGET=	$(TARGET)
-+SHL1OBJS=$(SLOFILES)
-+SHL1STDLIBS=\
-+	gio-2.0.lib \
-+	gobject-2.0.lib \
-+	gthread-2.0.lib \
-+	glib-2.0.lib \
-+	intl.lib \
-+	$(LIBXML2LIB)
-+
-+
-+SHL1DEPN=
-+#SHL1IMPLIB=$(TARGET)
-+#SHL1USE_EXPORTS=name
-+
-+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=	$(SHL1TARGET)
-+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
-+			$(SLB)$/$(TARGET).lib
-+DEFLIB1NAME=$(TARGET)
-+
-+# --- Targets ----------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# --- filter file ------------------------------
-+
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+    @echo CLEAR_THE_FILE	> $@
-+
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
deleted file mode 100644
index 36aba58fb877..000000000000
--- a/libcroco/makefile.mk
+++ /dev/null
@@ -1,153 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=libcroco
-TARGET=so_libcroco
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_LIBCROCO)" == "YES"
-all:
-	@echo "An already available installation of libcroco should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-LIBCROCOVERSION=0.6.2
-
-TARFILE_NAME=$(PRJNAME)-$(LIBCROCOVERSION)
-TARFILE_MD5=0611e099e807210cf738dcb41425d104
-
-PATCH_FILES=
-CONFIGURE_DIR=
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(SYSTEM_LIBXML)" == "YES"
-my_libxml2_cflags=$(LIBXML_CFLAGS)
-my_libxml2_libs=$(LIBXML_LIBS)
-.ELSE
-my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml -DCROCO_HAVE_LIBXML2=1
-my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2
-.ENDIF
-CONFIGURE_ACTION=./configure --prefix=/@.__________________________________________________$(EXTRPATH) \
-                 CPPFLAGS="$(EXTRA_CDEFS)" \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
-                 GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
-                 GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 LIBXML2_CFLAGS='$(my_libxml2_cflags)' \
-                 LIBXML2_LIBS='$(my_libxml2_libs)'
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
-             $(GNUMAKE)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=src/.libs/libcroco-0.6.3.0.1.dylib
-
-OUT2INC+=src/cr-additional-sel.h
-OUT2INC+=src/cr-input.h
-OUT2INC+=src/cr-rgb.h
-OUT2INC+=src/cr-stylesheet.h
-OUT2INC+=src/cr-attr-sel.h
-OUT2INC+=src/cr-num.h
-OUT2INC+=src/cr-sel-eng.h
-OUT2INC+=src/cr-term.h
-OUT2INC+=src/cr-cascade.h
-OUT2INC+=src/cr-om-parser.h
-OUT2INC+=src/cr-selector.h
-OUT2INC+=src/cr-tknzr.h
-OUT2INC+=src/cr-declaration.h
-OUT2INC+=src/cr-parser.h
-OUT2INC+=src/cr-simple-sel.h
-OUT2INC+=src/cr-token.h
-OUT2INC+=src/cr-doc-handler.h
-OUT2INC+=src/cr-parsing-location.h
-OUT2INC+=src/cr-statement.h
-OUT2INC+=src/cr-utils.h
-OUT2INC+=src/cr-enc-handler.h
-OUT2INC+=src/cr-prop-list.h
-OUT2INC+=src/cr-string.h
-OUT2INC+=src/libcroco-config.h
-OUT2INC+=src/cr-fonts.h
-OUT2INC+=src/cr-pseudo.h
-OUT2INC+=src/cr-style.h
-OUT2INC+=src/libcroco.h
-.ELIF "$(OS)"=="WNT"
-
-BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
-PATCH_FILES=libcroco-0.6.2.patch
-ADDITIONAL_FILES=\
-    src$/makefile.mk
-
-OUT2INC+=src$/cr-additional-sel.h
-OUT2INC+=src$/cr-input.h
-OUT2INC+=src$/cr-rgb.h
-OUT2INC+=src$/cr-stylesheet.h
-OUT2INC+=src$/cr-attr-sel.h
-OUT2INC+=src$/cr-num.h
-OUT2INC+=src$/cr-sel-eng.h
-OUT2INC+=src$/cr-term.h
-OUT2INC+=src$/cr-cascade.h
-OUT2INC+=src$/cr-om-parser.h
-OUT2INC+=src$/cr-selector.h
-OUT2INC+=src$/cr-tknzr.h
-OUT2INC+=src$/cr-declaration.h
-OUT2INC+=src$/cr-parser.h
-OUT2INC+=src$/cr-simple-sel.h
-OUT2INC+=src$/cr-token.h
-OUT2INC+=src$/cr-doc-handler.h
-OUT2INC+=src$/cr-parsing-location.h
-OUT2INC+=src$/cr-statement.h
-OUT2INC+=src$/cr-utils.h
-OUT2INC+=src$/cr-enc-handler.h
-OUT2INC+=src$/cr-prop-list.h
-OUT2INC+=src$/cr-string.h
-OUT2INC+=src$/libcroco-config.h
-OUT2INC+=src$/cr-fonts.h
-OUT2INC+=src$/cr-pseudo.h
-OUT2INC+=src$/cr-style.h
-OUT2INC+=src$/libcroco.h
-.ELSE
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/libcroco/prj/build.lst b/libcroco/prj/build.lst
deleted file mode 100644
index a71b9a4b98e5..000000000000
--- a/libcroco/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-cr	libcroco	: LIBXML2:libxml2 GLIB:glib soltools NULL
-cr	libcroco			    usr1	-	all	cr_mkout NULL
-cr	libcroco			    nmake	-	all	cr_libcroco NULL
diff --git a/libcroco/prj/d.lst b/libcroco/prj/d.lst
deleted file mode 100644
index 6c89b36fd4b8..000000000000
--- a/libcroco/prj/d.lst
+++ /dev/null
@@ -1,39 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\libcroco-0.6
-mkdir: %_DEST%\inc\external\libcroco-0.6\libcroco
-
-..\%__SRC%\inc\cr-additional-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-additional-sel.h
-..\%__SRC%\inc\cr-input.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-input.h
-..\%__SRC%\inc\cr-rgb.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-rgb.h
-..\%__SRC%\inc\cr-stylesheet.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-stylesheet.h
-..\%__SRC%\inc\cr-attr-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-attr-sel.h
-..\%__SRC%\inc\cr-num.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-num.h
-..\%__SRC%\inc\cr-sel-eng.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-sel-eng.h
-..\%__SRC%\inc\cr-term.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-term.h
-..\%__SRC%\inc\cr-cascade.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-cascade.h
-..\%__SRC%\inc\cr-om-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-om-parser.h
-..\%__SRC%\inc\cr-selector.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-selector.h
-..\%__SRC%\inc\cr-tknzr.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-tknzr.h
-..\%__SRC%\inc\cr-declaration.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-declaration.h
-..\%__SRC%\inc\cr-parser.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parser.h
-..\%__SRC%\inc\cr-simple-sel.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-simple-sel.h
-..\%__SRC%\inc\cr-token.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-token.h
-..\%__SRC%\inc\cr-doc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-doc-handler.h
-..\%__SRC%\inc\cr-parsing-location.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-parsing-location.h
-..\%__SRC%\inc\cr-statement.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-statement.h
-..\%__SRC%\inc\cr-utils.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-utils.h
-..\%__SRC%\inc\cr-enc-handler.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-enc-handler.h
-..\%__SRC%\inc\cr-prop-list.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-prop-list.h
-..\%__SRC%\inc\cr-string.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-string.h
-..\%__SRC%\inc\libcroco-config.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco-config.h
-..\%__SRC%\inc\cr-fonts.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-fonts.h
-..\%__SRC%\inc\cr-pseudo.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-pseudo.h
-..\%__SRC%\inc\cr-style.h %_DEST%\inc\external\libcroco-0.6\libcroco\cr-style.h
-..\%__SRC%\inc\libcroco.h %_DEST%\inc\external\libcroco-0.6\libcroco\libcroco.h
-
-..\%__SRC%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.0.1.dylib
-symlink: %_DEST%\lib\libcroco-0.6.3.0.1.dylib %_DEST%\lib\libcroco-0.6.3.dylib
-symlink: %_DEST%\lib\libcroco-0.6.3.dylib %_DEST%\lib\libcroco-0.6.dylib
-
-..\%__SRC%\lib\ilibcroco-0.6-3_t1.lib %_DEST%\lib\libcroco-0.6-3.lib
-..\%__SRC%\bin\libcroco-0.6-3.dll %_DEST%\bin\libcroco-0.6-3.dll
diff --git a/libcroco/prj/dmake b/libcroco/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libcroco/prj/dmake
+++ /dev/null
diff --git a/libgsf/README b/libgsf/README
deleted file mode 100644
index 821cd52757a0..000000000000
--- a/libgsf/README
+++ /dev/null
@@ -1,4 +0,0 @@
-A simple i/o library that can read and write common file types and handle structured formats that provide file-system-in-a-file semantics.
-
-From:
-[http://www.gnome.org/projects/libgsf]
diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch
deleted file mode 100644
index 7afcdd834d04..000000000000
--- a/libgsf/libgsf-1.14.19.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- misc/libgsf-1.14.19/configure	2010-09-25 18:53:55.000000000 +0200
-+++ misc/build/libgsf-1.14.19/configure	2011-03-03 12:42:21.000000000 +0100
-@@ -11475,7 +11475,7 @@
- 
- 
- 
--
-+if false; then
- case "$am__api_version" in
-     1.01234)
- 	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-@@ -11650,7 +11650,7 @@
- 
- 
- 
--
-+fi
- 
- 
- 
-@@ -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
-@@ -12846,7 +12846,7 @@
- fi
- 
- fi
--if test -n "$PKG_CONFIG"; then
-+if test "$PKG_CONFIG" != "no" ; then
- 	_pkg_min_version=0.9.0
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
---- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c
-+++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c
-@@ -30,6 +30,10 @@
- 
- #include <string.h>
- #include <zlib.h>
-+
-+#if defined(Z_PREFIX) && defined(crc32)
-+#undef crc32
-+#endif
- 
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "libgsf:zip"
-
---- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c
-+++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c
-@@ -29,6 +29,11 @@
- #include <string.h>
- #include <time.h>
- #include <zlib.h>
-+
-+#if defined(Z_PREFIX) && defined(crc32)
-+#define CRC32_WAS_DEFINED_AS_Z_CRC32
-+#undef crc32
-+#endif
- 
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "libgsf:zip"
-@@ -345,7 +345,11 @@
- 	zip_header_write (zip);
- 	zip->writing = TRUE;
- 	zip->root->writing = TRUE;
-+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
-+	dirent->crc32 = z_crc32 (0L, Z_NULL, 0);
-+#else
- 	dirent->crc32 = crc32 (0L, Z_NULL, 0);
-+#endif
- 	if (zip->compression_method == GSF_ZIP_DEFLATED) {
- 		if (!zip->stream) {
- 			zip->stream = g_new0 (z_stream, 1);
-@@ -544,7 +544,11 @@
- 			return FALSE;
- 		dirent->csize += num_bytes;
- 	}
-+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
-+	dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes);
-+#else
- 	dirent->crc32 = crc32 (dirent->crc32, data, num_bytes);
-+#endif
- 	dirent->usize += num_bytes;
- 
- 	return TRUE;
diff --git a/libgsf/libgsf-1.14.19.windows.patch b/libgsf/libgsf-1.14.19.windows.patch
deleted file mode 100644
index 8f09804b21b4..000000000000
--- a/libgsf/libgsf-1.14.19.windows.patch
+++ /dev/null
@@ -1,191 +0,0 @@
---- misc/libgsf-1.14.19/gsf/gsf-config.h	2011-03-23 16:18:27.163747600 +0100
-+++ misc/build/libgsf-1.14.19/gsf/gsf-config.h	2011-03-23 16:01:26.598374600 +0100
-@@ -1 +1,10 @@
--dummy
-+#ifndef GSF_CONFIG_H
-+#define GSF_CONFIG_H
-+
-+#define GETTEXT_PACKAGE "gsf"
-+
-+typedef unsigned short mode_t;
-+
-+#define S_ISREG(x) ((x & _S_IFREG)!=0)
-+
-+#endif
---- misc/libgsf-1.14.19/gsf/makefile.mk	2011-03-23 16:18:27.070742300 +0100
-+++ misc/build/libgsf-1.14.19/gsf/makefile.mk	2011-03-23 16:17:29.477448100 +0100
-@@ -1 +1,121 @@
--dummy
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+# 
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# 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=..$/..$/..$/..$/..
-+PRJINC=..
-+PRJNAME=libgsf
-+TARGET=gsf-1
-+
-+VISIBILITY_HIDDEN=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+UWINAPILIB=
-+
-+# --- Settings ----------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+CFLAGS+= -I.. -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/zlib -I$(SOLARINCDIR)$/external
-+
-+# --- Files -------------------------------------
-+
-+SLOFILES=\
-+    $(SLO)$/gsf-blob.obj \
-+    $(SLO)$/gsf-input-memory.obj \
-+    $(SLO)$/gsf-output-gio.obj \
-+    $(SLO)$/gsf-clip-data.obj \
-+    $(SLO)$/gsf-input-proxy.obj \
-+    $(SLO)$/gsf-output-gzip.obj \
-+    $(SLO)$/gsf-doc-meta-data.obj \
-+    $(SLO)$/gsf-input-stdio.obj \
-+    $(SLO)$/gsf-output-iconv.obj \
-+    $(SLO)$/gsf-docprop-vector.obj \
-+    $(SLO)$/gsf-input-textline.obj \
-+    $(SLO)$/gsf-output-iochannel.obj \
-+    $(SLO)$/gsf-infile-msole.obj \
-+    $(SLO)$/gsf-input.obj \
-+    $(SLO)$/gsf-output-memory.obj \
-+    $(SLO)$/gsf-infile-msvba.obj \
-+    $(SLO)$/gsf-libxml.obj \
-+    $(SLO)$/gsf-output-stdio.obj \
-+    $(SLO)$/gsf-infile-stdio.obj \
-+    $(SLO)$/gsf-msole-utils.obj \
-+    $(SLO)$/gsf-output.obj \
-+    $(SLO)$/gsf-infile-tar.obj \
-+    $(SLO)$/gsf-open-pkg-utils.obj \
-+    $(SLO)$/gsf-shared-memory.obj \
-+    $(SLO)$/gsf-infile-zip.obj \
-+    $(SLO)$/gsf-opendoc-utils.obj \
-+    $(SLO)$/gsf-structured-blob.obj \
-+    $(SLO)$/gsf-infile.obj \
-+    $(SLO)$/gsf-outfile-msole.obj \
-+    $(SLO)$/gsf-timestamp.obj \
-+    $(SLO)$/gsf-input-bzip.obj \
-+    $(SLO)$/gsf-outfile-stdio.obj \
-+    $(SLO)$/gsf-utils.obj \
-+    $(SLO)$/gsf-input-gio.obj \
-+    $(SLO)$/gsf-outfile-zip.obj \
-+    $(SLO)$/gsf-zip-utils.obj \
-+    $(SLO)$/gsf-input-gzip.obj \
-+    $(SLO)$/gsf-outfile.obj \
-+    $(SLO)$/version.obj \
-+    $(SLO)$/gsf-input-http.obj \
-+    $(SLO)$/gsf-output-bzip.obj \
-+    $(SLO)$/gsf-input-iochannel.obj \
-+    $(SLO)$/gsf-output-csv.obj
-+
-+# --- Library -----------------------------------
-+
-+SHL1TARGET=	$(TARGET)
-+SHL1OBJS=$(SLOFILES)
-+SHL1STDLIBS=\
-+    libxml2.lib \
-+    gio-2.0.lib \
-+    gmodule-2.0.lib \
-+    gobject-2.0.lib \
-+    glib-2.0.lib \
-+    intl.lib \
-+    zlib.lib \
-+	Advapi32.lib
-+
-+
-+SHL1IMPLIB=	i$(TARGET)
-+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-+
-+DEF1NAME=	$(SHL1TARGET)
-+DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
-+			$(SLB)$/$(TARGET).lib
-+DEFLIB1NAME=$(TARGET)
-+
-+# --- Targets ----------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# --- filter file ------------------------------
-+
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+    @echo CLEAR_THE_FILE	> $@
-+
---- misc/libgsf-1.14.19/gsf/gsf-infile-zip.c
-+++ misc/build/libgsf-1.14.19/gsf/gsf-infile-zip.c
-@@ -30,6 +30,10 @@
- 
- #include <string.h>
- #include <zlib.h>
-+
-+#if defined(Z_PREFIX) && defined(crc32)
-+#undef crc32
-+#endif
- 
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "libgsf:zip"
-
---- misc/libgsf-1.14.19/gsf/gsf-outfile-zip.c
-+++ misc/build/libgsf-1.14.19/gsf/gsf-outfile-zip.c
-@@ -29,6 +29,11 @@
- #include <string.h>
- #include <time.h>
- #include <zlib.h>
-+
-+#if defined(Z_PREFIX) && defined(crc32)
-+#define CRC32_WAS_DEFINED_AS_Z_CRC32
-+#undef crc32
-+#endif
- 
- #undef G_LOG_DOMAIN
- #define G_LOG_DOMAIN "libgsf:zip"
-@@ -345,7 +345,11 @@
- 	zip_header_write (zip);
- 	zip->writing = TRUE;
- 	zip->root->writing = TRUE;
-+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
-+	dirent->crc32 = z_crc32 (0L, Z_NULL, 0);
-+#else
- 	dirent->crc32 = crc32 (0L, Z_NULL, 0);
-+#endif
- 	if (zip->compression_method == GSF_ZIP_DEFLATED) {
- 		if (!zip->stream) {
- 			zip->stream = g_new0 (z_stream, 1);
-@@ -544,7 +544,11 @@
- 			return FALSE;
- 		dirent->csize += num_bytes;
- 	}
-+#if defined(CRC32_WAS_DEFINED_AS_Z_CRC32)
-+	dirent->crc32 = z_crc32 (dirent->crc32, data, num_bytes);
-+#else
- 	dirent->crc32 = crc32 (dirent->crc32, data, num_bytes);
-+#endif
- 	dirent->usize += num_bytes;
- 
- 	return TRUE;
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
deleted file mode 100644
index 684ea56bfa6b..000000000000
--- a/libgsf/makefile.mk
+++ /dev/null
@@ -1,159 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=libgsf
-TARGET=so_libgsf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.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."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-LIBGSFVERSION=1.14.19
-
-TARFILE_NAME=$(PRJNAME)-$(LIBGSFVERSION)
-TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6fbde
-
-.IF "$(OS)" == "WNT"
-PATCH_FILES=libgsf-1.14.19.windows.patch
-
-BUILD_DIR=gsf
-BUILD_ACTION=dmake
-
-ADDITIONAL_FILES=\
-    gsf/makefile.mk \
-    gsf/gsf-config.h
-
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-PATCH_FILES=libgsf-1.14.19.patch
-
-LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
-LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0
-EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 ./configure \
-                 --prefix=/@.__________________________________________________$(EXTRPATH) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" \
-                 --without-python \
-                 --without-bonobo \
-                 --with-bz2 \
-                 --with-gio \
-                 --with-gdk_pixbuf \
-                 --without-gnome-vfs \
-                 --disable-nls \
-                 LIBGSF_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
-                 LIBGSF_LIBS="-lxml2 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
-                 LIBGSF_GIO_LIBS="-lgio-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
-                 GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0"
-                 
-                 
-CONFIGURE_FLAGS=CPPFLAGS="$(EXTRA_CDEFS)"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
-             $(GNUMAKE)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=gsf/.libs/libgsf-1.114.dylib
-.ENDIF
-
-OUT2INC+=gsf/gsf-blob.h
-OUT2INC+=gsf/gsf-input-impl.h
-OUT2INC+=gsf/gsf-outfile.h
-OUT2INC+=gsf/gsf-clip-data.h
-OUT2INC+=gsf/gsf-input-iochannel.h
-OUT2INC+=gsf/gsf-output-bzip.h
-OUT2INC+=gsf/gsf-doc-meta-data.h
-OUT2INC+=gsf/gsf-input-memory.h
-OUT2INC+=gsf/gsf-output-csv.h
-OUT2INC+=gsf/gsf-docprop-vector.h
-OUT2INC+=gsf/gsf-input-proxy.h
-OUT2INC+=gsf/gsf-output-gio.h
-OUT2INC+=gsf/gsf-impl-utils.h
-OUT2INC+=gsf/gsf-input-stdio.h
-OUT2INC+=gsf/gsf-output-gzip.h
-OUT2INC+=gsf/gsf-infile-impl.h
-OUT2INC+=gsf/gsf-input-textline.h
-OUT2INC+=gsf/gsf-output-iconv.h
-OUT2INC+=gsf/gsf-infile-msole.h
-OUT2INC+=gsf/gsf-input.h
-OUT2INC+=gsf/gsf-output-impl.h
-OUT2INC+=gsf/gsf-infile-msvba.h
-OUT2INC+=gsf/gsf-libxml.h
-OUT2INC+=gsf/gsf-output-iochannel.h
-OUT2INC+=gsf/gsf-infile-stdio.h
-OUT2INC+=gsf/gsf-meta-names.h
-OUT2INC+=gsf/gsf-output-memory.h
-OUT2INC+=gsf/gsf-infile-tar.h
-OUT2INC+=gsf/gsf-msole-utils.h
-OUT2INC+=gsf/gsf-output-stdio.h
-OUT2INC+=gsf/gsf-infile-zip.h
-OUT2INC+=gsf/gsf-open-pkg-utils.h
-OUT2INC+=gsf/gsf-output.h
-OUT2INC+=gsf/gsf-infile.h
-OUT2INC+=gsf/gsf-opendoc-utils.h
-OUT2INC+=gsf/gsf-shared-memory.h
-OUT2INC+=gsf/gsf-input-bzip.h
-OUT2INC+=gsf/gsf-outfile-impl.h
-OUT2INC+=gsf/gsf-structured-blob.h
-OUT2INC+=gsf/gsf-input-gio.h
-OUT2INC+=gsf/gsf-outfile-msole.h
-OUT2INC+=gsf/gsf-timestamp.h
-OUT2INC+=gsf/gsf-input-gzip.h
-OUT2INC+=gsf/gsf-outfile-stdio.h
-OUT2INC+=gsf/gsf-utils.h
-OUT2INC+=gsf/gsf-input-http.h
-OUT2INC+=gsf/gsf-outfile-zip.h
-OUT2INC+=gsf/gsf.h
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-
diff --git a/libgsf/prj/build.lst b/libgsf/prj/build.lst
deleted file mode 100644
index f34c003b89e2..000000000000
--- a/libgsf/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-gs	libgsf	: GLIB:glib soltools NULL
-gs	libgsf			    usr1	-	all	gs_mkout NULL
-gs	libgsf			    nmake	-	all	gs_libgsf NULL
diff --git a/libgsf/prj/d.lst b/libgsf/prj/d.lst
deleted file mode 100644
index 04f57626185c..000000000000
--- a/libgsf/prj/d.lst
+++ /dev/null
@@ -1,59 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\libgsf-1
-mkdir: %_DEST%\inc\external\libgsf-1\gsf
-
-..\%__SRC%\inc\gsf-blob.h %_DEST%\inc\external\libgsf-1\gsf\gsf-blob.h
-..\%__SRC%\inc\gsf-input-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-impl.h
-..\%__SRC%\inc\gsf-outfile.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile.h
-..\%__SRC%\inc\gsf-clip-data.h %_DEST%\inc\external\libgsf-1\gsf\gsf-clip-data.h
-..\%__SRC%\inc\gsf-input-iochannel.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-iochannel.h
-..\%__SRC%\inc\gsf-output-bzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-bzip.h
-..\%__SRC%\inc\gsf-doc-meta-data.h %_DEST%\inc\external\libgsf-1\gsf\gsf-doc-meta-data.h
-..\%__SRC%\inc\gsf-input-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-memory.h
-..\%__SRC%\inc\gsf-output-csv.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-csv.h
-..\%__SRC%\inc\gsf-docprop-vector.h %_DEST%\inc\external\libgsf-1\gsf\gsf-docprop-vector.h
-..\%__SRC%\inc\gsf-input-proxy.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-proxy.h
-..\%__SRC%\inc\gsf-output-gio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-gio.h
-..\%__SRC%\inc\gsf-impl-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-impl-utils.h
-..\%__SRC%\inc\gsf-input-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-stdio.h
-..\%__SRC%\inc\gsf-output-gzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-gzip.h
-..\%__SRC%\inc\gsf-infile-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-impl.h
-..\%__SRC%\inc\gsf-input-textline.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-textline.h
-..\%__SRC%\inc\gsf-output-iconv.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-iconv.h
-..\%__SRC%\inc\gsf-infile-msole.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-msole.h
-..\%__SRC%\inc\gsf-input.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input.h
-..\%__SRC%\inc\gsf-output-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-impl.h
-..\%__SRC%\inc\gsf-infile-msvba.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-msvba.h
-..\%__SRC%\inc\gsf-libxml.h %_DEST%\inc\external\libgsf-1\gsf\gsf-libxml.h
-..\%__SRC%\inc\gsf-output-iochannel.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-iochannel.h
-..\%__SRC%\inc\gsf-infile-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-stdio.h
-..\%__SRC%\inc\gsf-meta-names.h %_DEST%\inc\external\libgsf-1\gsf\gsf-meta-names.h
-..\%__SRC%\inc\gsf-output-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-memory.h
-..\%__SRC%\inc\gsf-infile-tar.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-tar.h
-..\%__SRC%\inc\gsf-msole-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-msole-utils.h
-..\%__SRC%\inc\gsf-output-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output-stdio.h
-..\%__SRC%\inc\gsf-infile-zip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile-zip.h
-..\%__SRC%\inc\gsf-open-pkg-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-open-pkg-utils.h
-..\%__SRC%\inc\gsf-output.h %_DEST%\inc\external\libgsf-1\gsf\gsf-output.h
-..\%__SRC%\inc\gsf-infile.h %_DEST%\inc\external\libgsf-1\gsf\gsf-infile.h
-..\%__SRC%\inc\gsf-opendoc-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-opendoc-utils.h
-..\%__SRC%\inc\gsf-shared-memory.h %_DEST%\inc\external\libgsf-1\gsf\gsf-shared-memory.h
-..\%__SRC%\inc\gsf-input-bzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-bzip.h
-..\%__SRC%\inc\gsf-outfile-impl.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-impl.h
-..\%__SRC%\inc\gsf-structured-blob.h %_DEST%\inc\external\libgsf-1\gsf\gsf-structured-blob.h
-..\%__SRC%\inc\gsf-input-gio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-gio.h
-..\%__SRC%\inc\gsf-outfile-msole.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-msole.h
-..\%__SRC%\inc\gsf-timestamp.h %_DEST%\inc\external\libgsf-1\gsf\gsf-timestamp.h
-..\%__SRC%\inc\gsf-input-gzip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-gzip.h
-..\%__SRC%\inc\gsf-outfile-stdio.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-stdio.h
-..\%__SRC%\inc\gsf-utils.h %_DEST%\inc\external\libgsf-1\gsf\gsf-utils.h
-..\%__SRC%\inc\gsf-input-http.h %_DEST%\inc\external\libgsf-1\gsf\gsf-input-http.h
-..\%__SRC%\inc\gsf-outfile-zip.h %_DEST%\inc\external\libgsf-1\gsf\gsf-outfile-zip.h
-..\%__SRC%\inc\gsf.h %_DEST%\inc\external\libgsf-1\gsf\gsf.h
-
-..\%__SRC%\lib\libgsf-1.114.dylib %_DEST%\lib\libgsf-1.114.dylib
-symlink: %_DEST%\lib\libgsf-1.114.dylib %_DEST%\lib\libgsf-1.dylib
-
-..\%__SRC%\bin\gsf-1.dll %_DEST%\bin\gsf-1.dll
-..\%__SRC%\lib\igsf-1.lib %_DEST%\lib\igsf-1.lib
-
diff --git a/libgsf/prj/dmake b/libgsf/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libgsf/prj/dmake
+++ /dev/null
diff --git a/librsvg/ExternalPackage_librsvg.mk b/librsvg/ExternalPackage_librsvg.mk
deleted file mode 100644
index 0337c366c1ce..000000000000
--- a/librsvg/ExternalPackage_librsvg.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,librsvg,rsvg))
-
-$(eval $(call gb_ExternalPackage_use_external_project,librsvg,librsvg))
-
-$(eval $(call gb_ExternalPackage_add_files,librsvg,lib,\
-    .libs/librsvg-2.2.dylib \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk
deleted file mode 100644
index f0bcff604fa8..000000000000
--- a/librsvg/ExternalProject_librsvg.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,librsvg))
-
-$(eval $(call gb_ExternalProject_use_unpacked,librsvg,rsvg))
-
-$(eval $(call gb_ExternalProject_register_targets,librsvg,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,librsvg,build) :
-	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure --disable-gtk-theme --disable-tools --with-croco --with-svgz \
-    --disable-pixbuf-loader --disable-dependency-tracking \
-	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-	LIBCROCO_CFLAGS="-I$(OUTDIR)/inc/external/libcroco-0.6" \
-    LIBCROCO_LIBS="-lcroco-0.6" \
-	GTHREAD_CFLAGS="-I$(OUTDIR)/inc/external/glib-2.0" \
-    GTHREAD_LIBS="-lgthread-2.0" \
-	GDK_PIXBUF_CFLAGS="-I$(OUTDIR)/inc/external/gdk-pixbuf-2.0" \
-    GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0" \
-	LIBRSVG_CFLAGS="-I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS),-I$(OUTDIR)/inc/externel/libxml)" \
-    LIBRSVG_LIBS="-L$(OUTDIR)/lib -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2) -lcairo -lintl" \
-	CFLAGS="-I$(OUTDIR)/inc/external -I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo" \
-	LDFLAGS="$(foreach lib,cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0,-Wl,-dylib_file,@loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter YES,$(SYSTEM_LIBXML)),,-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
-	&& PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH $(MAKE) \
-	&& touch $@
-# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Library_librsvg-2-2.mk b/librsvg/Library_librsvg-2-2.mk
deleted file mode 100644
index 66e1d12b30cf..000000000000
--- a/librsvg/Library_librsvg-2-2.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,librsvg-2-2))
-
-$(eval $(call gb_Library_use_unpacked,librsvg-2-2,rsvg))
-
-$(eval $(call gb_Library_use_externals,librsvg-2-2,\
-	gobject \
-	gio \
-	glib \
-	gthread \
-	cairo \
-	libxml2 \
-	croco \
-	pango \
-	gsf \
-	pixbuf \
-))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_Library_add_ldflags,librsvg-2-2,\
-	/EXPORT:rsvg_init \
-	/EXPORT:rsvg_handle_new_from_data \
-	/EXPORT:rsvg_handle_set_dpi_x_y \
-	/EXPORT:rsvg_handle_get_dimensions \
-	/EXPORT:rsvg_handle_render_cairo \
-))
-endif
-
-$(eval $(call gb_Library_add_defs,librsvg-2-2,\
-	-DHAVE_GSF \
-	-DHAVE_LIBCROCO \
-))
-
-$(eval $(call gb_Library_set_warnings_not_errors,librsvg-2-2))
-
-$(eval $(call gb_Library_add_generated_cobjects,librsvg-2-2,\
-	UnpackedTarball/rsvg/librsvg-enum-types \
-	UnpackedTarball/rsvg/librsvg-features \
-	UnpackedTarball/rsvg/rsvg-affine \
-	UnpackedTarball/rsvg/rsvg-base-file-util \
-	UnpackedTarball/rsvg/rsvg-base \
-	UnpackedTarball/rsvg/rsvg-bpath-util \
-	UnpackedTarball/rsvg/rsvg-cairo-clip \
-	UnpackedTarball/rsvg/rsvg-cairo-draw \
-	UnpackedTarball/rsvg/rsvg-cairo-render \
-	UnpackedTarball/rsvg/rsvg-cond \
-	UnpackedTarball/rsvg/rsvg-convert \
-	UnpackedTarball/rsvg/rsvg-css \
-	UnpackedTarball/rsvg/rsvg-defs \
-	UnpackedTarball/rsvg/rsvg-file-util	\
-	UnpackedTarball/rsvg/rsvg-filter \
-	UnpackedTarball/rsvg/rsvg-gobject \
-	UnpackedTarball/rsvg/rsvg-image \
-	UnpackedTarball/rsvg/rsvg-marker \
-	UnpackedTarball/rsvg/rsvg-mask \
-	UnpackedTarball/rsvg/rsvg-paint-server \
-	UnpackedTarball/rsvg/rsvg-path \
-	UnpackedTarball/rsvg/rsvg-shapes \
-	UnpackedTarball/rsvg/rsvg-structure	\
-	UnpackedTarball/rsvg/rsvg-styles \
-	UnpackedTarball/rsvg/rsvg-text \
-	UnpackedTarball/rsvg/rsvg-xml \
-	UnpackedTarball/rsvg/rsvg \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Makefile b/librsvg/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/librsvg/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Module_librsvg.mk b/librsvg/Module_librsvg.mk
deleted file mode 100644
index 2fe57946bc58..000000000000
--- a/librsvg/Module_librsvg.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,librsvg))
-
-ifeq ($(SYSTEM_LIBRSVG),NO)
-$(eval $(call gb_Module_add_targets,librsvg,\
-	UnpackedTarball_rsvg \
-))
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Module_add_targets,librsvg,\
-	ExternalPackage_librsvg \
-	ExternalProject_librsvg \
-))
-else ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,librsvg,\
-	Library_librsvg-2-2 \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/librsvg/README b/librsvg/README
deleted file mode 100644
index 6b8b64156b5d..000000000000
--- a/librsvg/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Rapid Rendering of SVG files to screen or to other more conventional filetypes, such as JPEG and PNG.
-
-From:
-[http://librsvg.sourceforge.net/]
diff --git a/librsvg/UnpackedTarball_rsvg.mk b/librsvg/UnpackedTarball_rsvg.mk
deleted file mode 100644
index 599af982380f..000000000000
--- a/librsvg/UnpackedTarball_rsvg.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,rsvg))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,rsvg,$(LIBRSVG_TARBALL)))
-
-#$(eval $(call gb_UnpackedTarball_set_patchlevel,rsvg,3))
-
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_UnpackedTarball_add_patches,rsvg,\
-	librsvg/librsvg-2.32.1.patch \
-))
-else ifeq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_patches,rsvg,\
-	librsvg/librsvg-2.32.1-win32.patch \
-))
-$(eval $(call gb_UnpackedTarball_add_files,rsvg,,\
-	librsvg/config.h \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
-\ No newline at end of file
diff --git a/librsvg/config.h b/librsvg/config.h
deleted file mode 100644
index 6e87dac42dbd..000000000000
--- a/librsvg/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#define HAVE_FLOAT_H 1
-/* #undef ENABLE_XEMBED */
-/* #undef HAVE_BASENAME */
-/* #undef HAVE_DLFCN_H */
-#define  HAVE_GIO 1
-/* #undef HAVE_INTTYPES_H */
-/* #undef HAVE_LC_MESSAGES */
-#define HAVE_LOCALE_H 1
-#define HAVE_MEMORY_H 1
-/* #undef HAVE_STDINT_H */
-#define HAVE_STDLIB_H 1
-/* #undef HAVE_STRINGS_H */
-#define HAVE_STRING_H 1
-/* #undef HAVE_STRTOK_R */
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-/* #undef HAVE_UNISTD_H */
-
-#define PACKAGE "librsvg"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME ""
-#define PACKAGE_STRING ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define VERSION "2.32.1"
-#define STDC_HEADERS 1
-#define X_DISPLAY_MISSING 1
-\ No newline at end of file
diff --git a/librsvg/librsvg-2.32.1-win32.patch b/librsvg/librsvg-2.32.1-win32.patch
deleted file mode 100644
index d3a342e8a8f5..000000000000
--- a/librsvg/librsvg-2.32.1-win32.patch
+++ /dev/null
@@ -1,380 +0,0 @@
---- misc/librsvg-2.32.1/librsvg-features.h	2010-11-13 11:52:49.000000000 +0100
-+++ misc/build/librsvg-2.32.1/librsvg-features.h	2011-03-28 16:29:01.357827800 +0200
-@@ -11,7 +11,7 @@
-    (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION > (minor)) || \
-    (LIBRSVG_MAJOR_VERSION == (major) && LIBRSVG_MINOR_VERSION == (minor) && LIBRSVG_MICRO_VERSION >= (micro)))
- 
--#define LIBRSVG_HAVE_SVGZ  (1)
-+#define LIBRSVG_HAVE_SVGZ  (0)
- #define LIBRSVG_HAVE_CSS   (1)
- 
- #define LIBRSVG_CHECK_FEATURE(FEATURE) (defined(LIBRSVG_HAVE_##FEATURE) && LIBRSVG_HAVE_##FEATURE)
---- misc/librsvg-2.32.1/rsvg-image.c	2010-09-27 19:18:35.000000000 +0200
-+++ misc/build/librsvg-2.32.1/rsvg-image.c	2011-03-28 20:14:53.630005800 +0200
-@@ -22,8 +22,8 @@
-    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
- 
--   Authors: Raph Levien <raph@artofcode.com>, 
--            Dom Lachowicz <cinamod@hotmail.com>, 
-+   Authors: Raph Levien <raph@artofcode.com>,
-+            Dom Lachowicz <cinamod@hotmail.com>,
-             Caleb Moore <c.moore@student.unsw.edu.au>
- */
- 
-@@ -34,15 +34,167 @@
- #include <math.h>
- #include <errno.h>
- #include "rsvg-css.h"
-+#ifdef HAVE_GIO
- #include <gio/gio.h>
-+#endif
-+
-+static const char s_UTF8_B64Alphabet[64] = {
-+    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-+    0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a,   /* A-Z */
-+    0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-+    0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a,   /* a-z */
-+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, /* 0-9 */
-+    0x2b,                       /* + */
-+    0x2f                        /* / */
-+};
-+static const char utf8_b64_pad = 0x3d;
-+
-+static gboolean
-+b64_decode_char (char c, int *b64)
-+{
-+    if ((c >= 0x41) && (c <= 0x5a)) {
-+        *b64 = c - 0x41;
-+        return TRUE;
-+    }
-+    if ((c >= 0x61) && (c <= 0x7a)) {
-+        *b64 = c - (0x61 - 26);
-+        return TRUE;
-+    }
-+    if ((c >= 0x30) && (c <= 0x39)) {
-+        *b64 = c + (52 - 0x30);
-+        return TRUE;
-+    }
-+    if (c == 0x2b) {
-+        *b64 = 62;
-+        return TRUE;
-+    }
-+    if (c == 0x2f) {
-+        *b64 = 63;
-+        return TRUE;
-+    }
-+    return FALSE;
-+}
-+
-+static gboolean
-+utf8_base64_decode (guchar ** binptr, size_t * binlen, const char *b64ptr, size_t b64len)
-+{
-+    gboolean decoded = TRUE;
-+    gboolean padding = FALSE;
-+
-+    int i = 0;
-+    glong ucs4_len, j;
-+
-+    unsigned char byte1 = 0;
-+    unsigned char byte2;
-+
-+    gunichar ucs4, *ucs4_str;
-+
-+    if (b64len == 0)
-+        return TRUE;
-+
-+    if ((binptr == 0) || (b64ptr == 0))
-+        return FALSE;
-+
-+    ucs4_str = g_utf8_to_ucs4_fast (b64ptr, b64len, &ucs4_len);
-+
-+    for (j = 0; j < ucs4_len; j++) {
-+        ucs4 = ucs4_str[j];
-+        if ((ucs4 & 0x7f) == ucs4) {
-+            int b64;
-+            char c = (char) (ucs4);
-+
-+            if (b64_decode_char (c, &b64)) {
-+                if (padding || (*binlen == 0)) {
-+                    decoded = FALSE;
-+                    break;
-+                }
-+
-+                switch (i) {
-+                case 0:
-+                    byte1 = (unsigned char) (b64) << 2;
-+                    i++;
-+                    break;
-+                case 1:
-+                    byte2 = (unsigned char) (b64);
-+                    byte1 |= byte2 >> 4;
-+                    *(*binptr)++ = (char) (byte1);
-+                    (*binlen)--;
-+                    byte1 = (byte2 & 0x0f) << 4;
-+                    i++;
-+                    break;
-+                case 2:
-+                    byte2 = (unsigned char) (b64);
-+                    byte1 |= byte2 >> 2;
-+                    *(*binptr)++ = (char) (byte1);
-+                    (*binlen)--;
-+                    byte1 = (byte2 & 0x03) << 6;
-+                    i++;
-+                    break;
-+                default:
-+                    byte1 |= (unsigned char) (b64);
-+                    *(*binptr)++ = (char) (byte1);
-+                    (*binlen)--;
-+                    i = 0;
-+                    break;
-+                }
-+
-+                if (!decoded)
-+                    break;
-+
-+                continue;
-+            } else if (c == utf8_b64_pad) {
-+                switch (i) {
-+                case 0:
-+                case 1:
-+                    decoded = FALSE;
-+                    break;
-+                case 2:
-+                    if (*binlen == 0)
-+                        decoded = FALSE;
-+                    else {
-+                        *(*binptr)++ = (char) (byte1);
-+                        (*binlen)--;
-+                        padding = TRUE;
-+                    }
-+                    i++;
-+                    break;
-+                default:
-+                    if (!padding) {
-+                        if (*binlen == 0)
-+                            decoded = FALSE;
-+                        else {
-+                            *(*binptr)++ = (char) (byte1);
-+                            (*binlen)--;
-+                            padding = TRUE;
-+                        }
-+                    }
-+                    i = 0;
-+                    break;
-+                }
-+                if (!decoded)
-+                    break;
-+
-+                continue;
-+            }
-+        }
-+        if (g_unichar_isspace (ucs4))
-+            continue;
-+
-+        decoded = FALSE;
-+        break;
-+    }
-+
-+    g_free (ucs4_str);
-+    return decoded;
-+}
- 
- static GByteArray *
- rsvg_acquire_base64_resource (const char *data, GError ** error)
- {
--    GByteArray *array = NULL;
--    gsize data_len, written_len;
--    int state = 0;
--    guint save = 0;
-+    GByteArray *array;
-+
-+    guchar *bufptr;
-+    size_t buffer_len, buffer_max_len, data_len;
- 
-     rsvg_return_val_if_fail (data != NULL, NULL, error);
- 
-@@ -51,10 +203,19 @@
-             break;
- 
-     data_len = strlen (data);
--    array = g_byte_array_sized_new (data_len / 4 * 3);
--    written_len = g_base64_decode_step (data, data_len, array->data,
--                                        &state, &save);
--    g_byte_array_set_size (array, written_len);
-+
-+    buffer_max_len = ((data_len >> 2) + 1) * 3;
-+    buffer_len = buffer_max_len;
-+
-+    array = g_byte_array_sized_new (buffer_max_len);
-+    bufptr = array->data;
-+
-+    if (!utf8_base64_decode (&bufptr, &buffer_len, data, data_len)) {
-+        g_byte_array_free (array, TRUE);
-+        return NULL;
-+    }
-+
-+    array->len = buffer_max_len - buffer_len;
- 
-     return array;
- }
-@@ -75,7 +236,7 @@
-             if (base_filename != NULL) {
-                 tmpcdir = g_path_get_dirname (base_filename);
-                 g_free (base_filename);
--            } else 
-+            } else
-                 return NULL;
-         } else
-             tmpcdir = g_get_current_dir ();
-@@ -92,8 +253,10 @@
- {
-     GByteArray *array;
-     gchar *path;
--    gchar *data = NULL;
--    gsize length;
-+
-+    guchar buffer[4096];
-+    int length;
-+    FILE *f;
- 
-     rsvg_return_val_if_fail (filename != NULL, NULL, error);
- 
-@@ -101,20 +264,53 @@
-     if (path == NULL)
-         return NULL;
- 
--    if (!g_file_get_contents (path, &data, &length, error)) {
--        g_free (path);
-+    f = fopen (path, "rb");
-+    g_free (path);
-+
-+    if (!f) {
-+        g_set_error (error,
-+                     G_FILE_ERROR,
-+                     g_file_error_from_errno (errno),
-+                     _("Failed to open file '%s': %s"), filename, g_strerror (errno));
-         return NULL;
-     }
- 
-+    /* TODO: an optimization is to use the file's size */
-     array = g_byte_array_new ();
- 
--    g_byte_array_append (array, (guint8 *)data, length);
--    g_free (data);
--    g_free (path);
-+    while (!feof (f)) {
-+        length = fread (buffer, 1, sizeof (buffer), f);
-+        if (length > 0) {
-+            if (g_byte_array_append (array, buffer, length) == NULL) {
-+                fclose (f);
-+                g_byte_array_free (array, TRUE);
-+                return NULL;
-+            }
-+        } else if (ferror (f)) {
-+            fclose (f);
-+            g_byte_array_free (array, TRUE);
-+            return NULL;
-+        }
-+    }
-+
-+    fclose (f);
- 
-     return array;
- }
- 
-+#ifdef HAVE_GIO
-+
-+static void
-+rsvg_free_error (GError ** err)
-+{
-+        if (err) {
-+                if (*err) {
-+                        g_error_free (*err);
-+                        *err = NULL;
-+                }
-+        }
-+}
-+
- static GByteArray *
- rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError ** error)
- {
-@@ -133,19 +329,19 @@
-         if (base_uri != NULL) {
-             GFile *base;
- 
--            g_clear_error (error);
--
--            g_object_unref (file);
-+                        rsvg_free_error(error);
-+                       
-+                        g_object_unref (file);
- 
-             base = g_file_new_for_uri (base_uri);
-             file = g_file_resolve_relative_path (base, filename);
-             g_object_unref (base);
- 
--            res = g_file_load_contents (file, NULL, &data, &size, NULL, error);
-+                        res = g_file_load_contents (file, NULL, &data, &size, NULL, error);
-         }
-     }
- 
--    g_object_unref (file);
-+        g_object_unref (file);
- 
-     if (res) {
-         array = g_byte_array_new ();
-@@ -158,6 +354,7 @@
- 
-     return array;
- }
-+#endif
- 
- GByteArray *
- _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GError ** err)
-@@ -173,8 +370,10 @@
-     if (!arr)
-         arr = rsvg_acquire_file_resource (href, base_uri, NULL);
- 
-+#ifdef HAVE_GIO
-     if (!arr)
-         arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
-+#endif
- 
-     return arr;
- }
-@@ -274,10 +473,9 @@
-     RsvgNodeImage *z = (RsvgNodeImage *) self;
-     rsvg_state_finalize (z->super.state);
-     g_free (z->super.state);
--    z->super.state = NULL;
-     if (z->img)
--        g_object_unref (z->img);
--    _rsvg_node_free(self);
-+        g_object_unref (G_OBJECT (z->img));
-+    g_free (z);
- }
- 
- static void
-@@ -300,7 +498,7 @@
- 
-     rsvg_push_discrete_layer (ctx);
- 
--    if (!rsvg_current_state (ctx)->overflow && (aspect_ratio & RSVG_ASPECT_RATIO_SLICE)) {
-+    if (!rsvg_current_state(ctx)->overflow && (aspect_ratio & RSVG_ASPECT_RATIO_SLICE)) {
-         rsvg_add_clipping_rect (ctx, x, y, w, h);
-     }
- 
-@@ -357,10 +555,11 @@
-     RsvgNodeImage *image;
-     image = g_new (RsvgNodeImage, 1);
-     _rsvg_node_init (&image->super);
--    g_assert (image->super.state);
-     image->img = NULL;
-     image->preserve_aspect_ratio = RSVG_ASPECT_RATIO_XMID_YMID;
-     image->x = image->y = image->w = image->h = _rsvg_css_parse_length ("0");
-+    image->super.state = g_new (RsvgState, 1);
-+    rsvg_state_init (image->super.state);
-     image->super.free = rsvg_node_image_free;
-     image->super.draw = rsvg_node_image_draw;
-     image->super.set_atts = rsvg_node_image_set_atts;
diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch
deleted file mode 100644
index 2d9fc0fc216a..000000000000
--- a/librsvg/librsvg-2.32.1.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- misc/librsvg-2.32.1/configure	2010-11-13 11:52:19.000000000 +0100
-+++ misc/build/librsvg-2.32.1/configure	2011-03-03 14:28:12.000000000 +0100
-@@ -12288,8 +12288,8 @@
- 
- 
- 
--GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--
-+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+GLIB_MKENUMS=glib-mkenums
- 
- 
- pkg_failed=no
-@@ -12562,6 +12562,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gio 2.24 is available" >&5
- $as_echo_n "checking whether gio 2.24 is available... " >&6; }
-+if false; then
- if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.24.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.24.0") 2>&5
-@@ -12572,6 +12573,9 @@
- else
-   have_gio_2_24=no
- fi
-+else
-+  have_gio_2_24=yes
-+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gio_2_24" >&5
- $as_echo "$have_gio_2_24" >&6; }
- 
-@@ -12695,8 +12699,8 @@
- 
- 
- 
--LIBCROCO_CFLAGS=""
--LIBCROCO_LIBS=""
-+#LIBCROCO_CFLAGS=""
-+#LIBCROCO_LIBS=""
- LIBCROCOPKG=""
- 
- test_croco=true
-@@ -13376,13 +13380,13 @@
- 
- 
- 
--GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
-+#GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
- 
--GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
-+#GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
- 
--GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
-+#GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
- 
--CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
-+#CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
- 
- 
- 
diff --git a/librsvg/prj/build.lst b/librsvg/prj/build.lst
deleted file mode 100644
index a3f12079fbdc..000000000000
--- a/librsvg/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-rg	librsvg	: LIBXML2:libxml2 PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf CAIRO:cairo GDK_PIXBUF:gdk-pixbuf GLIB:glib GETTEXT:gettext soltools NULL
-rg	librsvg\prj			    nmake	-	all	rg_librsvg NULL
diff --git a/librsvg/prj/d.lst b/librsvg/prj/d.lst
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/librsvg/prj/d.lst
+++ /dev/null
diff --git a/ooo.lst.in b/ooo.lst.in
index dc29230b13ad..eb397f704302 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -23,12 +23,6 @@ e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
 e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
-3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
-9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
-a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
-3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
-22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
-0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
@@ -73,7 +67,6 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 @JFREEREPORT_SAC_TARBALL@
 @JPEG_TARBALL@
 @LANGUAGETOOL_TARBALL@
-@LIBRSVG_TARBALL@
 @MDDS_TARBALL@
 @MOZ_TARBALL@
 @MSPUB_TARBALL@
diff --git a/pango/README b/pango/README
deleted file mode 100644
index d80b4501108f..000000000000
--- a/pango/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Pango is a library for layout and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most usage so far as been in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+ 2. Pango is designed to be modular; the core Pango layout can be used with four different font backends: Core X windowing system fonts, Client-side fonts on X using the Xft2 library, Direct rendering of scalable fonts using the FreeType library, Native fonts on Microsoft platforms. Dynamically loaded modules then handle text layout for particular combinations of script and font backend. Pango-1.2 ships with a wide selection of modules, including modules for Hebrew, Arabic, Hangul, Thai, and a number of Indic scripts. Virtually all of the world's major scripts are supported.
-
-As well as the low level layout rendering routines, Pango includes PangoLayout, a high level driver for laying out entire blocks of text, and routines to assist in editing internationalized text.
-\ No newline at end of file
diff --git a/pango/makefile.mk b/pango/makefile.mk
deleted file mode 100644
index 1815b6c1d773..000000000000
--- a/pango/makefile.mk
+++ /dev/null
@@ -1,170 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# 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=pango
-TARGET=so_pango
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_PANGO)" == "YES"
-all:
-	@echo "An already available installation of pango should exist on your system."
-	@echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-PANGOVERSION=1.28.3
-
-TARFILE_NAME=$(PRJNAME)-$(PANGOVERSION)
-TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc
-
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="WNT"
-
-.IF "$(OS)" == "MACOSX"
-
-PATCH_FILES=pango-1.28.3.patch
-
-LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
-LOADER_LIBS:=glib-2.0.0 gthread-2.0.0
-EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 ./configure --prefix=/@.__________________________________________________$(EXTRPATH) --disable-dependency-tracking --disable-doc-cross-references \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS)" \
-                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \
-                 CAIRO_LIBS="-lcairo" \
-                 GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
-                 GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl"
-CONFIGURE_FLAGS=--with-included-modules=yes $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
-CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
-CONFIGURE_ACTION+="--without-x"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-.IF "$(VERBOSE)"!=""
-VFLAG=V=1
-.ENDIF
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=pango/.libs/libpango-1.0.0.dylib
-OUT2LIB+=pango/.libs/libpangocairo-1.0.0.dylib
-
-OUT2BIN_NONE+=pango/.libs/pango-querymodules
-
-OUT2INC+=pango/pango-attributes.h
-OUT2INC+=pango/pango-enum-types.h
-OUT2INC+=pango/pango-glyph.h
-OUT2INC+=pango/pango-modules.h
-OUT2INC+=pango/pango.h
-OUT2INC+=pango/pango-bidi-type.h
-OUT2INC+=pango/pango-features.h
-OUT2INC+=pango/pango-gravity.h
-OUT2INC+=pango/pango-renderer.h
-OUT2INC+=pango/pangoatsui.h
-OUT2INC+=pango/pango-break.h
-OUT2INC+=pango/pango-font.h
-OUT2INC+=pango/pango-item.h
-OUT2INC+=pango/pango-script.h
-OUT2INC+=pango/pangocairo.h
-OUT2INC+=pango/pango-context.h
-OUT2INC+=pango/pango-fontmap.h
-OUT2INC+=pango/pango-language.h
-OUT2INC+=pango/pango-tabs.h
-OUT2INC+=pango/pango-coverage.h
-OUT2INC+=pango/pango-fontset.h
-OUT2INC+=pango/pango-layout.h
-OUT2INC+=pango/pango-types.h
-OUT2INC+=pango/pango-engine.h
-OUT2INC+=pango/pango-glyph-item.h
-OUT2INC+=pango/pango-matrix.h
-OUT2INC+=pango/pango-utils.h
-
-.ELIF "$(OS)"=="WNT"
-
-PATCH_FILES=pango-1.28.3-win32.patch pango-1.28.3-non-ascii.patch
-ADDITIONAL_FILES=config.h msvc_recommended_pragmas.h
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-BUILD_DIR=./pango																																																																																																																										
-BUILD_ACTION=unset debug; nmake -f makefile.msc
-
-OUT2LIB+=pango/pango-1.0.lib
-OUT2LIB+=pango/pangocairo-1.0.lib
-OUT2LIB+=pango/pangowin32-1.0.lib
-
-OUT2BIN+=pango/pangolo.dll
-OUT2BIN+=pango/pangocairolo.dll
-OUT2BIN+=pango/pangowin32lo.dll
-OUT2BIN+=pango/querymodules.exe
-
-OUT2INC+=pango/pango.h
-OUT2INC+=pango/pangocairo.h
-OUT2INC+=pango/pango-attributes.h
-OUT2INC+=pango/pango-bidi-type.h
-OUT2INC+=pango/pango-break.h
-OUT2INC+=pango/pango-context.h
-OUT2INC+=pango/pango-coverage.h
-OUT2INC+=pango/pango-engine.h
-OUT2INC+=pango/pango-enum-types.h
-OUT2INC+=pango/pango-features.h
-OUT2INC+=pango/pango-font.h
-OUT2INC+=pango/pango-fontmap.h
-OUT2INC+=pango/pango-fontset.h
-OUT2INC+=pango/pango-glyph.h
-OUT2INC+=pango/pango-glyph-item.h
-OUT2INC+=pango/pango-gravity.h
-OUT2INC+=pango/pango-item.h
-OUT2INC+=pango/pango-language.h
-OUT2INC+=pango/pango-layout.h
-OUT2INC+=pango/pango-matrix.h
-OUT2INC+=pango/pango-renderer.h
-OUT2INC+=pango/pango-script.h
-OUT2INC+=pango/pango-tabs.h
-OUT2INC+=pango/pango-types.h
-OUT2INC+=pango/pango-utils.h
-
-.ELSE
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/pango/pango-1.28.3-non-ascii.patch b/pango/pango-1.28.3-non-ascii.patch
deleted file mode 100644
index 1a0eccec48e2..000000000000
--- a/pango/pango-1.28.3-non-ascii.patch
+++ /dev/null
@@ -1,528 +0,0 @@
---- misc/pango-1.28.3/pango/pango-language-sample-table.h	2011-08-30 03:35:41.996353700 +0900
-+++ misc/build/pango-1.28.3/pango/pango-language-sample-table.h	2011-08-30 03:33:09.885653400 +0900
-@@ -58,13 +58,13 @@
- LANGUAGE(
- 	 ar	/* Arabic */,
- 	 WP-PANG,
--	 "نص حكيم له سر قاطع وذو شأن عظيم مكتوب على ثوب أخضر ومغلف بجلد أزرق."
-+	 "\xd9""\x86""\xd8""\xb5"" \xd8""\xad""\xd9""\x83""\xd9""\x8a""\xd9""\x85"" \xd9""\x84""\xd9""\x87"" \xd8""\xb3""\xd8""\xb1"" \xd9""\x82""\xd8""\xa7""\xd8""\xb7""\xd8""\xb9"" \xd9""\x88""\xd8""\xb0""\xd9""\x88"" \xd8""\xb4""\xd8""\xa3""\xd9""\x86"" \xd8""\xb9""\xd8""\xb8""\xd9""\x8a""\xd9""\x85"" \xd9""\x85""\xd9""\x83""\xd8""\xaa""\xd9""\x88""\xd8""\xa8"" \xd8""\xb9""\xd9""\x84""\xd9""\x89"" \xd8""\xab""\xd9""\x88""\xd8""\xa8"" \xd8""\xa3""\xd8""\xae""\xd8""\xb6""\xd8""\xb1"" \xd9""\x88""\xd9""\x85""\xd8""\xba""\xd9""\x84""\xd9""\x81"" \xd8""\xa8""\xd8""\xac""\xd9""\x84""\xd8""\xaf"" \xd8""\xa3""\xd8""\xb2""\xd8""\xb1""\xd9""\x82""."
- 	 /* A wise text which has an absolute secret and great importance, written on a green tissue and covered with blue leather. */
- 	)
- LANGUAGE(
- 	 arn	/* Mapudungun */,
- 	 WP-PANG,
--	 "Gvxam mincetu apocikvyeh: ñizol ce mamvj ka raq kuse bafkeh mew."
-+	 "Gvxam mincetu apocikvyeh: \xc3""\xb1""izol ce mamvj ka raq kuse bafkeh mew."
- 	 /* Tale under the full moon: the chief chemamull and the clay old woman at the lake/sea. */
- 	)
- LANGUAGE(
-@@ -76,7 +76,7 @@
- LANGUAGE(
- 	 bg	/* Bulgarian */,
- 	 WP-SFD,
--	 "Под южно дърво, цъфтящо в синьо, бягаше малко пухкаво зайче."
-+	 "\xd0""\x9f""\xd0""\xbe""\xd0""\xb4"" \xd1""\x8e""\xd0""\xb6""\xd0""\xbd""\xd0""\xbe"" \xd0""\xb4""\xd1""\x8a""\xd1""\x80""\xd0""\xb2""\xd0""\xbe"", \xd1""\x86""\xd1""\x8a""\xd1""\x84""\xd1""\x82""\xd1""\x8f""\xd1""\x89""\xd0""\xbe"" \xd0""\xb2"" \xd1""\x81""\xd0""\xb8""\xd0""\xbd""\xd1""\x8c""\xd0""\xbe"", \xd0""\xb1""\xd1""\x8f""\xd0""\xb3""\xd0""\xb0""\xd1""\x88""\xd0""\xb5"" \xd0""\xbc""\xd0""\xb0""\xd0""\xbb""\xd0""\xba""\xd0""\xbe"" \xd0""\xbf""\xd1""\x83""\xd1""\x85""\xd0""\xba""\xd0""\xb0""\xd0""\xb2""\xd0""\xbe"" \xd0""\xb7""\xd0""\xb0""\xd0""\xb9""\xd1""\x87""\xd0""\xb5""."
- 	 /* A little fluffy young rabbit ran under a southern tree blooming in blue */
- 	)
- LANGUAGE(
-@@ -88,37 +88,37 @@
- LANGUAGE(
- 	 bn	/* Bengali */,
- 	 GLASS,
--	 "আমি কাঁচ খেতে পারি, তাতে আমার কোনো ক্ষতি হয় না।"
-+	 "\xe0""\xa6""\x86""\xe0""\xa6""\xae""\xe0""\xa6""\xbf"" \xe0""\xa6""\x95""\xe0""\xa6""\xbe""\xe0""\xa6""\x81""\xe0""\xa6""\x9a"" \xe0""\xa6""\x96""\xe0""\xa7""\x87""\xe0""\xa6""\xa4""\xe0""\xa7""\x87"" \xe0""\xa6""\xaa""\xe0""\xa6""\xbe""\xe0""\xa6""\xb0""\xe0""\xa6""\xbf"", \xe0""\xa6""\xa4""\xe0""\xa6""\xbe""\xe0""\xa6""\xa4""\xe0""\xa7""\x87"" \xe0""\xa6""\x86""\xe0""\xa6""\xae""\xe0""\xa6""\xbe""\xe0""\xa6""\xb0"" \xe0""\xa6""\x95""\xe0""\xa7""\x8b""\xe0""\xa6""\xa8""\xe0""\xa7""\x8b"" \xe0""\xa6""\x95""\xe0""\xa7""\x8d""\xe0""\xa6""\xb7""\xe0""\xa6""\xa4""\xe0""\xa6""\xbf"" \xe0""\xa6""\xb9""\xe0""\xa7""\x9f"" \xe0""\xa6""\xa8""\xe0""\xa6""\xbe""\xe0""\xa5""\xa4"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 bo	/* Tibetan */,
- 	 GLASS,
--	 "ཤེལ་སྒོ་ཟ་ནས་ང་ན་གི་མ་རེད།"
-+	 "\xe0""\xbd""\xa4""\xe0""\xbd""\xba""\xe0""\xbd""\xa3""\xe0""\xbc""\x8b""\xe0""\xbd""\xa6""\xe0""\xbe""\x92""\xe0""\xbd""\xbc""\xe0""\xbc""\x8b""\xe0""\xbd""\x9f""\xe0""\xbc""\x8b""\xe0""\xbd""\x93""\xe0""\xbd""\xa6""\xe0""\xbc""\x8b""\xe0""\xbd""\x84""\xe0""\xbc""\x8b""\xe0""\xbd""\x93""\xe0""\xbc""\x8b""\xe0""\xbd""\x82""\xe0""\xbd""\xb2""\xe0""\xbc""\x8b""\xe0""\xbd""\x98""\xe0""\xbc""\x8b""\xe0""\xbd""\xa2""\xe0""\xbd""\xba""\xe0""\xbd""\x91""\xe0""\xbc""\x8d"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 bs	/* Bosnian */,
- 	 WP-PANG,
--	 "Fin džip, gluh jež i čvrst konjić dođoše bez moljca."
-+	 "Fin d\xc5""\xbe""ip, gluh je\xc5""\xbe"" i \xc4""\x8d""vrst konji\xc4""\x87"" do\xc4""\x91""o\xc5""\xa1""e bez moljca."
- 	 /* A nice jeep, a deaf hedgehog and a tough horse came without a moth. */
- 	)
- LANGUAGE(
- 	 ca	/* Catalan */,
- 	 WP-PANG,
--	 "Jove xef, porti whisky amb quinze glaçons d'hidrogen, coi!"
-+	 "Jove xef, porti whisky amb quinze gla\xc3""\xa7""ons d'hidrogen, coi!"
- 	 /* Young chef, bring whisky with fifteen hydrogen ice cubes, damn! */
- 	)
- LANGUAGE(
- 	 ch	/* Chamorro */,
- 	 GLASS,
--	 "Siña yo' chumocho krestat, ti ha na'lalamen yo'."
-+	 "Si\xc3""\xb1""a yo' chumocho krestat, ti ha na'lalamen yo'."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 cs	/* Czech */,
- 	 WP-SFD,
--	 "Příliš žluťoučký kůň úpěl ďábelské ódy."
-+	 "P\xc5""\x99""\xc3""\xad""li\xc5""\xa1"" \xc5""\xbe""lu\xc5""\xa5""ou\xc4""\x8d""k\xc3""\xbd"" k\xc5""\xaf""\xc5""\x88"" \xc3""\xba""p\xc4""\x9b""l \xc4""\x8f""\xc3""\xa1""belsk\xc3""\xa9"" \xc3""\xb3""dy."
- 	 /* A too yellow horse moaned devil odes. */
- 	)
- LANGUAGE(
-@@ -130,19 +130,19 @@
- LANGUAGE(
- 	 da	/* Danish */,
- 	 WP-SFD,
--	 "Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon."
-+	 "Quizdeltagerne spiste jordb\xc3""\xa6""r med fl\xc3""\xb8""de, mens cirkusklovnen Walther spillede p\xc3""\xa5"" xylofon."
- 	 /* The quiz contestants ate strawberries with cream while Walther the clown was playing the xylophone. */
- 	)
- LANGUAGE(
- 	 de	/* German */,
- 	 WP-SFD,
--	 "Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich."
-+	 "Zw\xc3""\xb6""lf Boxk\xc3""\xa4""mpfer jagen Viktor quer \xc3""\xbc""ber den gro\xc3""\x9f""en Sylter Deich."
- 	 /* Twelve boxing fighters drive Viktor over the great. */
- 	)
- LANGUAGE(
- 	 el	/* Greek */,
- 	 WP-SFD,
--	 "Θέλει αρετή και τόλμη η ελευθερία. (Ανδρέας Κάλβος)"
-+	 "\xce""\x98""\xce""\xad""\xce""\xbb""\xce""\xb5""\xce""\xb9"" \xce""\xb1""\xcf""\x81""\xce""\xb5""\xcf""\x84""\xce""\xae"" \xce""\xba""\xce""\xb1""\xce""\xb9"" \xcf""\x84""\xcf""\x8c""\xce""\xbb""\xce""\xbc""\xce""\xb7"" \xce""\xb7"" \xce""\xb5""\xce""\xbb""\xce""\xb5""\xcf""\x85""\xce""\xb8""\xce""\xb5""\xcf""\x81""\xce""\xaf""\xce""\xb1"". (\xce""\x91""\xce""\xbd""\xce""\xb4""\xcf""\x81""\xce""\xad""\xce""\xb1""\xcf""\x82"" \xce""\x9a""\xce""\xac""\xce""\xbb""\xce""\xb2""\xce""\xbf""\xcf""\x82"")"
- 	 /* Liberty requires virtue and mettle. (Andreas Kalvos) */
- 	)
- LANGUAGE(
-@@ -153,25 +153,25 @@
- LANGUAGE(
- 	 enm	/* Middle English */,
- 	 GLASS,
--	 "Ich canne glas eten and hit hirtiþ me nouȝt."
-+	 "Ich canne glas eten and hit hirti\xc3""\xbe"" me nou\xc8""\x9d""t."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 eo	/* Esperanto */,
- 	 WP-SFD,
--	 "Eĥoŝanĝo ĉiuĵaŭde."
-+	 "E\xc4""\xa5""o\xc5""\x9d""an\xc4""\x9d""o \xc4""\x89""iu\xc4""\xb5""a\xc5""\xad""de."
- 	 /* Change of echo every Thursday. */
- 	)
- LANGUAGE(
- 	 es	/* Spanish */,
- 	 WP-PANG,
--	 "Jovencillo emponzoñado de whisky: ¡qué figurota exhibe!"
--	 /* Whisky-intoxicated youngster — what a figure he's showing! */
-+	 "Jovencillo emponzo\xc3""\xb1""ado de whisky: \xc2""\xa1""qu\xc3""\xa9"" figurota exhibe!"
-+	 /* Whisky-intoxicated youngster \xe2""\x80""\x94"" what a figure he's showing! */
- 	)
- LANGUAGE(
- 	 et	/* Estonian */,
- 	 WP-SFD,
--	 "See väike mölder jõuab rongile hüpata."
-+	 "See v\xc3""\xa4""ike m\xc3""\xb6""lder j\xc3""\xb5""uab rongile h\xc3""\xbc""pata."
- 	 /* This small miller is able to jump on the train. */
- 	)
- LANGUAGE(
-@@ -183,7 +183,7 @@
- LANGUAGE(
- 	 fa	/* Persian */,
- 	 MISC	/* Behdad Esfahbod (#548730) */,
--	 "«الا یا اَیُّها السّاقی! اَدِرْ کَأساً وَ ناوِلْها!» که عشق آسان نمود اوّل، ولی افتاد مشکل‌ها!"
-+	 "\xc2""\xab""\xd8""\xa7""\xd9""\x84""\xd8""\xa7"" \xdb""\x8c""\xd8""\xa7"" \xd8""\xa7""\xd9""\x8e""\xdb""\x8c""\xd9""\x91""\xd9""\x8f""\xd9""\x87""\xd8""\xa7"" \xd8""\xa7""\xd9""\x84""\xd8""\xb3""\xd9""\x91""\xd8""\xa7""\xd9""\x82""\xdb""\x8c""! \xd8""\xa7""\xd9""\x8e""\xd8""\xaf""\xd9""\x90""\xd8""\xb1""\xd9""\x92"" \xda""\xa9""\xd9""\x8e""\xd8""\xa7""\xd9""\x94""\xd8""\xb3""\xd8""\xa7""\xd9""\x8b"" \xd9""\x88""\xd9""\x8e"" \xd9""\x86""\xd8""\xa7""\xd9""\x88""\xd9""\x90""\xd9""\x84""\xd9""\x92""\xd9""\x87""\xd8""\xa7""!\xc2""\xbb"" \xda""\xa9""\xd9""\x87"" \xd8""\xb9""\xd8""\xb4""\xd9""\x82"" \xd8""\xa2""\xd8""\xb3""\xd8""\xa7""\xd9""\x86"" \xd9""\x86""\xd9""\x85""\xd9""\x88""\xd8""\xaf"" \xd8""\xa7""\xd9""\x88""\xd9""\x91""\xd9""\x84""\xd8""\x8c"" \xd9""\x88""\xd9""\x84""\xdb""\x8c"" \xd8""\xa7""\xd9""\x81""\xd8""\xaa""\xd8""\xa7""\xd8""\xaf"" \xd9""\x85""\xd8""\xb4""\xda""\xa9""\xd9""\x84""\xe2""\x80""\x8c""\xd9""\x87""\xd8""\xa7""!"
- 	)
- LANGUAGE(
- 	 fi	/* Finnish */,
-@@ -194,7 +194,7 @@
- LANGUAGE(
- 	 fr	/* French */,
- 	 MISC	/* Vincent Untz (#549520) http://fr.wikipedia.org/wiki/Pangramme */,
--	 "Voix ambiguë d'un cœur qui, au zéphyr, préfère les jattes de kiwis."
-+	 "Voix ambigu\xc3""\xab"" d'un c\xc5""\x93""ur qui, au z\xc3""\xa9""phyr, pr\xc3""\xa9""f\xc3""\xa8""re les jattes de kiwis."
- 	 /* Ambiguous voice of a heart that, in the wind, prefers bowls of kiwis. */
- 	)
- LANGUAGE(
-@@ -206,7 +206,7 @@
- LANGUAGE(
- 	 ga	/* Irish */,
- 	 WP-PANG,
--	 "D'ḟuascail Íosa Úrṁac na hÓiġe Beannaiṫe pór Éaḃa agus Áḋaiṁ."
-+	 "D'\xe1""\xb8""\x9f""uascail \xc3""\x8d""osa \xc3""\x9a""r\xe1""\xb9""\x81""ac na h\xc3""\x93""i\xc4""\xa1""e Beannai\xe1""\xb9""\xab""e p\xc3""\xb3""r \xc3""\x89""a\xe1""\xb8""\x83""a agus \xc3""\x81""\xe1""\xb8""\x8b""ai\xe1""\xb9""\x81""."
- 	 /* Jesus, Son of the blessed Virgin, redeemed the seed of Eve and Adam. */
- 	)
- LANGUAGE(
-@@ -224,7 +224,7 @@
- LANGUAGE(
- 	 got	/* Gothic */,
- 	 GLASS,
--	 "𐌼𐌰𐌲 𐌲𐌻𐌴𐍃 𐌹̈𐍄𐌰𐌽, 𐌽𐌹 𐌼𐌹𐍃 𐍅𐌿 𐌽𐌳𐌰𐌽 𐌱𐍂𐌹𐌲𐌲𐌹𐌸."
-+	 "\xf0""\x90""\x8c""\xbc""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xb2"" \xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xbb""\xf0""\x90""\x8c""\xb4""\xf0""\x90""\x8d""\x83"" \xf0""\x90""\x8c""\xb9""\xcc""\x88""\xf0""\x90""\x8d""\x84""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xbd"", \xf0""\x90""\x8c""\xbd""\xf0""\x90""\x8c""\xb9"" \xf0""\x90""\x8c""\xbc""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8d""\x83"" \xf0""\x90""\x8d""\x85""\xf0""\x90""\x8c""\xbf"" \xf0""\x90""\x8c""\xbd""\xf0""\x90""\x8c""\xb3""\xf0""\x90""\x8c""\xb0""\xf0""\x90""\x8c""\xbd"" \xf0""\x90""\x8c""\xb1""\xf0""\x90""\x8d""\x82""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xb2""\xf0""\x90""\x8c""\xb9""\xf0""\x90""\x8c""\xb8""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
-@@ -236,19 +236,19 @@
- LANGUAGE(
- 	 haw	/* Hawaiian */,
- 	 GLASS,
--	 "Hiki iaʻu ke ʻai i ke aniani; ʻaʻole nō lā au e ʻeha."
-+	 "Hiki ia\xca""\xbb""u ke \xca""\xbb""ai i ke aniani; \xca""\xbb""a\xca""\xbb""ole n\xc5""\x8d"" l\xc4""\x81"" au e \xca""\xbb""eha."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 he	/* Hebrew */,
- 	 WP-SFD,
--	 "דג סקרן שט לו בים זך אך לפתע פגש חבורה נחמדה שצצה כך."
-+	 "\xd7""\x93""\xd7""\x92"" \xd7""\xa1""\xd7""\xa7""\xd7""\xa8""\xd7""\x9f"" \xd7""\xa9""\xd7""\x98"" \xd7""\x9c""\xd7""\x95"" \xd7""\x91""\xd7""\x99""\xd7""\x9d"" \xd7""\x96""\xd7""\x9a"" \xd7""\x90""\xd7""\x9a"" \xd7""\x9c""\xd7""\xa4""\xd7""\xaa""\xd7""\xa2"" \xd7""\xa4""\xd7""\x92""\xd7""\xa9"" \xd7""\x97""\xd7""\x91""\xd7""\x95""\xd7""\xa8""\xd7""\x94"" \xd7""\xa0""\xd7""\x97""\xd7""\x9e""\xd7""\x93""\xd7""\x94"" \xd7""\xa9""\xd7""\xa6""\xd7""\xa6""\xd7""\x94"" \xd7""\x9b""\xd7""\x9a""."
- 	 /* A curious fish sailed a clear sea, and suddenly found nice company that just popped up. */
- 	)
- LANGUAGE(
- 	 hi	/* Hindi */,
- 	 MISC	/* G Karunakar (#549532) */,
--	 "नहीं नजर किसी की बुरी नहीं किसी का मुँह काला जो करे सो उपर वाला"
-+	 "\xe0""\xa4""\xa8""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""\xe0""\xa4""\x82"" \xe0""\xa4""\xa8""\xe0""\xa4""\x9c""\xe0""\xa4""\xb0"" \xe0""\xa4""\x95""\xe0""\xa4""\xbf""\xe0""\xa4""\xb8""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa5""\x80"" \xe0""\xa4""\xac""\xe0""\xa5""\x81""\xe0""\xa4""\xb0""\xe0""\xa5""\x80"" \xe0""\xa4""\xa8""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""\xe0""\xa4""\x82"" \xe0""\xa4""\x95""\xe0""\xa4""\xbf""\xe0""\xa4""\xb8""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe"" \xe0""\xa4""\xae""\xe0""\xa5""\x81""\xe0""\xa4""\x81""\xe0""\xa4""\xb9"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"" \xe0""\xa4""\x9c""\xe0""\xa5""\x8b"" \xe0""\xa4""\x95""\xe0""\xa4""\xb0""\xe0""\xa5""\x87"" \xe0""\xa4""\xb8""\xe0""\xa5""\x8b"" \xe0""\xa4""\x89""\xe0""\xa4""\xaa""\xe0""\xa4""\xb0"" \xe0""\xa4""\xb5""\xe0""\xa4""\xbe""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"""
- 	 /* its not in the sight or the face, but its all in god's grace. */
- 	)
- LANGUAGE(
-@@ -260,19 +260,19 @@
- LANGUAGE(
- 	 hu	/* Hungarian */,
- 	 WP-SFD,
--	 "Egy hűtlen vejét fülöncsípő, dühös mexikói úr Wesselényinél mázol Quitóban."
--	 /* An angry Mexican man, who caught his faithless son-in-law, is painting Wesselényi's house in Quito. */
-+	 "Egy h\xc5""\xb1""tlen vej\xc3""\xa9""t f\xc3""\xbc""l\xc3""\xb6""ncs\xc3""\xad""p\xc5""\x91"", d\xc3""\xbc""h\xc3""\xb6""s mexik\xc3""\xb3""i \xc3""\xba""r Wessel\xc3""\xa9""nyin\xc3""\xa9""l m\xc3""\xa1""zol Quit\xc3""\xb3""ban."
-+	 /* An angry Mexican man, who caught his faithless son-in-law, is painting Wessel\xc3""\xa9""nyi's house in Quito. */
- 	)
- LANGUAGE(
- 	 hy	/* Armenian */,
- 	 GLASS,
--	 "Կրնամ ապակի ուտել և ինծի անհանգիստ չըներ։"
-+	 "\xd4""\xbf""\xd6""\x80""\xd5""\xb6""\xd5""\xa1""\xd5""\xb4"" \xd5""\xa1""\xd5""\xba""\xd5""\xa1""\xd5""\xaf""\xd5""\xab"" \xd5""\xb8""\xd6""\x82""\xd5""\xbf""\xd5""\xa5""\xd5""\xac"" \xd6""\x87"" \xd5""\xab""\xd5""\xb6""\xd5""\xae""\xd5""\xab"" \xd5""\xa1""\xd5""\xb6""\xd5""\xb0""\xd5""\xa1""\xd5""\xb6""\xd5""\xa3""\xd5""\xab""\xd5""\xbd""\xd5""\xbf"" \xd5""\xb9""\xd5""\xa8""\xd5""\xb6""\xd5""\xa5""\xd6""\x80""\xd6""\x89"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 is	/* Icelandic */,
- 	 WP-PANG,
--	 "Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa"
-+	 "K\xc3""\xa6""mi n\xc3""\xbd"" \xc3""\xb6""xi h\xc3""\xa9""r ykist \xc3""\xbe""j\xc3""\xb3""fum n\xc3""\xba"" b\xc3""\xa6""\xc3""\xb0""i v\xc3""\xad""l og \xc3""\xa1""drepa"
- 	 /* If a new axe were here, thieves would feel increasing deterrence and punishment. */
- 	)
- LANGUAGE(
-@@ -284,7 +284,7 @@
- LANGUAGE(
- 	 ja	/* Japanese */,
- 	 KERMIT,
--	 "いろはにほへと ちりぬるを 色は匂へど 散りぬるを"
-+	 "\xe3""\x81""\x84""\xe3""\x82""\x8d""\xe3""\x81""\xaf""\xe3""\x81""\xab""\xe3""\x81""\xbb""\xe3""\x81""\xb8""\xe3""\x81""\xa8"" \xe3""\x81""\xa1""\xe3""\x82""\x8a""\xe3""\x81""\xac""\xe3""\x82""\x8b""\xe3""\x82""\x92"" \xe8""\x89""\xb2""\xe3""\x81""\xaf""\xe5""\x8c""\x82""\xe3""\x81""\xb8""\xe3""\x81""\xa9"" \xe6""\x95""\xa3""\xe3""\x82""\x8a""\xe3""\x81""\xac""\xe3""\x82""\x8b""\xe3""\x82""\x92"""
- 	)
- LANGUAGE(
- 	 jam	/* Jamaican Creole English */,
-@@ -306,19 +306,19 @@
- LANGUAGE(
- 	 ka	/* Georgian */,
- 	 GLASS,
--	 "მინას ვჭამ და არა მტკივა."
-+	 "\xe1""\x83""\x9b""\xe1""\x83""\x98""\xe1""\x83""\x9c""\xe1""\x83""\x90""\xe1""\x83""\xa1"" \xe1""\x83""\x95""\xe1""\x83""\xad""\xe1""\x83""\x90""\xe1""\x83""\x9b"" \xe1""\x83""\x93""\xe1""\x83""\x90"" \xe1""\x83""\x90""\xe1""\x83""\xa0""\xe1""\x83""\x90"" \xe1""\x83""\x9b""\xe1""\x83""\xa2""\xe1""\x83""\x99""\xe1""\x83""\x98""\xe1""\x83""\x95""\xe1""\x83""\x90""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 ko	/* Korean */,
- 	 WP-SFD,
--	 "다람쥐 헌 쳇바퀴에 타고파"
-+	 "\xeb""\x8b""\xa4""\xeb""\x9e""\x8c""\xec""\xa5""\x90"" \xed""\x97""\x8c"" \xec""\xb3""\x87""\xeb""\xb0""\x94""\xed""\x80""\xb4""\xec""\x97""\x90"" \xed""\x83""\x80""\xea""\xb3""\xa0""\xed""\x8c""\x8c"""
- 	 /* I Wanna ride on the chipmunk's old hamster wheel. */
- 	)
- LANGUAGE(
- 	 kw	/* Cornish */,
- 	 GLASS,
--	 "Mý a yl dybry gwéder hag éf ny wra ow ankenya."
-+	 "M\xc3""\xbd"" a yl dybry gw\xc3""\xa9""der hag \xc3""\xa9""f ny wra ow ankenya."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
-@@ -329,37 +329,37 @@
- LANGUAGE(
- 	 lt	/* Lithuanian */,
- 	 WP-PANG,
--	 "Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą."
-+	 "\xc4""\xae""linkdama fechtuotojo \xc5""\xa1""paga sublyk\xc4""\x8d""iojusi pragr\xc4""\x99""\xc5""\xbe""\xc4""\x97"" apval\xc5""\xb3"" arb\xc5""\xab""z\xc4""\x85""."
- 	 /* Incurving fencer sword sparkled and perforated a round watermelon. */
- 	)
- LANGUAGE(
- 	 lv	/* Latvian */,
- 	 WP-SFD,
--	 "Sarkanās jūrascūciņas peld pa jūru."
-+	 "Sarkan\xc4""\x81""s j\xc5""\xab""rasc\xc5""\xab""ci\xc5""\x86""as peld pa j\xc5""\xab""ru."
- 	 /* Red seapigs swim in the sea. */
- 	)
- LANGUAGE(
- 	 map	/* Marquesan */,
- 	 GLASS,
--	 "E koʻana e kai i te karahi, mea ʻā, ʻaʻe hauhau."
-+	 "E ko\xca""\xbb""ana e kai i te karahi, mea \xca""\xbb""\xc4""\x81"", \xca""\xbb""a\xca""\xbb""e hauhau."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 mk	/* Macedonian */,
- 	 GLASS,
--	 "Можам да јадам стакло, а не ме штета."
-+	 "\xd0""\x9c""\xd0""\xbe""\xd0""\xb6""\xd0""\xb0""\xd0""\xbc"" \xd0""\xb4""\xd0""\xb0"" \xd1""\x98""\xd0""\xb0""\xd0""\xb4""\xd0""\xb0""\xd0""\xbc"" \xd1""\x81""\xd1""\x82""\xd0""\xb0""\xd0""\xba""\xd0""\xbb""\xd0""\xbe"", \xd0""\xb0"" \xd0""\xbd""\xd0""\xb5"" \xd0""\xbc""\xd0""\xb5"" \xd1""\x88""\xd1""\x82""\xd0""\xb5""\xd1""\x82""\xd0""\xb0""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 mn	/* Mongolian */,
- 	 GLASS,
--	 "ᠪᠢ ᠰᠢᠯᠢ ᠢᠳᠡᠶᠦ ᠴᠢᠳᠠᠨᠠ ᠂ ᠨᠠᠳᠤᠷ ᠬᠣᠤᠷᠠᠳᠠᠢ ᠪᠢᠰᠢ"
-+	 "\xe1""\xa0""\xaa""\xe1""\xa0""\xa2"" \xe1""\xa0""\xb0""\xe1""\xa0""\xa2""\xe1""\xa0""\xaf""\xe1""\xa0""\xa2"" \xe1""\xa0""\xa2""\xe1""\xa0""\xb3""\xe1""\xa0""\xa1""\xe1""\xa0""\xb6""\xe1""\xa0""\xa6"" \xe1""\xa0""\xb4""\xe1""\xa0""\xa2""\xe1""\xa0""\xb3""\xe1""\xa0""\xa0""\xe1""\xa0""\xa8""\xe1""\xa0""\xa0"" \xe1""\xa0""\x82"" \xe1""\xa0""\xa8""\xe1""\xa0""\xa0""\xe1""\xa0""\xb3""\xe1""\xa0""\xa4""\xe1""\xa0""\xb7"" \xe1""\xa0""\xac""\xe1""\xa0""\xa3""\xe1""\xa0""\xa4""\xe1""\xa0""\xb7""\xe1""\xa0""\xa0""\xe1""\xa0""\xb3""\xe1""\xa0""\xa0""\xe1""\xa0""\xa2"" \xe1""\xa0""\xaa""\xe1""\xa0""\xa2""\xe1""\xa0""\xb0""\xe1""\xa0""\xa2"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 mr	/* Marathi */,
- 	 GLASS,
--	 "मी काच खाऊ शकतो, मला ते दुखत नाही."
-+	 "\xe0""\xa4""\xae""\xe0""\xa5""\x80"" \xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\x9a"" \xe0""\xa4""\x96""\xe0""\xa4""\xbe""\xe0""\xa4""\x8a"" \xe0""\xa4""\xb6""\xe0""\xa4""\x95""\xe0""\xa4""\xa4""\xe0""\xa5""\x8b"", \xe0""\xa4""\xae""\xe0""\xa4""\xb2""\xe0""\xa4""\xbe"" \xe0""\xa4""\xa4""\xe0""\xa5""\x87"" \xe0""\xa4""\xa6""\xe0""\xa5""\x81""\xe0""\xa4""\x96""\xe0""\xa4""\xa4"" \xe0""\xa4""\xa8""\xe0""\xa4""\xbe""\xe0""\xa4""\xb9""\xe0""\xa5""\x80""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
-@@ -375,9 +375,9 @@
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
--	 nb	/* Norwegian Bokmål */,
-+	 nb	/* Norwegian Bokm\xc3""\xa5""l */,
- 	 GSPECI,
--	 "Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi."
-+	 "V\xc3""\xa5""r s\xc3""\xa6""re Zulu fra bade\xc3""\xb8""ya spilte jo whist og quickstep i min taxi."
- 	)
- LANGUAGE(
- 	 nl	/* Dutch */,
-@@ -388,66 +388,66 @@
- LANGUAGE(
- 	 nn	/* Norwegian Nynorsk */,
- 	 GLASS,
--	 "Eg kan eta glas utan å skada meg."
-+	 "Eg kan eta glas utan \xc3""\xa5"" skada meg."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
--	 no	/* Norwegian Bokmål */,
-+	 no	/* Norwegian Bokm\xc3""\xa5""l */,
- 	 GSPECI,
--	 "Vår sære Zulu fra badeøya spilte jo whist og quickstep i min taxi."
-+	 "V\xc3""\xa5""r s\xc3""\xa6""re Zulu fra bade\xc3""\xb8""ya spilte jo whist og quickstep i min taxi."
- 	)
- LANGUAGE(
- 	 nv	/* Navajo */,
- 	 GLASS,
--	 "Tsésǫʼ yishą́ągo bííníshghah dóó doo shił neezgai da."
-+	 "Ts\xc3""\xa9""s\xc7""\xab""\xca""\xbc"" yish\xc4""\x85""\xcc""\x81""\xc4""\x85""go b\xc3""\xad""\xc3""\xad""n\xc3""\xad""shghah d\xc3""\xb3""\xc3""\xb3"" doo shi\xc5""\x82"" neezgai da."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 oc	/* Occitan */,
- 	 GLASS,
--	 "Pòdi manjar de veire, me nafrariá pas."
-+	 "P\xc3""\xb2""di manjar de veire, me nafrari\xc3""\xa1"" pas."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 pcd	/* Picard */,
- 	 GLASS,
--	 "Ch'peux mingi du verre, cha m'foé mie n'ma."
-+	 "Ch'peux mingi du verre, cha m'fo\xc3""\xa9"" mie n'ma."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 pl	/* Polish */,
- 	 WP-SFD,
--	 "Pchnąć w tę łódź jeża lub ośm skrzyń fig."
-+	 "Pchn\xc4""\x85""\xc4""\x87"" w t\xc4""\x99"" \xc5""\x82""\xc3""\xb3""d\xc5""\xba"" je\xc5""\xbc""a lub o\xc5""\x9b""m skrzy\xc5""\x84"" fig."
- 	 /* Push into this boat a hedgehog or eight boxes of figs. */
- 	)
- LANGUAGE(
- 	 pt	/* Portuguese */,
- 	 WP-SFD,
--	 "Vejam a bruxa da raposa Salta-Pocinhas e o cão feliz que dorme regalado."
-+	 "Vejam a bruxa da raposa Salta-Pocinhas e o c\xc3""\xa3""o feliz que dorme regalado."
- 	 /* Watch the witch of the Jump-Puddles fox and the happy dog that sleeps delighted. */
- 	)
- LANGUAGE(
- 	 pt-br	/* Brazilian Portuguese */,
- 	 WP-PANG,
--	 "À noite, vovô Kowalsky vê o ímã cair no pé do pingüim queixoso e vovó põe açúcar no chá de tâmaras do jabuti feliz."
-+	 "\xc3""\x80"" noite, vov\xc3""\xb4"" Kowalsky v\xc3""\xaa"" o \xc3""\xad""m\xc3""\xa3"" cair no p\xc3""\xa9"" do ping\xc3""\xbc""im queixoso e vov\xc3""\xb3"" p\xc3""\xb5""e a\xc3""\xa7""\xc3""\xba""car no ch\xc3""\xa1"" de t\xc3""\xa2""maras do jabuti feliz."
- 	 /* At night, grandpa Kowalsky sees the magnet falling in the complaining penguin's foot and grandma puts sugar in the happy tortoise's date tea.*/
- 	)
- LANGUAGE(
- 	 ro	/* Romanian */,
- 	 MISC	/* Misu Moldovan (#552993) */,
--	 "Fumegând hipnotic sașiul azvârle mreje în bălți."
-+	 "Fumeg\xc3""\xa2""nd hipnotic sa\xc8""\x99""iul azv\xc3""\xa2""rle mreje \xc3""\xae""n b\xc4""\x83""l\xc8""\x9b""i."
- 	 /* Hypnotically smoking, the cross-eyed man throws fishing nets into ponds. */
- 	)
- LANGUAGE(
- 	 ru	/* Russian */,
- 	 WP-PANG,
--	 "В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!"
-+	 "\xd0""\x92"" \xd1""\x87""\xd0""\xb0""\xd1""\x89""\xd0""\xb0""\xd1""\x85"" \xd1""\x8e""\xd0""\xb3""\xd0""\xb0"" \xd0""\xb6""\xd0""\xb8""\xd0""\xbb"" \xd0""\xb1""\xd1""\x8b"" \xd1""\x86""\xd0""\xb8""\xd1""\x82""\xd1""\x80""\xd1""\x83""\xd1""\x81""? \xd0""\x94""\xd0""\xb0"", \xd0""\xbd""\xd0""\xbe"" \xd1""\x84""\xd0""\xb0""\xd0""\xbb""\xd1""\x8c""\xd1""\x88""\xd0""\xb8""\xd0""\xb2""\xd1""\x8b""\xd0""\xb9"" \xd1""\x8d""\xd0""\xba""\xd0""\xb7""\xd0""\xb5""\xd0""\xbc""\xd0""\xbf""\xd0""\xbb""\xd1""\x8f""\xd1""\x80""!"
- 	 /* Would a citrus live in the bushes of the south? Yes, but only a fake one! */
- 	)
- LANGUAGE(
- 	 sa	/* Sanskrit */,
- 	 GLASS,
--	 "काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥"
-+	 "\xe0""\xa4""\x95""\xe0""\xa4""\xbe""\xe0""\xa4""\x9a""\xe0""\xa4""\x82"" \xe0""\xa4""\xb6""\xe0""\xa4""\x95""\xe0""\xa5""\x8d""\xe0""\xa4""\xa8""\xe0""\xa5""\x8b""\xe0""\xa4""\xae""\xe0""\xa5""\x8d""\xe0""\xa4""\xaf""\xe0""\xa4""\xa4""\xe0""\xa5""\x8d""\xe0""\xa4""\xa4""\xe0""\xa5""\x81""\xe0""\xa4""\xae""\xe0""\xa5""\x8d"" \xe0""\xa5""\xa4"" \xe0""\xa4""\xa8""\xe0""\xa5""\x8b""\xe0""\xa4""\xaa""\xe0""\xa4""\xb9""\xe0""\xa4""\xbf""\xe0""\xa4""\xa8""\xe0""\xa4""\xb8""\xe0""\xa5""\x8d""\xe0""\xa4""\xa4""\xe0""\xa4""\xbf"" \xe0""\xa4""\xae""\xe0""\xa4""\xbe""\xe0""\xa4""\xae""\xe0""\xa5""\x8d"" \xe0""\xa5""\xa5"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
-@@ -459,56 +459,56 @@
- LANGUAGE(
- 	 sk	/* Slovak */,
- 	 KERMIT,
--	 "Starý kôň na hŕbe kníh žuje tíško povädnuté ruže, na stĺpe sa ďateľ učí kvákať novú ódu o živote."
-+	 "Star\xc3""\xbd"" k\xc3""\xb4""\xc5""\x88"" na h\xc5""\x95""be kn\xc3""\xad""h \xc5""\xbe""uje t\xc3""\xad""\xc5""\xa1""ko pov\xc3""\xa4""dnut\xc3""\xa9"" ru\xc5""\xbe""e, na st\xc4""\xba""pe sa \xc4""\x8f""ate\xc4""\xbe"" u\xc4""\x8d""\xc3""\xad"" kv\xc3""\xa1""ka\xc5""\xa5"" nov\xc3""\xba"" \xc3""\xb3""du o \xc5""\xbe""ivote."
- 	)
- LANGUAGE(
- 	 sl	/* Slovenian */,
- 	 WP-PANG,
--	 "Šerif bo za vajo spet kuhal domače žgance."
-+	 "\xc5""\xa0""erif bo za vajo spet kuhal doma\xc4""\x8d""e \xc5""\xbe""gance."
- 	 /* For an exercise, sheriff will again make home-made mush. */
- 	)
- LANGUAGE(
- 	 sq	/* Albanian */,
- 	 GLASS,
--	 "Unë mund të ha qelq dhe nuk më gjen gjë."
-+	 "Un\xc3""\xab"" mund t\xc3""\xab"" ha qelq dhe nuk m\xc3""\xab"" gjen gj\xc3""\xab""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 sr	/* Serbian (Cyrillic) */,
- 	 WP-SFD,
--	 "Чешће цeђење мрeжастим џаком побољшава фертилизацију генских хибрида."
-+	 "\xd0""\xa7""\xd0""\xb5""\xd1""\x88""\xd1""\x9b""\xd0""\xb5"" \xd1""\x86""e\xd1""\x92""\xd0""\xb5""\xd1""\x9a""\xd0""\xb5"" \xd0""\xbc""\xd1""\x80""e\xd0""\xb6""\xd0""\xb0""\xd1""\x81""\xd1""\x82""\xd0""\xb8""\xd0""\xbc"" \xd1""\x9f""\xd0""\xb0""\xd0""\xba""\xd0""\xbe""\xd0""\xbc"" \xd0""\xbf""\xd0""\xbe""\xd0""\xb1""\xd0""\xbe""\xd1""\x99""\xd1""\x88""\xd0""\xb0""\xd0""\xb2""\xd0""\xb0"" \xd1""\x84""\xd0""\xb5""\xd1""\x80""\xd1""\x82""\xd0""\xb8""\xd0""\xbb""\xd0""\xb8""\xd0""\xb7""\xd0""\xb0""\xd1""\x86""\xd0""\xb8""\xd1""\x98""\xd1""\x83"" \xd0""\xb3""\xd0""\xb5""\xd0""\xbd""\xd1""\x81""\xd0""\xba""\xd0""\xb8""\xd1""\x85"" \xd1""\x85""\xd0""\xb8""\xd0""\xb1""\xd1""\x80""\xd0""\xb8""\xd0""\xb4""\xd0""\xb0""."
- 	 /* More frequent filtering through the reticular bag improves fertilization of genetic hybrids. */
- 	)
- #if 0
- LANGUAGE(
- 	 sr-sr@latin	/* Serbian (Latin) */,
- 	 WP-SFD,
--	 "Češće ceđenje mrežastim džakom poboljšava fertilizaciju genskih hibrida."
-+	 "\xc4""\x8c""e\xc5""\xa1""\xc4""\x87""e ce\xc4""\x91""enje mre\xc5""\xbe""astim d\xc5""\xbe""akom pobolj\xc5""\xa1""ava fertilizaciju genskih hibrida."
- 	 /* More frequent filtering through the reticular bag improves fertilization of genetic hybrids. */
- 	)
- #endif
- LANGUAGE(
- 	 sv	/* Swedish */,
- 	 WP-SFD,
--	 "Flygande bäckasiner söka strax hwila på mjuka tuvor."
-+	 "Flygande b\xc3""\xa4""ckasiner s\xc3""\xb6""ka strax hwila p\xc3""\xa5"" mjuka tuvor."
- 	 /* Flying snipes soon look to rest on soft grass beds. */
- 	)
- LANGUAGE(
- 	 swg	/* Swabian */,
- 	 GLASS,
--	 "I kå Glas frässa, ond des macht mr nix!"
-+	 "I k\xc3""\xa5"" Glas fr\xc3""\xa4""ssa, ond des macht mr nix!"
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 ta	/* Tamil */,
- 	 GLASS,
--	 "நான் கண்ணாடி சாப்பிடுவேன், அதனால் எனக்கு ஒரு கேடும் வராது."
-+	 "\xe0""\xae""\xa8""\xe0""\xae""\xbe""\xe0""\xae""\xa9""\xe0""\xaf""\x8d"" \xe0""\xae""\x95""\xe0""\xae""\xa3""\xe0""\xaf""\x8d""\xe0""\xae""\xa3""\xe0""\xae""\xbe""\xe0""\xae""\x9f""\xe0""\xae""\xbf"" \xe0""\xae""\x9a""\xe0""\xae""\xbe""\xe0""\xae""\xaa""\xe0""\xaf""\x8d""\xe0""\xae""\xaa""\xe0""\xae""\xbf""\xe0""\xae""\x9f""\xe0""\xaf""\x81""\xe0""\xae""\xb5""\xe0""\xaf""\x87""\xe0""\xae""\xa9""\xe0""\xaf""\x8d"", \xe0""\xae""\x85""\xe0""\xae""\xa4""\xe0""\xae""\xa9""\xe0""\xae""\xbe""\xe0""\xae""\xb2""\xe0""\xaf""\x8d"" \xe0""\xae""\x8e""\xe0""\xae""\xa9""\xe0""\xae""\x95""\xe0""\xaf""\x8d""\xe0""\xae""\x95""\xe0""\xaf""\x81"" \xe0""\xae""\x92""\xe0""\xae""\xb0""\xe0""\xaf""\x81"" \xe0""\xae""\x95""\xe0""\xaf""\x87""\xe0""\xae""\x9f""\xe0""\xaf""\x81""\xe0""\xae""\xae""\xe0""\xaf""\x8d"" \xe0""\xae""\xb5""\xe0""\xae""\xb0""\xe0""\xae""\xbe""\xe0""\xae""\xa4""\xe0""\xaf""\x81""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 th	/* Thai */,
- 	 WP-SFD,
--	 "เป็นมนุษย์สุดประเสริฐเลิศคุณค่า - กว่าบรรดาฝูงสัตว์เดรัจฉาน - จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร - ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า - หัดอภัยเหมือนกีฬาอัชฌาสัย - ปฏิบัติประพฤติกฎกำหนดใจ - พูดจาให้จ๊ะ ๆ จ๋า ๆ น่าฟังเอยฯ"
-+	 "\xe0""\xb9""\x80""\xe0""\xb8""\x9b""\xe0""\xb9""\x87""\xe0""\xb8""\x99""\xe0""\xb8""\xa1""\xe0""\xb8""\x99""\xe0""\xb8""\xb8""\xe0""\xb8""\xa9""\xe0""\xb8""\xa2""\xe0""\xb9""\x8c""\xe0""\xb8""\xaa""\xe0""\xb8""\xb8""\xe0""\xb8""\x94""\xe0""\xb8""\x9b""\xe0""\xb8""\xa3""\xe0""\xb8""\xb0""\xe0""\xb9""\x80""\xe0""\xb8""\xaa""\xe0""\xb8""\xa3""\xe0""\xb8""\xb4""\xe0""\xb8""\x90""\xe0""\xb9""\x80""\xe0""\xb8""\xa5""\xe0""\xb8""\xb4""\xe0""\xb8""\xa8""\xe0""\xb8""\x84""\xe0""\xb8""\xb8""\xe0""\xb8""\x93""\xe0""\xb8""\x84""\xe0""\xb9""\x88""\xe0""\xb8""\xb2"" - \xe0""\xb8""\x81""\xe0""\xb8""\xa7""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9a""\xe0""\xb8""\xa3""\xe0""\xb8""\xa3""\xe0""\xb8""\x94""\xe0""\xb8""\xb2""\xe0""\xb8""\x9d""\xe0""\xb8""\xb9""\xe0""\xb8""\x87""\xe0""\xb8""\xaa""\xe0""\xb8""\xb1""\xe0""\xb8""\x95""\xe0""\xb8""\xa7""\xe0""\xb9""\x8c""\xe0""\xb9""\x80""\xe0""\xb8""\x94""\xe0""\xb8""\xa3""\xe0""\xb8""\xb1""\xe0""\xb8""\x88""\xe0""\xb8""\x89""\xe0""\xb8""\xb2""\xe0""\xb8""\x99"" - \xe0""\xb8""\x88""\xe0""\xb8""\x87""\xe0""\xb8""\x9d""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9f""\xe0""\xb8""\xb1""\xe0""\xb8""\x99""\xe0""\xb8""\x9e""\xe0""\xb8""\xb1""\xe0""\xb8""\x92""\xe0""\xb8""\x99""\xe0""\xb8""\xb2""\xe0""\xb8""\xa7""\xe0""\xb8""\xb4""\xe0""\xb8""\x8a""\xe0""\xb8""\xb2""\xe0""\xb8""\x81""\xe0""\xb8""\xb2""\xe0""\xb8""\xa3"" \xe0""\xb8""\xad""\xe0""\xb8""\xa2""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\xa5""\xe0""\xb9""\x89""\xe0""\xb8""\xb2""\xe0""\xb8""\x87""\xe0""\xb8""\x9c""\xe0""\xb8""\xa5""\xe0""\xb8""\xb2""\xe0""\xb8""\x8d""\xe0""\xb8""\xa4""\xe0""\xb9""\x85""\xe0""\xb9""\x80""\xe0""\xb8""\x82""\xe0""\xb9""\x88""\xe0""\xb8""\x99""\xe0""\xb8""\x86""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9a""\xe0""\xb8""\xb5""\xe0""\xb8""\x91""\xe0""\xb8""\xb2""\xe0""\xb9""\x83""\xe0""\xb8""\x84""\xe0""\xb8""\xa3"" - \xe0""\xb9""\x84""\xe0""\xb8""\xa1""\xe0""\xb9""\x88""\xe0""\xb8""\x96""\xe0""\xb8""\xb7""\xe0""\xb8""\xad""\xe0""\xb9""\x82""\xe0""\xb8""\x97""\xe0""\xb8""\xa9""\xe0""\xb9""\x82""\xe0""\xb8""\x81""\xe0""\xb8""\xa3""\xe0""\xb8""\x98""\xe0""\xb9""\x81""\xe0""\xb8""\x8a""\xe0""\xb9""\x88""\xe0""\xb8""\x87""\xe0""\xb8""\x8b""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\xae""\xe0""\xb8""\xb6""\xe0""\xb8""\x94""\xe0""\xb8""\xae""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\x94""\xe0""\xb9""\x88""\xe0""\xb8""\xb2"" - \xe0""\xb8""\xab""\xe0""\xb8""\xb1""\xe0""\xb8""\x94""\xe0""\xb8""\xad""\xe0""\xb8""\xa0""\xe0""\xb8""\xb1""\xe0""\xb8""\xa2""\xe0""\xb9""\x80""\xe0""\xb8""\xab""\xe0""\xb8""\xa1""\xe0""\xb8""\xb7""\xe0""\xb8""\xad""\xe0""\xb8""\x99""\xe0""\xb8""\x81""\xe0""\xb8""\xb5""\xe0""\xb8""\xac""\xe0""\xb8""\xb2""\xe0""\xb8""\xad""\xe0""\xb8""\xb1""\xe0""\xb8""\x8a""\xe0""\xb8""\x8c""\xe0""\xb8""\xb2""\xe0""\xb8""\xaa""\xe0""\xb8""\xb1""\xe0""\xb8""\xa2"" - \xe0""\xb8""\x9b""\xe0""\xb8""\x8f""\xe0""\xb8""\xb4""\xe0""\xb8""\x9a""\xe0""\xb8""\xb1""\xe0""\xb8""\x95""\xe0""\xb8""\xb4""\xe0""\xb8""\x9b""\xe0""\xb8""\xa3""\xe0""\xb8""\xb0""\xe0""\xb8""\x9e""\xe0""\xb8""\xa4""\xe0""\xb8""\x95""\xe0""\xb8""\xb4""\xe0""\xb8""\x81""\xe0""\xb8""\x8e""\xe0""\xb8""\x81""\xe0""\xb8""\xb3""\xe0""\xb8""\xab""\xe0""\xb8""\x99""\xe0""\xb8""\x94""\xe0""\xb9""\x83""\xe0""\xb8""\x88"" - \xe0""\xb8""\x9e""\xe0""\xb8""\xb9""\xe0""\xb8""\x94""\xe0""\xb8""\x88""\xe0""\xb8""\xb2""\xe0""\xb9""\x83""\xe0""\xb8""\xab""\xe0""\xb9""\x89""\xe0""\xb8""\x88""\xe0""\xb9""\x8a""\xe0""\xb8""\xb0"" \xe0""\xb9""\x86"" \xe0""\xb8""\x88""\xe0""\xb9""\x8b""\xe0""\xb8""\xb2"" \xe0""\xb9""\x86"" \xe0""\xb8""\x99""\xe0""\xb9""\x88""\xe0""\xb8""\xb2""\xe0""\xb8""\x9f""\xe0""\xb8""\xb1""\xe0""\xb8""\x87""\xe0""\xb9""\x80""\xe0""\xb8""\xad""\xe0""\xb8""\xa2""\xe0""\xb8""\xaf"""
- 	 /* Being a man is worthy - Beyond senseless animal - Begin educate thyself - Begone from killing and trouble - Bear not thy grudge, damn and, curse - Bestow forgiving and sporting - Befit with rules - Benign speech speak thou */
- 	)
- LANGUAGE(
-@@ -520,25 +520,25 @@
- LANGUAGE(
- 	 tr	/* Turkish */,
- 	 WP-PANG,
--	 "Pijamalı hasta yağız şoföre çabucak güvendi."
-+	 "Pijamal\xc4""\xb1"" hasta ya\xc4""\x9f""\xc4""\xb1""z \xc5""\x9f""of\xc3""\xb6""re \xc3""\xa7""abucak g\xc3""\xbc""vendi."
- 	 /* The patient in pajamas trusted the swarthy driver quickly. */
- 	)
- LANGUAGE(
- 	 tw	/* Twi */,
- 	 GLASS,
--	 "Metumi awe tumpan, ɜnyɜ me hwee."
-+	 "Metumi awe tumpan, \xc9""\x9c""ny\xc9""\x9c"" me hwee."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 uk	/* Ukrainian */,
- 	 WP-PANG,
--	 "Чуєш їх, доцю, га? Кумедна ж ти, прощайся без ґольфів!"
-+	 "\xd0""\xa7""\xd1""\x83""\xd1""\x94""\xd1""\x88"" \xd1""\x97""\xd1""\x85"", \xd0""\xb4""\xd0""\xbe""\xd1""\x86""\xd1""\x8e"", \xd0""\xb3""\xd0""\xb0""? \xd0""\x9a""\xd1""\x83""\xd0""\xbc""\xd0""\xb5""\xd0""\xb4""\xd0""\xbd""\xd0""\xb0"" \xd0""\xb6"" \xd1""\x82""\xd0""\xb8"", \xd0""\xbf""\xd1""\x80""\xd0""\xbe""\xd1""\x89""\xd0""\xb0""\xd0""\xb9""\xd1""\x81""\xd1""\x8f"" \xd0""\xb1""\xd0""\xb5""\xd0""\xb7"" \xd2""\x91""\xd0""\xbe""\xd0""\xbb""\xd1""\x8c""\xd1""\x84""\xd1""\x96""\xd0""\xb2""!"
- 	 /* Daughter, do you hear them, eh? Oh, you are funny! Say good-bye without knee-length socks. */
- 	)
- LANGUAGE(
- 	 ur	/* Urdu */,
- 	 GLASS,
--	 "میں کانچ کھا سکتا ہوں اور مجھے تکلیف نہیں ہوتی ۔"
-+	 "\xd9""\x85""\xdb""\x8c""\xda""\xba"" \xda""\xa9""\xd8""\xa7""\xd9""\x86""\xda""\x86"" \xda""\xa9""\xda""\xbe""\xd8""\xa7"" \xd8""\xb3""\xda""\xa9""\xd8""\xaa""\xd8""\xa7"" \xdb""\x81""\xd9""\x88""\xda""\xba"" \xd8""\xa7""\xd9""\x88""\xd8""\xb1"" \xd9""\x85""\xd8""\xac""\xda""\xbe""\xdb""\x92"" \xd8""\xaa""\xda""\xa9""\xd9""\x84""\xdb""\x8c""\xd9""\x81"" \xd9""\x86""\xdb""\x81""\xdb""\x8c""\xda""\xba"" \xdb""\x81""\xd9""\x88""\xd8""\xaa""\xdb""\x8c"" \xdb""\x94"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
-@@ -550,48 +550,48 @@
- LANGUAGE(
- 	 vi	/* Vietnamese */,
- 	 GSPECI,
--	 "Con sói nâu nhảy qua con chó lười."
-+	 "Con s\xc3""\xb3""i n\xc3""\xa2""u nh\xe1""\xba""\xa3""y qua con ch\xc3""\xb3"" l\xc6""\xb0""\xe1""\xbb""\x9d""i."
- 	)
- LANGUAGE(
- 	 wa	/* Walloon */,
- 	 GLASS,
--	 "Dji pou magnî do vêre, çoula m' freut nén må."
-+	 "Dji pou magn\xc3""\xae"" do v\xc3""\xaa""re, \xc3""\xa7""oula m' freut n\xc3""\xa9""n m\xc3""\xa5""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 yi	/* Yiddish */,
- 	 GLASS,
--	 "איך קען עסן גלאָז און עס טוט מיר נישט װײ."
-+	 "\xd7""\x90""\xd7""\x99""\xd7""\x9a"" \xd7""\xa7""\xd7""\xa2""\xd7""\x9f"" \xd7""\xa2""\xd7""\xa1""\xd7""\x9f"" \xd7""\x92""\xd7""\x9c""\xd7""\x90""\xd6""\xb8""\xd7""\x96"" \xd7""\x90""\xd7""\x95""\xd7""\x9f"" \xd7""\xa2""\xd7""\xa1"" \xd7""\x98""\xd7""\x95""\xd7""\x98"" \xd7""\x9e""\xd7""\x99""\xd7""\xa8"" \xd7""\xa0""\xd7""\x99""\xd7""\xa9""\xd7""\x98"" \xd7""\xb0""\xd7""\xb2""."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 yo	/* Yoruba */,
- 	 GLASS,
--	 "Mo lè je̩ dígí, kò ní pa mí lára."
-+	 "Mo l\xc3""\xa8"" je\xcc""\xa9"" d\xc3""\xad""g\xc3""\xad"", k\xc3""\xb2"" n\xc3""\xad"" pa m\xc3""\xad"" l\xc3""\xa1""ra."
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 zh-cn	/* Chinese Simplified */,
- 	 GLASS,
--	 "我能吞下玻璃而不伤身体。"
-+	 "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe4""\xbc""\xa4""\xe8""\xba""\xab""\xe4""\xbd""\x93""\xe3""\x80""\x82"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 zh-mo	/* Chinese Traditional */,
- 	 GLASS,
--	 "我能吞下玻璃而不傷身體。"
-+	 "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe5""\x82""\xb7""\xe8""\xba""\xab""\xe9""\xab""\x94""\xe3""\x80""\x82"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 zh-sg	/* Chinese Simplified */,
- 	 GLASS,
--	 "我能吞下玻璃而不伤身体。"
-+	 "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe4""\xbc""\xa4""\xe8""\xba""\xab""\xe4""\xbd""\x93""\xe3""\x80""\x82"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
- 	 zh-tw	/* Chinese Traditional */,
- 	 GLASS,
--	 "我能吞下玻璃而不傷身體。"
-+	 "\xe6""\x88""\x91""\xe8""\x83""\xbd""\xe5""\x90""\x9e""\xe4""\xb8""\x8b""\xe7""\x8e""\xbb""\xe7""\x92""\x83""\xe8""\x80""\x8c""\xe4""\xb8""\x8d""\xe5""\x82""\xb7""\xe8""\xba""\xab""\xe9""\xab""\x94""\xe3""\x80""\x82"""
- 	 /* I can eat glass and it doesn't hurt me. */
- 	)
- LANGUAGE(
diff --git a/pango/pango-1.28.3-win32.patch b/pango/pango-1.28.3-win32.patch
deleted file mode 100644
index b938accb2899..000000000000
--- a/pango/pango-1.28.3-win32.patch
+++ /dev/null
@@ -1,649 +0,0 @@
---- misc/pango-1.28.3/configure	2010-09-29 13:02:33.000000000 +0200
-+++ misc/build/pango-1.28.3/configure	2011-03-26 06:09:01.021181200 +0100
-@@ -18596,16 +18596,16 @@
-   fi
- 
-   if $have_atsui; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
-+#    if test -n "$PKG_CONFIG" && \
-+#    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-+#  ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-+#  ac_status=$?
-+#  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+#  test $ac_status = 0; }; then
-   have_cairo_atsui=true
--else
--  :
--fi
-+#else
-+#  :
-+#fi
-   fi
-   if $have_cairo_atsui; then
- 
-@@ -18859,7 +18859,7 @@
- 
- # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--
-+GLIB_MKENUMS=glib-mkenums
- 
- 
- # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
---- misc/pango-1.28.3/pango/makefile.msc	2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/makefile.msc	2011-03-26 15:41:45.375966400 +0100
-@@ -1,5 +1,15 @@
--TOP = ../..
--!INCLUDE $(TOP)/glib/build/win32/make.msc
-+PRJ_TOP = ..
-+GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
-+CAIRO_INC = -I$(OUTDIR)\inc\external\cairo
-+
-+INTL_LIB = $(OUTDIR)\lib\intl.lib
-+GLIB_LIB = $(OUTDIR)\lib\glib-2.0.lib		\
-+				$(OUTDIR)\lib\gobject-2.0.lib	\
-+				$(OUTDIR)\lib\gmodule-2.0.lib 
-+CAIRO_LIB = $(OUTDIR)\lib\cairo.lib
-+USP10_LIB = USP10.lib
-+
-+!INCLUDE $(OUTDIR)\inc\external\glib-2.0\make.msc
- 
- !IFNDEF PERL
- PERL = perl
-@@ -16,7 +26,7 @@
- 
- !IFNDEF PACKAGE
- 
--DLLS = pango pangowin32 pangoft2 pangocairo # pangox
-+DLLS = pango pangowin32 pangocairo # pangox pangoft2 
- EXES = querymodules testfonts
- #? test1 test2 test3 test4 test5
- 
-@@ -30,7 +30,7 @@
- 	nmake -nologo -f makefile.msc $(THIS)-$(PANGO_VER)s.lib PACKAGE=$(THIS) OBJS_$(THIS)=1
- 
- sub-one-dll:
--	nmake -nologo -f makefile.msc lib$(THIS)-$(PANGO_VER)-0.dll PACKAGE=$(THIS) OBJS_$(THIS)=1
-+	nmake -nologo -f makefile.msc $(THIS)lo.dll PACKAGE=$(THIS) OBJS_$(THIS)=1
- 
- sub-one-exe:
- 	nmake -nologo -f makefile.msc $(THIS).exe PACKAGE=$(THIS) OBJS_$(THIS)=1
-@@ -40,28 +50,28 @@
- 
- !ELSE
- 
--PRJ_TOP = ..
-+CFLAGS = -I. -I$(PRJ_TOP) $(SOLARINC) $(GLIB_INC) $(CAIRO_INC)	
-+
- PKG_VER = $(PANGO_VER)
- PKG_DEF = $(PACKAGE).def
--
--PKG_CFLAGS = -FImsvc_recommended_pragmas.h -I.. -I. -I$(PRJ_TOP) \
-+PKG_CFLAGS = -FI$(PRJ_TOP)\msvc_recommended_pragmas.h $(CFLAGS) \
- 		-DPACKAGE=\"Pango\" -DVERSION=\"$(PANGO_VER)\" \
- 		-DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \
- 		-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
- 		$(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
- 		$(X11_CFLAGS)  -DSYSCONFDIR=\"/etc\" \
--		-DPANGO_BINARY_AGE=0 
-+		-DPANGO_BINARY_AGE=0 	\
-+		-DLIBDIR=\".\\\\\"	
- 
- #-DHAVE_USP10_H
--		
- 
- !IFDEF OBJS_pango
- # don't link with itself
--PKG_LINK = $(GLIB_LIBS) $(FONTCONFIG_LIBS)
-+PKG_LINK = $(GLIB_LIB)
- !ENDIF
- 
- !IFDEF OBJS_pangowin32
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) $(USP10_LIB)	\
- 	pango-$(PANGO_VER).lib
- !ENDIF
- 
-@@ -69,23 +79,24 @@
- PKG_CFLAGS = $(PKG_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) \
- 	-DPANGO_MODULE_PREFIX=_pango_basic_ft2
- 
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) $(FREETYPE2_LIBS) $(FONTCONFIG_LIBS) \
- 	pango-$(PANGO_VER).lib opentype\pango-ot.lib
- !ENDIF
- 
- !IFDEF OBJS_pangox
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
- 	pango-$(PANGO_VER).lib $(X11_LIBS)
- !ENDIF
- 
- !IFDEF OBJS_pangocairo
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
--	pango-$(PANGO_VER).lib $(CAIRO_LIBS) \
--	pangowin32-$(PANGO_VER).lib $(FONTCONFIG_LIBS) 
-+PKG_CFLAGS = $(PKG_CFLAGS)
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
-+	pango-$(PANGO_VER).lib $(CAIRO_LIB) \
-+	pangowin32-$(PANGO_VER).lib 
- !ENDIF
- 
- !IF DEFINED (OBJS_querymodules) || DEFINED (OBJS_testfonts)
--PKG_LINK = $(GLIB_LIBS) $(LIBICONV_LIBS) \
-+PKG_LINK = $(GLIB_LIB) $(INTL_LIB) \
- 	pango-$(PANGO_VER).lib pangowin32-$(PANGO_VER).lib
- !ENDIF
- 
-@@ -99,9 +110,10 @@
- 	ellipsize.obj \
- 	fonts.obj \
- 	glyphstring.obj \
--	mapping.obj \
-+#	mapping.obj \
- 	modules.obj \
- 	pango-attributes.obj \
-+	pango-bidi-type.obj \
- 	pango-engine.obj \
- 	pango-color.obj \
- 	pango-context.obj \
-@@ -121,7 +133,6 @@
- 	pango-utils.obj \
- 	reorder-items.obj \
- 	shape.obj \
--	\
- 	fribidi.obj \
- 	fribidi_types.obj \
- 	fribidi_char_type.obj
-@@ -215,15 +226,6 @@
- OBJECTS = $(PACKAGE).obj
- !ENDIF
- 
--module-defs-win32.c : module-defs-win32.c.win32
--	copy module-defs-win32.c.win32 module-defs-win32.c
--
--module-defs-fc.c : module-defs-fc.c.win32
--	copy module-defs-fc.c.win32 module-defs-fc.c
--
--module-defs-lang.c : module-defs-lang.c.win32
--	copy module-defs-lang.c.win32 module-defs-lang.c
--
- pango_headers=		   \
- 	pango.h		   \
- 	pango-attributes.h \
-@@ -249,7 +251,7 @@
- 	pangofc-fontmap.h
- 
- pango-enum-types.h: $(pango_headers) makefile.msc
--	$(PERL) $(GLIB)\gobject\glib-mkenums  \
-+	perl $(OUTDIR)\bin\glib-mkenums  \
- 		--fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- 		--fprod "/* enumerations from \"@filename@\" */\n" \
- 		--vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" 	\
-@@ -257,7 +259,7 @@
- 		$(pango_headers) > pango-enum-types.h
- 
- pango-enum-types.c: $(pango_headers) pango-enum-types.h makefile.msc
--	$(PERL) $(GLIB)\gobject\glib-mkenums  \
-+	perl $(OUTDIR)\bin\glib-mkenums  \
- 		--fhead "#include <pango.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[] = {" 	\
-@@ -275,22 +277,13 @@
- $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS) $(PRJ_TOP)\config.h
- 	lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS)
- 
--lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h
-+$(PACKAGE)lo.dll : $(OBJECTS) $(PKG_DEF) $(PRJ_TOP)\config.h
- 	$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) \
- 	user32.lib gdi32.lib advapi32.lib $(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PKG_DEF)
- 
- $(PACKAGE).exe : $(PKG_LINK) $(OBJECTS)
- 	$(CC) $(CFLAGS) -Fe$(PACKAGE).exe $(OBJECTS) $(PKG_LINK) gdi32.lib user32.lib
- 
--$(PRJ_TOP)\config.h.win32 : makefile.msc
--	echo /*almostempty*/ > $(PRJ_TOP)\config.h.win32
--	echo #define PANGO_BINARY_AGE 0 >> $(PRJ_TOP)\config.h.win32
--	echo #define DHAVE_USP10_H 1 >> $(PRJ_TOP)\config.h.win32
--
--$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
--	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
--
--
- .c.obj :
- 	$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
- 
---- misc/pango-1.28.3/pango/module-defs-win32.c	2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/module-defs-win32.c	2011-03-26 08:57:53.088370000 +0100
-@@ -1,7 +1,25 @@
--/* Autogenerated by configure. Do not edit */
-+/* Hand-written, for builds using Microsoft's compiler and makefile.msc,
-+ * where the configure mechanism isn't used.
-+ */
- 
--#include "module-defs.h"
-+#include "modules.h"
-+
-+#ifdef PANGO_MODULE_PREFIX
-+void         _pango_basic_win32_script_engine_list   (PangoEngineInfo **engines,
-+                                                      gint             *n_engines);
-+void         _pango_basic_win32_script_engine_init   (GTypeModule      *module);
-+void         _pango_basic_win32_script_engine_exit   (void);
-+PangoEngine *_pango_basic_win32_script_engine_create (const char       *id);
-+#endif
- 
- PangoIncludedModule _pango_included_win32_modules[] = {
-- { NULL, NULL, NULL, NULL },
-+#ifdef PANGO_MODULE_PREFIX
-+ { 
-+   _pango_basic_win32_script_engine_list,  
-+   _pango_basic_win32_script_engine_init, 
-+   _pango_basic_win32_script_engine_exit,  
-+   _pango_basic_win32_script_engine_create 
-+ },
-+#endif
-+ { NULL, NULL, NULL },
- };
---- misc/pango-1.28.3/pango/pango-enum-types.c	2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-enum-types.c	2011-03-26 15:41:51.313542400 +0100
-@@ -35,7 +35,7 @@
-       { PANGO_ATTR_GRAVITY_HINT, "PANGO_ATTR_GRAVITY_HINT", "gravity-hint" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoAttrType"), values);
-+    etype = g_enum_register_static ("PangoAttrType", values);
-   }
-   return etype;
- }
-@@ -52,59 +52,7 @@
-       { PANGO_UNDERLINE_ERROR, "PANGO_UNDERLINE_ERROR", "error" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoUnderline"), values);
--  }
--  return etype;
--}
--
--/* enumerations from "pango-bidi-type.h" */
--GType
--pango_bidi_type_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_BIDI_TYPE_L, "PANGO_BIDI_TYPE_L", "l" },
--      { PANGO_BIDI_TYPE_LRE, "PANGO_BIDI_TYPE_LRE", "lre" },
--      { PANGO_BIDI_TYPE_LRO, "PANGO_BIDI_TYPE_LRO", "lro" },
--      { PANGO_BIDI_TYPE_R, "PANGO_BIDI_TYPE_R", "r" },
--      { PANGO_BIDI_TYPE_AL, "PANGO_BIDI_TYPE_AL", "al" },
--      { PANGO_BIDI_TYPE_RLE, "PANGO_BIDI_TYPE_RLE", "rle" },
--      { PANGO_BIDI_TYPE_RLO, "PANGO_BIDI_TYPE_RLO", "rlo" },
--      { PANGO_BIDI_TYPE_PDF, "PANGO_BIDI_TYPE_PDF", "pdf" },
--      { PANGO_BIDI_TYPE_EN, "PANGO_BIDI_TYPE_EN", "en" },
--      { PANGO_BIDI_TYPE_ES, "PANGO_BIDI_TYPE_ES", "es" },
--      { PANGO_BIDI_TYPE_ET, "PANGO_BIDI_TYPE_ET", "et" },
--      { PANGO_BIDI_TYPE_AN, "PANGO_BIDI_TYPE_AN", "an" },
--      { PANGO_BIDI_TYPE_CS, "PANGO_BIDI_TYPE_CS", "cs" },
--      { PANGO_BIDI_TYPE_NSM, "PANGO_BIDI_TYPE_NSM", "nsm" },
--      { PANGO_BIDI_TYPE_BN, "PANGO_BIDI_TYPE_BN", "bn" },
--      { PANGO_BIDI_TYPE_B, "PANGO_BIDI_TYPE_B", "b" },
--      { PANGO_BIDI_TYPE_S, "PANGO_BIDI_TYPE_S", "s" },
--      { PANGO_BIDI_TYPE_WS, "PANGO_BIDI_TYPE_WS", "ws" },
--      { PANGO_BIDI_TYPE_ON, "PANGO_BIDI_TYPE_ON", "on" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static (g_intern_static_string ("PangoBidiType"), values);
--  }
--  return etype;
--}
--GType
--pango_direction_get_type (void)
--{
--  static GType etype = 0;
--  if (etype == 0) {
--    static const GEnumValue values[] = {
--      { PANGO_DIRECTION_LTR, "PANGO_DIRECTION_LTR", "ltr" },
--      { PANGO_DIRECTION_RTL, "PANGO_DIRECTION_RTL", "rtl" },
--      { PANGO_DIRECTION_TTB_LTR, "PANGO_DIRECTION_TTB_LTR", "ttb-ltr" },
--      { PANGO_DIRECTION_TTB_RTL, "PANGO_DIRECTION_TTB_RTL", "ttb-rtl" },
--      { PANGO_DIRECTION_WEAK_LTR, "PANGO_DIRECTION_WEAK_LTR", "weak-ltr" },
--      { PANGO_DIRECTION_WEAK_RTL, "PANGO_DIRECTION_WEAK_RTL", "weak-rtl" },
--      { PANGO_DIRECTION_NEUTRAL, "PANGO_DIRECTION_NEUTRAL", "neutral" },
--      { 0, NULL, NULL }
--    };
--    etype = g_enum_register_static (g_intern_static_string ("PangoDirection"), values);
-+    etype = g_enum_register_static ("PangoUnderline", values);
-   }
-   return etype;
- }
-@@ -122,7 +70,7 @@
-       { PANGO_COVERAGE_EXACT, "PANGO_COVERAGE_EXACT", "exact" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoCoverageLevel"), values);
-+    etype = g_enum_register_static ("PangoCoverageLevel", values);
-   }
-   return etype;
- }
-@@ -139,7 +87,7 @@
-       { PANGO_STYLE_ITALIC, "PANGO_STYLE_ITALIC", "italic" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoStyle"), values);
-+    etype = g_enum_register_static ("PangoStyle", values);
-   }
-   return etype;
- }
-@@ -153,7 +101,7 @@
-       { PANGO_VARIANT_SMALL_CAPS, "PANGO_VARIANT_SMALL_CAPS", "small-caps" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoVariant"), values);
-+    etype = g_enum_register_static ("PangoVariant", values);
-   }
-   return etype;
- }
-@@ -176,7 +124,7 @@
-       { PANGO_WEIGHT_ULTRAHEAVY, "PANGO_WEIGHT_ULTRAHEAVY", "ultraheavy" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoWeight"), values);
-+    etype = g_enum_register_static ("PangoWeight", values);
-   }
-   return etype;
- }
-@@ -197,7 +145,7 @@
-       { PANGO_STRETCH_ULTRA_EXPANDED, "PANGO_STRETCH_ULTRA_EXPANDED", "ultra-expanded" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoStretch"), values);
-+    etype = g_enum_register_static ("PangoStretch", values);
-   }
-   return etype;
- }
-@@ -216,7 +164,7 @@
-       { PANGO_FONT_MASK_GRAVITY, "PANGO_FONT_MASK_GRAVITY", "gravity" },
-       { 0, NULL, NULL }
-     };
--    etype = g_flags_register_static (g_intern_static_string ("PangoFontMask"), values);
-+    etype = g_flags_register_static ("PangoFontMask", values);
-   }
-   return etype;
- }
-@@ -235,7 +183,7 @@
-       { PANGO_GRAVITY_AUTO, "PANGO_GRAVITY_AUTO", "auto" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoGravity"), values);
-+    etype = g_enum_register_static ("PangoGravity", values);
-   }
-   return etype;
- }
-@@ -250,7 +198,7 @@
-       { PANGO_GRAVITY_HINT_LINE, "PANGO_GRAVITY_HINT_LINE", "line" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoGravityHint"), values);
-+    etype = g_enum_register_static ("PangoGravityHint", values);
-   }
-   return etype;
- }
-@@ -267,7 +215,7 @@
-       { PANGO_ALIGN_RIGHT, "PANGO_ALIGN_RIGHT", "right" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoAlignment"), values);
-+    etype = g_enum_register_static ("PangoAlignment", values);
-   }
-   return etype;
- }
-@@ -282,7 +230,7 @@
-       { PANGO_WRAP_WORD_CHAR, "PANGO_WRAP_WORD_CHAR", "word-char" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoWrapMode"), values);
-+    etype = g_enum_register_static ("PangoWrapMode", values);
-   }
-   return etype;
- }
-@@ -298,7 +246,7 @@
-       { PANGO_ELLIPSIZE_END, "PANGO_ELLIPSIZE_END", "end" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoEllipsizeMode"), values);
-+    etype = g_enum_register_static ("PangoEllipsizeMode", values);
-   }
-   return etype;
- }
-@@ -316,7 +264,7 @@
-       { PANGO_RENDER_PART_STRIKETHROUGH, "PANGO_RENDER_PART_STRIKETHROUGH", "strikethrough" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoRenderPart"), values);
-+    etype = g_enum_register_static ("PangoRenderPart", values);
-   }
-   return etype;
- }
-@@ -409,7 +357,7 @@
-       { PANGO_SCRIPT_LYDIAN, "PANGO_SCRIPT_LYDIAN", "lydian" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoScript"), values);
-+    etype = g_enum_register_static ("PangoScript", values);
-   }
-   return etype;
- }
-@@ -424,7 +372,7 @@
-       { PANGO_TAB_LEFT, "PANGO_TAB_LEFT", "left" },
-       { 0, NULL, NULL }
-     };
--    etype = g_enum_register_static (g_intern_static_string ("PangoTabAlign"), values);
-+    etype = g_enum_register_static ("PangoTabAlign", values);
-   }
-   return etype;
- }
---- misc/pango-1.28.3/pango/pango-enum-types.h	2010-09-29 13:02:42.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-enum-types.h	2011-03-26 15:41:50.922912400 +0100
-@@ -12,11 +12,6 @@
- #define PANGO_TYPE_ATTR_TYPE (pango_attr_type_get_type())
- GType pango_underline_get_type (void);
- #define PANGO_TYPE_UNDERLINE (pango_underline_get_type())
--/* enumerations from "pango-bidi-type.h" */
--GType pango_bidi_type_get_type (void);
--#define PANGO_TYPE_BIDI_TYPE (pango_bidi_type_get_type())
--GType pango_direction_get_type (void);
--#define PANGO_TYPE_DIRECTION (pango_direction_get_type())
- /* enumerations from "pango-coverage.h" */
- GType pango_coverage_level_get_type (void);
- #define PANGO_TYPE_COVERAGE_LEVEL (pango_coverage_level_get_type())
-@@ -53,7 +48,6 @@
- GType pango_tab_align_get_type (void);
- #define PANGO_TYPE_TAB_ALIGN (pango_tab_align_get_type())
- G_END_DECLS
--
- #endif /* __PANGO_ENUM_TYPES_H__ */
- 
- 
---- misc/pango-1.28.3/pango/pango-language.c	2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/pango-language.c	2011-03-26 10:25:32.858819200 +0100
-@@ -169,7 +169,6 @@
- static gchar *
- _pango_get_lc_ctype (void)
- {
--#ifdef G_OS_WIN32
-   /* Somebody might try to set the locale for this process using the
-    * LANG or LC_ environment variables. The Microsoft C library
-    * doesn't know anything about them. You set the locale in the
-@@ -196,9 +195,6 @@
-     return g_strdup (p);
- 
-   return g_win32_getlocale ();
--#else
--  return g_strdup (setlocale (LC_CTYPE, NULL));
--#endif
- }
- 
- /**
---- misc/pango-1.28.3/pango/pango-utils.c	2010-09-29 12:39:16.000000000 +0200
-+++ misc/build/pango-1.28.3/pango/pango-utils.c	2011-03-26 11:07:49.125658000 +0100
-@@ -38,15 +38,11 @@
- #  define getc_unlocked(f) getc(f)
- #endif /* !HAVE_FLOCKFILE */
- 
--#ifdef G_OS_WIN32
--
- #include <sys/types.h>
- 
- #define STRICT
- #include <windows.h>
- 
--#endif
--
- struct PangoAlias
- {
-   char *alias;
-@@ -204,25 +200,6 @@
- 
- 	  continue;
- 	}
--#ifndef G_OS_WIN32
--      /* '~' is a quite normal and common character in file names on
--       * Windows, especially in the 8.3 versions of long file names, which
--       * still occur now and then. Also, few Windows user are aware of the
--       * Unix shell convention that '~' stands for the home directory,
--       * even if they happen to have a home directory.
--       */
--      if (file[0] == '~' && file[1] == G_DIR_SEPARATOR)
--	{
--	  char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL);
--	  g_free (file);
--	  file = tmp;
--	}
--      else if (file[0] == '~' && file[1] == '\0')
--	{
--	  g_free (file);
--	  file = g_strdup (g_get_home_dir());
--	}
--#endif
-       g_free (files[i]);
-       files[i] = file;
- 
-@@ -655,8 +632,6 @@
-   return g_strdup (g_hash_table_lookup (config_hash, key));
- }
- 
--#ifdef G_OS_WIN32
--
- /* DllMain function needed to tuck away the DLL handle */
- 
- static HMODULE pango_dll;
-@@ -676,8 +651,6 @@
-   return TRUE;
- }
- 
--#endif
--
- /**
-  * pango_get_sysconf_subdirectory:
-  *
-@@ -692,7 +665,6 @@
- G_CONST_RETURN char *
- pango_get_sysconf_subdirectory (void)
- {
--#ifdef G_OS_WIN32
-   static gchar *result = NULL;
- 
-   if (result == NULL)
-@@ -702,9 +674,6 @@
-       g_free (root);
-     }
-   return result;
--#else
--  return SYSCONFDIR "/pango";
--#endif
- }
- 
- /**
-@@ -721,7 +690,6 @@
- G_CONST_RETURN char *
- pango_get_lib_subdirectory (void)
- {
--#ifdef G_OS_WIN32
-   static gchar *result = NULL;
- 
-   if (result == NULL)
-@@ -737,9 +705,6 @@
-       g_free (root);
-     }
-   return result;
--#else
--  return LIBDIR "/pango";
--#endif
- }
- 
- 
---- misc/pango-1.28.3/pango/pango.def	2010-02-09 13:06:28.000000000 +0100
-+++ misc/build/pango-1.28.3/pango/pango.def	2011-03-26 11:10:51.284239600 +0100
-@@ -49,7 +49,6 @@
- 	pango_attribute_destroy
- 	pango_attribute_equal
- 	pango_bidi_type_for_unichar
--	pango_bidi_type_get_type
- 	pango_break
- 	pango_color_copy
- 	pango_color_free
-@@ -89,7 +88,6 @@
- 	pango_coverage_to_bytes
- 	pango_coverage_unref
- 	pango_default_break
--	pango_direction_get_type
- 	pango_ellipsize_mode_get_type
- 	pango_engine_get_type
- 	pango_engine_lang_get_type
---- misc/pango-1.28.3/config.h	2011-03-26 08:43:30.577330000 +0100
-+++ misc/build/pango-1.28.3/config.h	2011-03-26 08:42:01.216811200 +0100
-@@ -1 +1,3 @@
--dummy
-+/*almostempty*/
-+#define PANGO_BINARY_AGE 0
-+#define DHAVE_USP10_H   1
---- misc/pango-1.28.3/msvc_recommended_pragmas.h	2011-03-26 07:30:07.692848800 +0100
-+++ misc/build/pango-1.28.3/msvc_recommended_pragmas.h	2011-03-26 07:34:43.524504400 +0100
-@@ -1 +1,31 @@
--dummy
-+#ifndef _MSC_VER
-+#pragma error "This header is for Microsoft VC only."
-+#endif /* _MSC_VER */
-+
-+/* Make MSVC more pedantic, this is a recommended pragma list
-+ * from _Win32_Programming_ by Rector and Newcomer.
-+ */
-+#pragma warning(error:4002) /* too many actual parameters for macro */
-+#pragma warning(error:4003) /* not enough actual parameters for macro */
-+#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
-+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-+#pragma warning(1:4016)     /* no function return type; using int as default */
-+#pragma warning(error:4020) /* too many actual parameters */
-+#pragma warning(error:4021) /* too few actual parameters */
-+#pragma warning(error:4027) /* function declared without formal parameter list */
-+#pragma warning(error:4029) /* declared formal parameter list different from definition */
-+#pragma warning(error:4033) /* 'function' must return a value */
-+#pragma warning(error:4035) /* 'function' : no return value */
-+#pragma warning(error:4045) /* array bounds overflow */
-+#pragma warning(error:4047) /* different levels of indirection */
-+#pragma warning(error:4049) /* terminating line number emission */
-+#pragma warning(error:4053) /* An expression of type void was used as an operand */
-+#pragma warning(error:4071) /* no function prototype given */
-+#pragma warning(disable:4101) /* unreferenced local variable */
-+#pragma warning(error:4150)
-+
-+#pragma warning(disable:4244)	/* No possible loss of data warnings */
-+#pragma warning(disable:4305)   /* No truncation from int to char warnings */
-+
-+/* work around Microsoft's premature attempt to deprecate the C-Library */
-+#pragma warning(disable:4996)   /* This function or variable may be unsafe. */
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
deleted file mode 100644
index 539bef79a035..000000000000
--- a/pango/pango-1.28.3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- misc/pango-1.28.3/configure	2010-09-29 13:02:33.000000000 +0200
-+++ misc/build/pango-1.28.3/configure	2011-03-01 17:56:26.000000000 +0100
-@@ -17980,8 +17980,6 @@
- 
- 
-   if test x$no_x = xyes ; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5
--$as_echo "$as_me: WARNING: X development libraries not found" >&2;}
-     have_x=false
-   else
-     X_LIBS="$X_LIBS -lX11"
-@@ -18596,16 +18594,16 @@
-   fi
- 
-   if $have_atsui; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
-+#    if test -n "$PKG_CONFIG" && \
-+#    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-quartz-font >= \$cairo_required\""; } >&5
-+#  ($PKG_CONFIG --exists --print-errors "cairo-quartz-font >= $cairo_required") 2>&5
-+#  ac_status=$?
-+#  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+#  test $ac_status = 0; }; then
-   have_cairo_atsui=true
--else
--  :
--fi
-+#else
-+#  :
-+#fi
-   fi
-   if $have_cairo_atsui; then
- 
-@@ -18858,20 +18856,20 @@
- fi
- 
- # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
--GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
--
-+#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-+GLIB_MKENUMS=glib-mkenums
- 
- 
- # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
- # necesary defines for thread-safety.
--GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
-+#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
- 
- # See if it's safe to turn G_DISABLE_DEPRECATED on.
--GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
--GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
--if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-+#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-+#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
-+#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
-   GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
--fi
-+#fi
- 
- #
- # Checks for LibThai
---- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
-+++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
-@@ -27,6 +27,12 @@
- #include "pango-impl-utils.h"
- #include "modules.h"
- 
-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+@class CALayer;
-+@class NSViewController;
-+typedef int NSColorRenderingIntent;
-+#endif
-+
- #import <Cocoa/Cocoa.h>
- 
- typedef struct _FontHashKey      FontHashKey;
---- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
-+++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
-@@ -22,6 +22,12 @@
- 
- #include "config.h"
- 
-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-+@class CALayer;
-+@class NSViewController;
-+typedef int NSColorRenderingIntent;
-+#endif
-+
- #import <Cocoa/Cocoa.h>
- 
- #include "pango-impl-utils.h"
diff --git a/pango/prj/build.lst b/pango/prj/build.lst
deleted file mode 100644
index 52aac94dbd20..000000000000
--- a/pango/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-pg	pango	: GETTEXT:gettext GLIB:glib soltools CAIRO:cairo NULL
-pg	pango			    usr1	-	all	pg_mkout NULL
-pg	pango			    nmake	-	all	pg_pango NULL
diff --git a/pango/prj/d.lst b/pango/prj/d.lst
deleted file mode 100644
index 2597aa37e623..000000000000
--- a/pango/prj/d.lst
+++ /dev/null
@@ -1,44 +0,0 @@
-mkdir: %_DEST%\inc\external
-mkdir: %_DEST%\inc\external\pango-1.0
-mkdir: %_DEST%\inc\external\pango-1.0\pango
-
-..\%__SRC%\inc\pango.h %_DEST%\inc\external\pango-1.0\pango\pango.h
-..\%__SRC%\inc\pangocairo.h %_DEST%\inc\external\pango-1.0\pango\pangocairo.h
-..\%__SRC%\inc\pangoatsui.h %_DEST%\inc\external\pango-1.0\pango\pangoatsui.h
-..\%__SRC%\inc\pango-attributes.h %_DEST%\inc\external\pango-1.0\pango\pango-attributes.h
-..\%__SRC%\inc\pango-bidi-type.h %_DEST%\inc\external\pango-1.0\pango\pango-bidi-type.h
-..\%__SRC%\inc\pango-break.h %_DEST%\inc\external\pango-1.0\pango\pango-break.h
-..\%__SRC%\inc\pango-context.h %_DEST%\inc\external\pango-1.0\pango\pango-context.h
-..\%__SRC%\inc\pango-coverage.h %_DEST%\inc\external\pango-1.0\pango\pango-coverage.h
-..\%__SRC%\inc\pango-engine.h %_DEST%\inc\external\pango-1.0\pango\pango-engine.h
-..\%__SRC%\inc\pango-enum-types.h %_DEST%\inc\external\pango-1.0\pango\pango-enum-types.h
-..\%__SRC%\inc\pango-features.h %_DEST%\inc\external\pango-1.0\pango\pango-features.h
-..\%__SRC%\inc\pango-font.h %_DEST%\inc\external\pango-1.0\pango\pango-font.h
-..\%__SRC%\inc\pango-fontmap.h %_DEST%\inc\external\pango-1.0\pango\pango-fontmap.h
-..\%__SRC%\inc\pango-fontset.h %_DEST%\inc\external\pango-1.0\pango\pango-fontset.h
-..\%__SRC%\inc\pango-glyph.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph.h
-..\%__SRC%\inc\pango-glyph-item.h %_DEST%\inc\external\pango-1.0\pango\pango-glyph-item.h
-..\%__SRC%\inc\pango-gravity.h %_DEST%\inc\external\pango-1.0\pango\pango-gravity.h
-..\%__SRC%\inc\pango-item.h %_DEST%\inc\external\pango-1.0\pango\pango-item.h
-..\%__SRC%\inc\pango-language.h %_DEST%\inc\external\pango-1.0\pango\pango-language.h
-..\%__SRC%\inc\pango-layout.h %_DEST%\inc\external\pango-1.0\pango\pango-layout.h
-..\%__SRC%\inc\pango-matrix.h %_DEST%\inc\external\pango-1.0\pango\pango-matrix.h
-..\%__SRC%\inc\pango-modules.h %_DEST%\inc\external\pango-1.0\pango\pango-modules.h
-..\%__SRC%\inc\pango-renderer.h %_DEST%\inc\external\pango-1.0\pango\pango-renderer.h
-..\%__SRC%\inc\pango-script.h %_DEST%\inc\external\pango-1.0\pango\pango-script.h
-..\%__SRC%\inc\pango-tabs.h %_DEST%\inc\external\pango-1.0\pango\pango-tabs.h
-..\%__SRC%\inc\pango-types.h %_DEST%\inc\external\pango-1.0\pango\pango-types.h
-..\%__SRC%\inc\pango-utils.h %_DEST%\inc\external\pango-1.0\pango\pango-utils.h
-
-..\%__SRC%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.0.dylib
-symlink: %_DEST%\lib\libpango-1.0.0.dylib %_DEST%\lib\libpango-1.0.dylib
-..\%__SRC%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.0.dylib
-symlink: %_DEST%\lib\libpangocairo-1.0.0.dylib %_DEST%\lib\libpangocairo-1.0.dylib
-
-..\%__SRC%\lib\pango-1.0.lib %_DEST%\lib\pango-1.0.lib
-..\%__SRC%\lib\pangocairo-1.0.lib %_DEST%\lib\pangocairo-1.0.lib
-..\%__SRC%\lib\pangowin32-1.0.lib %_DEST%\lib\pangowin32-1.0.lib
-
-..\%__SRC%\bin\*.dll %_DEST%\bin
-..\%__SRC%\bin\pango-querymodules %_DEST%\bin\pango-querymodules
-..\%__SRC%\bin\querymodules.exe %_DEST%\bin\pango-querymodules.exe
diff --git a/pango/prj/dmake b/pango/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/pango/prj/dmake
+++ /dev/null
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index e1187243aa59..2a7b91ae3107 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -53,9 +53,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_CURL \
 	SYSTEM_DB \
 	SYSTEM_EXPAT \
-	SYSTEM_GDKPIXBUF \
-	SYSTEM_GETTEXT \
-	SYSTEM_GLIB \
 	SYSTEM_GRAPHITE \
 	SYSTEM_HSQLDB \
 	SYSTEM_HUNSPELL \
@@ -63,12 +60,9 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_ICU \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
-	SYSTEM_LIBCROCO \
 	SYSTEM_LIBEXTTEXTCAT \
-	SYSTEM_LIBGSF \
 	SYSTEM_LIBJPEG \
 	SYSTEM_LIBLANGTAG \
-	SYSTEM_LIBRSVG \
 	SYSTEM_LIBXML \
 	SYSTEM_LIBXSLT \
 	SYSTEM_LPSOLVE \
@@ -100,8 +94,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_FONTCONFIG_DLL \
 	MINGW_FREETYPE_DLL \
 	MINGW_GCRYPT_DLL \
-	MINGW_GLIB_DLL \
-	MINGW_GMODULE_DLL \
 	MINGW_GNUTLS_DLL \
 	MINGW_GPG_ERROR_DLL \
 	MINGW_GRAPHITE2_DLL \
@@ -142,9 +134,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\
-		-DENABLE_LIBRSVG \
-	) \
 	$(if $(filter gcj,$(JDK)),\
 		-DGCJ \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9d59cc4c1c9d..ff1d50915437 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -573,7 +573,6 @@ End
 
 #if !defined SYSTEM_CAIRO \
     && (defined ENABLE_CAIRO_CANVAS \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \
         || (defined WNT && !defined ENABLE_DIRECTX))
 
 File gid_File_Lib_Cairo
@@ -1724,161 +1723,6 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
-#if !defined SYSTEM_GLIB \
-    && ((defined ENABLE_LIBLANGTAG && !defined SYSTEM_LIBLANGTAG) \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG))
-File gid_File_Lib_Glib
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libglib-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gliblo.dll";
-    #endif
-End
-File gid_File_Lib_Gthread
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgthread-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gthreadlo.dll";
-    #endif
-End
-File gid_File_Lib_Gobject
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgobject-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gobjectlo.dll";
-    #endif
-End
-File gid_File_Lib_Gio
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgio-2.0.0.dylib";
-    #elif defined WNT
-    Name = "giolo.dll";
-    #endif
-End
-File gid_File_Lib_Gmodule
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgmodule-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gmodulelo.dll";
-    #endif
-End
-#endif
-
-// RSVG and dependencies
-#if ENABLE_LIBRSVG
-#if ! defined (SYSTEM_GETTEXT)
-File gid_File_Lib_Intl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libintl.8.dylib";
-    #elif defined WNT
-    Name = "intl.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_GDKPIXBUF
-File gid_File_Lib_Gdkpixbuf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgdk_pixbuf-2.0.0.dylib";
-    #elif defined WNT
-    Name = "libgdk_pixbuf-2.0-0.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libcroco-0.6.3.0.1.dylib";
-    #elif defined WNT
-    Name = "libcroco-0.6-3.dll";
-    #endif
-End
-#endif
-
-#if ! defined LIBO_HEADLESS
-#if ! defined SYSTEM_PANGO
-File gid_File_Lib_Libpango
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpango-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangolo.dll";
-    #endif
-End
-File gid_File_Lib_Libpangocairo
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpangocairo-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangocairolo.dll";
-    #endif
-End
-#if defined WNT
-File gid_File_Lib_Libpangowin32
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "pangowin32lo.dll";
-End
-#endif
-#endif
-#endif
-
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-#ifdef WNT
-    Name = "gsf-1.dll";
-#endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBRSVG
-File gid_File_Lib_Librsvg
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "librsvg-2.2.dylib";
-    #elif defined WNT
-    Name = "librsvg-2-2.dll";
-    #endif
-End
-#endif
-
-#endif // #if ENABLE_LIBRSVG
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index dab712ae06ce..17d1139cb003 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -46,21 +46,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
 #endif
 #endif
 
-#if defined SYSTEM_GLIB || defined SYSTEM_LIBLANGTAG
-#ifdef NEEDS_MINGW_GLIB_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
-#endif
-#ifdef NEEDS_MINGW_GMODULE_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Gmodule, MINGW_GMODULE_DLL )
-#endif
-#endif
-
-#ifdef SYSTEM_LIBLANGTAG
-#ifdef NEEDS_MINGW_LIBLANGTAG_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblangtag, MINGW_LIBLANGTAG_DLL )
-#endif
-#endif
-
 #ifdef SYSTEM_LIBXSLT
 #ifdef NEEDS_MINGW_LIBEXSLT_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 8a358309620b..beefae616e8a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -305,32 +305,6 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root5,
-#if ! defined SYSTEM_GETTEXT
-    gid_File_Lib_Intl,
-#endif
-#if ! defined SYSTEM_GLIB
-    gid_File_Lib_Glib,
-    gid_File_Lib_Gobject,
-    gid_File_Lib_Gthread,
-    gid_File_Lib_Gmodule,
-    gid_File_Lib_Gio,
-#endif
-#if ! defined SYSTEM_GDKPIXBUF
-    gid_File_Lib_Gdkpixbuf,
-#endif
-#if ! defined SYSTEM_LIBCROCO
-    gid_File_Lib_Libcroco,
-#endif
-#if ! defined SYSTEM_PANGO
-    gid_File_Lib_Libpango,
-    gid_File_Lib_Libpangocairo,
-#ifdef WNT
-    gid_File_Lib_Libpangowin32,
-#endif
-#endif
-#if ! defined SYSTEM_LIBGSF
-    gid_File_Lib_Libgsf,
-#endif
 	gid_File_Lib_Dict_Ja,
 	gid_File_Lib_Dict_Zh,
     gid_File_Lib_Collator_Data,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 0df44d301f75..c6f7c29052cc 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -91,13 +91,6 @@ End
 
 #endif
 
-Shortcut gid_Shortcut_Lib_Libcroco
-    FileID = gid_File_Lib_Libcroco;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libcroco-0.6.3.dylib";
-    Styles = (NETWORK, RELATIVE);
-End
-
 #endif
 
 //i44154 -end-
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8051c98bb404..96ea27f5d5bc 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
deleted file mode 100644
index f5a7f57d6adc..000000000000
--- a/vcl/source/components/rasterizer_rsvg.cxx
+++ /dev/null
@@ -1,538 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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.
- *
- ************************************************************************/
-
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/alpha.hxx>
-#include <com/sun/star/graphic/XGraphicRasterizer.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <osl/module.h>
-
-#include <cairo.h>
-
-#include <vector>
-
-#if defined MACOSX
-    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0.0.dylib"
-    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2.2.dylib"
-#elif defined UNX
-    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0.so.0"
-    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2.so.2"
-#elif defined WNT
-    #define VCL_RSVG_GOBJECT_LIBNAME    "gobjectlo.dll"
-    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2-2.dll"
-#else
-    #define VCL_RSVG_GOBJECT_LIBNAME    "nogobjectlib"
-    #define VCL_RSVG_LIBRSVG_LIBNAME    "nolibrsvglib"
-#endif
-
-using namespace ::com::sun::star;
-
-// -----------------------------------------------------
-// - external stuff for dynamic library function calls -
-// -----------------------------------------------------
-
-typedef int gboolean;
-typedef unsigned char guint8;
-typedef sal_Size gsize;
-typedef void* gpointer;
-
-struct GError;
-
-struct RsvgHandle;
-struct RsvgDimensionData
-{
-    int width;
-    int height;
-    double em;
-    double ex;
-};
-
-namespace vcl
-{
-namespace rsvg
-{
-// -----------------
-// - Uno functions -
-// ----------------
-
-uno::Sequence< ::rtl::OUString > Rasterizer_getSupportedServiceNames()
-{
-    static ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRasterizer_RSVG" ) );
-    static uno::Sequence< ::rtl::OUString > aServiceNames( &aServiceName, 1 );
-
-    return( aServiceNames );
-}
-
-// -----------------------------------------------------------------------------
-
-::rtl::OUString Rasterizer_getImplementationName()
-{
-    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::rsvg::Rasterizer" ) );
-}
-
-// ------------------
-// - LibraryWrapper -
-// ------------------
-
-class LibraryWrapper
-{
-public:
-
-    static LibraryWrapper& get();
-
-    bool isValid() const { return( ( mpGObjectLib != NULL ) && ( mpRSVGLib != NULL ) ); }
-
-    // G-Object
-    gpointer g_object_unref( gpointer pointer ) { return( (*mp_g_object_unref)( pointer ) ); };
-
-    // LibRSVG
-    void rsvg_init() { (*mp_rsvg_init)(); }
-    RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) ); }
-    void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy ) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
-    void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
-    gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
-
-private:
-
-    LibraryWrapper();
-
-private:
-
-    oslModule mpGObjectLib;
-    oslModule mpRSVGLib;
-
-    // GObject
-    gpointer (*mp_g_object_unref)( gpointer );
-
-    // LibRSVG
-    void (*mp_rsvg_init)( void );
-    RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, GError** );
-    void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
-    void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
-    gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
-};
-
-// -----------------------------------------------------------------------------
-
-LibraryWrapper& LibraryWrapper::get()
-{
-    static LibraryWrapper* pLibraryInstance = NULL;
-
-    if( !pLibraryInstance )
-        pLibraryInstance = new LibraryWrapper;
-
-    return( *pLibraryInstance );
-}
-
-// -----------------------------------------------------------------------------
-
-LibraryWrapper::LibraryWrapper() :
-    mpGObjectLib( NULL ),
-    mpRSVGLib( NULL )
-{
-    const ::rtl::OUString aGObjectLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_GOBJECT_LIBNAME ) );
-    const ::rtl::OUString aRSVGLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_LIBRSVG_LIBNAME ) );
-    bool bCont = true;
-
-    // GObject
-    if( bCont && ( NULL != ( mpGObjectLib = osl_loadModule( aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) ) ||
-                   NULL != ( mpGObjectLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get,
-                                                                   aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) )
-
-                  ) )
-    {
-        mp_g_object_unref = ( gpointer (*)( gpointer ) ) osl_getAsciiFunctionSymbol( mpGObjectLib, "g_object_unref" );
-
-        if( !( mp_g_object_unref ) )
-        {
-            OSL_TRACE( "not all needed symbols were found in g-object library" );
-            bCont = false;
-        }
-    }
-
-    // LibRSVG
-    if( bCont && ( NULL != ( mpRSVGLib = osl_loadModule( aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) ) ||
-                   NULL != ( mpRSVGLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get,
-                                                                   aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) )
-                  ) )
-    {
-        mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_init" );
-        mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_new_from_data" );
-        mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" );
-        mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_get_dimensions" );
-        mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" );
-
-        if( !( mp_rsvg_init &&
-               mp_rsvg_handle_new_from_data &&
-               mp_rsvg_handle_set_dpi_x_y &&
-               mp_rsvg_handle_get_dimensions &&
-               mp_rsvg_handle_render_cairo ) )
-        {
-            OSL_TRACE( "not all needed symbols were found in librsvg library" );
-            bCont = false;
-        }
-    }
-
-    OSL_ENSURE( mpGObjectLib, "g-object library could not be loaded" );
-    OSL_ENSURE( mpRSVGLib, "librsvg library could not be loaded" );
-
-    bCont = bCont && mpGObjectLib != NULL && mpRSVGLib != NULL;
-
-    // unload all libraries in case of failure
-    if( !bCont )
-    {
-        if( mpRSVGLib )
-        {
-            osl_unloadModule( mpRSVGLib );
-            mpRSVGLib = NULL;
-        }
-
-        if( mpGObjectLib )
-        {
-            osl_unloadModule( mpGObjectLib );
-            mpGObjectLib = NULL;
-        }
-    }
-    else
-        rsvg_init();
-}
-
-// ---------------------------
-// - ::vcl::rsvg::Rasterizer -
-// ---------------------------
-
-class Rasterizer : public ::cppu::WeakAggImplHelper2< graphic::XGraphicRasterizer, lang::XServiceInfo >
-{
-public:
-                Rasterizer();
-    virtual     ~Rasterizer();
-
-    // XGraphicRasterizer
-    virtual ::sal_Bool SAL_CALL initializeData( const uno::Reference< io::XInputStream >& DataStream,
-                                                ::sal_uInt32 DPI_X, ::sal_uInt32 DPI_Y,
-                                                awt::Size& DefaultSizePixel )
-        throw ( uno::RuntimeException );
-
-    virtual uno::Reference< graphic::XGraphic > SAL_CALL rasterize( ::sal_uInt32 Width,
-                                                                    ::sal_uInt32 Height,
-                                                                    double RotateAngle,
-                                                                    double ShearAngle_X,
-                                                                    double ShearAngle_Y,
-                                                                    const uno::Sequence< beans::PropertyValue >& RasterizeProperties )
-        throw (uno::RuntimeException);
-
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
-        throw( uno::RuntimeException);
-
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& )
-        throw( uno::RuntimeException );
-
-    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-        throw( uno::RuntimeException );
-
-protected:
-
-    void        implFreeRsvgHandle();
-
-    uno::Reference< graphic::XGraphic > implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const;
-
-private:
-
-                Rasterizer( const Rasterizer& );
-    Rasterizer& operator=( const Rasterizer& );
-
-private:
-
-    RsvgHandle* mpRsvgHandle;
-    sal_Int32   mnDefaultWidth;
-    sal_Int32   mnDefaultHeight;
-    bool        mbLibInit;
-};
-
-// -----------------------------------------------------------------------------
-
-Rasterizer::Rasterizer() :
-    mpRsvgHandle( NULL ),
-    mnDefaultWidth( 0 ),
-    mnDefaultHeight( 0 ),
-    mbLibInit( true )
-{
-    try
-    {
-        LibraryWrapper& rLib = LibraryWrapper::get();
-        mbLibInit = rLib.isValid();
-    }
-    catch( ... )
-    {
-        mbLibInit = false;
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-Rasterizer::~Rasterizer()
-{
-    implFreeRsvgHandle();
-}
-
-// -----------------------------------------------------------------------------
-
-void Rasterizer::implFreeRsvgHandle()
-{
-    if( mpRsvgHandle )
-    {
-        LibraryWrapper::get().g_object_unref( static_cast< gpointer >( mpRsvgHandle ) );
-        mpRsvgHandle = NULL;
-    }
-}
-
-// -----------------------------------------------------------------------------
-
-uno::Reference< graphic::XGraphic > Rasterizer::implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const
-{
-    unsigned char*  pData = cairo_image_surface_get_data( pSurface );
-    const sal_Int32 nWidth = cairo_image_surface_get_width( pSurface );
-    const sal_Int32 nHeight = cairo_image_surface_get_height( pSurface );
-    const sal_Int32 nStride = cairo_image_surface_get_stride( pSurface );
-
-    uno::Reference< graphic::XGraphic > xRet;
-
-    if( pData && nWidth && nHeight && nStride )
-    {
-        Size                aSize( nWidth, nHeight );
-        Bitmap              aBmp( aSize, 24 );
-        AlphaMask           aAlphaMask( aSize );
-        BitmapWriteAccess*  pBmpAcc = aBmp.AcquireWriteAccess();
-        BitmapWriteAccess*  pAlpAcc = aAlphaMask.AcquireWriteAccess();
-
-        if( pBmpAcc && pAlpAcc )
-        {
-            BitmapColor aPixel, aWhitePixel( 255, 255, 255 ), aAlpha( 0 ), aFullAlpha( 255 );
-            sal_uInt32* pRow = reinterpret_cast< sal_uInt32* >( pData );
-
-            for( sal_Int32 nY = 0; nY < nHeight; ++nY, pRow = reinterpret_cast< sal_uInt32* >( pData += nStride )  )
-            {
-                for( sal_Int32 nX = 0; nX < nWidth; ++nX )
-                {
-                    const register sal_uInt32 nPixel = *pRow++;
-                    const register sal_uInt32 nAlpha = nPixel >> 24;
-
-                    if( !nAlpha )
-                    {
-                        pBmpAcc->SetPixel( nY, nX, aWhitePixel );
-                        pAlpAcc->SetPixel( nY, nX, aFullAlpha );
-                    }
-                    else
-                    {
-                        aPixel.SetRed( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x00ff0000 ) >> 16 ) * 255 ) / nAlpha ) );
-                        aPixel.SetGreen( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x0000ff00 ) >> 8 ) * 255 ) / nAlpha ) );
-                        aPixel.SetBlue( static_cast< sal_uInt8 >( ( ( nPixel & 0x000000ff ) * 255 ) / nAlpha ) );
-                        pBmpAcc->SetPixel( nY, nX, aPixel );
-
-                        aAlpha.SetIndex( static_cast< sal_uInt8 >( 255 - nAlpha ) );
-                        pAlpAcc->SetPixel( nY, nX, aAlpha );
-                    }
-                }
-            }
-
-            aBmp.ReleaseAccess( pBmpAcc );
-            aAlphaMask.ReleaseAccess( pAlpAcc );
-
-            const Graphic aGraphic( BitmapEx( aBmp, aAlphaMask ) );
-            xRet.set( aGraphic.GetXGraphic(), uno::UNO_QUERY );
-        }
-        else
-        {
-            aBmp.ReleaseAccess( pBmpAcc );
-            aAlphaMask.ReleaseAccess( pAlpAcc );
-        }
-    }
-
-    return( xRet );
-}
-
-// -----------------------------------------------------------------------------
-
-::sal_Bool SAL_CALL Rasterizer::initializeData( const uno::Reference< io::XInputStream >& rDataStream,
-                                                ::sal_uInt32 nDPI_X, ::sal_uInt32 nDPI_Y,
-                                                awt::Size& rDefaultSizePixel )
-        throw ( uno::RuntimeException )
-{
-    LibraryWrapper& rLib = LibraryWrapper::get();
-
-    implFreeRsvgHandle();
-
-    if( mbLibInit && rDataStream.is() )
-    {
-        ::std::vector< sal_Int8 >       aDataBuffer;
-        uno::Reference< io::XSeekable > xSeekable( rDataStream, uno::UNO_QUERY );
-        sal_Int32                       nReadSize, nBlockSize = ( xSeekable.is() ? xSeekable->getLength() : 65536 );
-        uno::Sequence< sal_Int8 >       aStmBuffer( nBlockSize );
-
-        do
-        {
-            nReadSize = rDataStream->readBytes( aStmBuffer, nBlockSize );
-
-            if( nReadSize > 0 )
-            {
-                const sal_Int8* pArray = aStmBuffer.getArray();
-                aDataBuffer.insert( aDataBuffer.end(), pArray, pArray + nReadSize );
-            }
-        }
-        while( nReadSize == nBlockSize );
-
-        if (aDataBuffer.size())
-        {
-            //See: fdo#50975 rsvg_handle_new_from_data calls
-            //rsvg_handle_fill_with_data which itself calls rsvg_handle_close
-            //on success.  Older versions of librsvg (e.g. 2.16.1) don't
-            //protect against rsvg_handle_close getting called twice, so we
-            //shouldn't additionally call svg_handle_close here.
-            mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ),
-                                                                       aDataBuffer.size(), NULL );
-        }
-    }
-
-    // get default dimensions of image
-    mnDefaultWidth = mnDefaultHeight = 0;
-
-    if( mpRsvgHandle )
-    {
-        RsvgDimensionData aDefaultDimension = { 0, 0, 0.0, 0.0 };
-
-        rLib.rsvg_handle_set_dpi_x_y( mpRsvgHandle, nDPI_X ? nDPI_X: 72, nDPI_Y ? nDPI_Y : 72 );
-        rLib.rsvg_handle_get_dimensions( mpRsvgHandle, &aDefaultDimension );
-
-        mnDefaultWidth = aDefaultDimension.width;
-        mnDefaultHeight = aDefaultDimension.height;
-    }
-
-    rDefaultSizePixel.Width = mnDefaultWidth;
-    rDefaultSizePixel.Height = mnDefaultHeight;
-
-    return( mpRsvgHandle != NULL );
-}
-
-// -----------------------------------------------------------------------------
-
-uno::Reference< graphic::XGraphic > SAL_CALL Rasterizer::rasterize( ::sal_uInt32 nWidth,
-                                                                    ::sal_uInt32 nHeight,
-                                                                    double /*fRotateAngle*/,
-                                                                    double /*fShearAngle_X*/,
-                                                                    double /*ShearAngle_Y*/,
-                                                                    const uno::Sequence< beans::PropertyValue >&
-                                                                        /*rRasterizeProperties*/ )
-        throw ( uno::RuntimeException )
-{
-    LibraryWrapper& rLib = LibraryWrapper::get();
-    uno::Reference< graphic::XGraphic > xRet;
-
-    if( mpRsvgHandle && rLib.isValid() && nWidth && nHeight && mnDefaultWidth && mnDefaultHeight )
-    {
-        cairo_surface_t* pSurface = cairo_image_surface_create( CAIRO_FORMAT_ARGB32, nWidth, nHeight );
-
-        if( pSurface && ( CAIRO_STATUS_SUCCESS == cairo_surface_status( pSurface ) ) )
-        {
-            cairo_t* pCr = cairo_create( pSurface );
-
-            if( pCr )
-            {
-                cairo_matrix_t aMatrix;
-
-                cairo_matrix_init_identity( &aMatrix );
-                cairo_matrix_scale( &aMatrix,
-                                     static_cast< double >( nWidth ) / mnDefaultWidth,
-                                     static_cast< double >( nHeight ) / mnDefaultHeight );
-                cairo_transform( pCr, &aMatrix );
-
-                if( rLib.rsvg_handle_render_cairo( mpRsvgHandle, pCr ) )
-                {
-                    xRet = implGetXGraphicFromSurface( pSurface );
-                }
-
-                cairo_destroy( pCr );
-            }
-
-           cairo_surface_destroy( pSurface );
-            OSL_ENSURE( xRet.is(), "SVG *not* rendered successfully" );
-        }
-    }
-
-    return( xRet );
-}
-
-// -----------------------------------------------------------------------------
-
-::rtl::OUString SAL_CALL Rasterizer::getImplementationName()
-    throw( uno::RuntimeException )
-{
-    return( Rasterizer_getImplementationName() );
-}
-
-// -----------------------------------------------------------------------------
-
-sal_Bool SAL_CALL Rasterizer::supportsService( const ::rtl::OUString& rServiceName )
-        throw( uno::RuntimeException )
-{
-    const uno::Sequence< ::rtl::OUString > aServices( Rasterizer_getSupportedServiceNames() );
-
-    for( sal_Int32 nService = 0; nService < aServices.getLength(); ++nService )
-    {
-        if( rServiceName == aServices[ nService ] )
-            return sal_True;
-    }
-
-    return sal_False;
-}
-
-// -----------------------------------------------------------------------------
-
-uno::Sequence< ::rtl::OUString > SAL_CALL Rasterizer::getSupportedServiceNames()
-    throw( uno::RuntimeException )
-{
-    return( Rasterizer_getSupportedServiceNames() );
-}
-
-// ------------------------------
-// - Uno instantiation function -
-// ------------------------------
-
-uno::Reference< uno::XInterface > SAL_CALL Rasterizer_createInstance( const uno::Reference< lang::XMultiServiceFactory >&  )
-{
-    return static_cast< ::cppu::OWeakObject* >( new rsvg::Rasterizer );
-}
-
-} // namespace rsvg
-} // namespace vcl
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
author	Tor Lillqvist <tml@iki.fi>	2012-11-06 18:08:16 +0200
committer	Tor Lillqvist <tml@iki.fi>	2012-11-06 18:59:44 +0200
commit	e10124b20efb8cb7caf0f02fc537147a6505aa1d (patch)
tree	4b1590fccf7d083da11a2e7e5b197af34d30b8f4
parent	7b58bf4c0bd6614e8ebf8d4fee880a235834323c (diff)