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

Makefile.top

@@ -167,6 +167,7 @@ sot\
 starmath\
 stoc\
 store\
+svgio\
 svl\
 svtools\
 svx\

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 \

Repository.mk

@@ -465,7 +465,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     pyuno \
     pyuno_wrapper \
     recentfile \
-	librsvg-2-2 \
     scriptframe \
     sdbc2 \
     smoketest \

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

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 \

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@

gdk-pixbuf/README

-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

gdk-pixbuf/gdk-pixbuf-2.23.0.patch

---- 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;
-        }

gdk-pixbuf/makefile.mk

-#*************************************************************************
-#
-# 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

gdk-pixbuf/prj/build.lst

-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

gdk-pixbuf/prj/d.lst

-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

gettext/README

-
-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 ]
-

gettext/gettext-0.18.1.1.stpncpy.patch

---- 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];

gettext/makefile.mk

-#*************************************************************************
-#
-# 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
-

gettext/prj/build.lst

-gt	gettext	: soltools NULL
-gt	gettext			    usr1	-	all	gt_mkout NULL
-gt	gettext			    nmake	-	all	gt_gettext NULL

gettext/prj/d.lst

-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

glib/README

-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

glib/glib-2.28.1.noise.patch

---- 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		\

glib/glib-2.28.1.patch

---- 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 {

glib/prj/build.lst

-gl	glib	: GETTEXT:gettext ZLIB:zlib NULL
-gl	glib			    usr1	-	all	gl_mkout NULL
-gl	glib			    nmake	-	all	gl_glib NULL

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))

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

libcroco/README

-A general CSS parsing and manipulation library written in C for the GNOME project.
-
-From:
-[https://launchpad.net/libcroco]

libcroco/libcroco-0.6.2.patch

---- 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	> $@
-+

libcroco/prj/build.lst

-cr	libcroco	: LIBXML2:libxml2 GLIB:glib soltools NULL
-cr	libcroco			    usr1	-	all	cr_mkout NULL
-cr	libcroco			    nmake	-	all	cr_libcroco NULL

libgsf/README

-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]

libgsf/prj/build.lst

-gs	libgsf	: GLIB:glib soltools NULL
-gs	libgsf			    usr1	-	all	gs_mkout NULL
-gs	libgsf			    nmake	-	all	gs_libgsf NULL

librsvg/ExternalPackage_librsvg.mk

-# -*- 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:

librsvg/Makefile

-# -*- 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:

librsvg/prj/build.lst

-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