[Libreoffice-commits] .: config_host.mk.in configure.ac gdk-pixbuf/gdk-pixbuf-2.23.0.patch gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch gdk-pixbuf/makefile.mk gdk-pixbuf/prj gdk-pixbuf/README gettext/gettext-0.18.1.1.patch gettext/gettext-0.18.1.1.stpncpy.patch gettext/makefile.mk gettext/prj gettext/README glib/glib-2.28.1.noise.patch glib/glib-2.28.1.patch glib/glib-2.28.1-win32-2.patch glib/glib-2.28.1-win32.patch glib/makefile.mk glib/prj glib/README i18npool/CppunitTest_i18npool_test_languagetag.mk i18npool/Library_i18nisolang1.mk libcroco/libcroco-0.6.2.patch libcroco/makefile.mk libcroco/prj libcroco/README libgsf/libgsf-1.14.19.patch libgsf/libgsf-1.14.19.windows.patch libgsf/makefile.mk libgsf/prj libgsf/README librsvg/config.h librsvg/ExternalPackage_librsvg.mk librsvg/ExternalProject_librsvg.mk librsvg/Library_librsvg-2-2.mk librsvg/librsvg-2.32.1.patch librsvg/librsvg-2.32.1-win32.patch librsvg/Makefile librsvg/Module_librsvg.mk librsvg/prj librsvg/README librsvg/UnpackedTarball_r svg.mk Makefile.top Module_tail_build.mk ooo.lst.in pango/makefile.mk pango/pango-1.28.3-non-ascii.patch pango/pango-1.28.3.patch pango/pango-1.28.3-win32.patch pango/prj pango/README RepositoryExternal.mk Repository.mk RepositoryModule_ooo.mk scp2/InstallModule_ooo.mk scp2/source tail_build/prj vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 6 09:00:36 PST 2012
Makefile.top | 1
Module_tail_build.mk | 1
Repository.mk | 1
RepositoryExternal.mk | 194 -
RepositoryModule_ooo.mk | 1
config_host.mk.in | 14
configure.ac | 346 --
gdk-pixbuf/README | 10
gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch | 463 --
gdk-pixbuf/gdk-pixbuf-2.23.0.patch | 171 -
gdk-pixbuf/makefile.mk | 128
gdk-pixbuf/prj/build.lst | 3
gdk-pixbuf/prj/d.lst | 20
gettext/README | 5
gettext/gettext-0.18.1.1.patch | 3640 ----------------------
gettext/gettext-0.18.1.1.stpncpy.patch | 12
gettext/makefile.mk | 129
gettext/prj/build.lst | 3
gettext/prj/d.lst | 31
glib/README | 4
glib/glib-2.28.1-win32-2.patch | 553 ---
glib/glib-2.28.1-win32.patch | 1994 ------------
glib/glib-2.28.1.noise.patch | 12
glib/glib-2.28.1.patch | 153
glib/makefile.mk | 390 --
glib/prj/build.lst | 3
glib/prj/d.lst | 252 -
i18npool/CppunitTest_i18npool_test_languagetag.mk | 1
i18npool/Library_i18nisolang1.mk | 1
libcroco/README | 4
libcroco/libcroco-0.6.2.patch | 111
libcroco/makefile.mk | 153
libcroco/prj/build.lst | 3
libcroco/prj/d.lst | 39
libgsf/README | 4
libgsf/libgsf-1.14.19.patch | 90
libgsf/libgsf-1.14.19.windows.patch | 191 -
libgsf/makefile.mk | 159
libgsf/prj/build.lst | 3
libgsf/prj/d.lst | 59
librsvg/ExternalPackage_librsvg.mk | 18
librsvg/ExternalProject_librsvg.mk | 35
librsvg/Library_librsvg-2-2.mk | 75
librsvg/Makefile | 7
librsvg/Module_librsvg.mk | 28
librsvg/README | 4
librsvg/UnpackedTarball_rsvg.mk | 29
librsvg/config.h | 27
librsvg/librsvg-2.32.1-win32.patch | 380 --
librsvg/librsvg-2.32.1.patch | 60
librsvg/prj/build.lst | 2
ooo.lst.in | 7
pango/README | 3
pango/makefile.mk | 170 -
pango/pango-1.28.3-non-ascii.patch | 528 ---
pango/pango-1.28.3-win32.patch | 649 ---
pango/pango-1.28.3.patch | 95
pango/prj/build.lst | 3
pango/prj/d.lst | 44
scp2/InstallModule_ooo.mk | 11
scp2/source/ooo/file_library_ooo.scp | 156
scp2/source/ooo/mingw_dlls.scp | 15
scp2/source/ooo/module_hidden_ooo.scp | 26
scp2/source/ooo/shortcut_ooo.scp | 7
tail_build/prj/build.lst | 2
vcl/source/components/rasterizer_rsvg.cxx | 538 ---
66 files changed, 12 insertions(+), 12259 deletions(-)
New commits:
commit e10124b20efb8cb7caf0f02fc537147a6505aa1d
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Nov 6 18:08:16 2012 +0200
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
diff --git a/Makefile.top b/Makefile.top
index acdfcb9..1a56a3a 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 af387b1..142f828 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 de354f2..f4b6985 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 716e1a7..6d68b30 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 752bfdc..16732d4 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 48758f1..d4e83f2 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 a94739c..d5e784b 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 0af0a82..0000000
--- 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 a6f6a84..0000000
--- 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 at _get_type (void);\n#define GDK_TYPE_ at ENUMSHORT@ (@enum_name at _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 at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at 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 fccd992..0000000
--- 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 at 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 dec7ea4..0000000
--- 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, at 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 3064f62..0000000
--- 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 a6dac87..0000000
--- 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 e69de29..0000000
diff --git a/gettext/README b/gettext/README
deleted file mode 100644
index e2466ca..0000000
--- 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 3f1cdf3..0000000
--- 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list