[Libreoffice-commits] .: config_host.mk.in configure.in librsvg/config.h librsvg/ExternalProject_librsvg.mk librsvg/Library_librsvg-2-2.mk librsvg/librsvg-2.32.1-win32.patch librsvg/Makefile librsvg/makefile.mk librsvg/Module_librsvg.mk librsvg/prj librsvg/UnpackedTarball_rsvg.mk Makefile.top Module_tail_build.mk ooo.lst.in postprocess/prj RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 12 16:21:50 PDT 2012
Makefile.top | 2
Module_tail_build.mk | 1
Repository.mk | 1
RepositoryExternal.mk | 145 ++++++++++++++++++++++++++++++++++++
RepositoryFixes.mk | 7 +
RepositoryModule_ooo.mk | 1
config_host.mk.in | 1
configure.in | 3
librsvg/ExternalProject_librsvg.mk | 35 ++++++++
librsvg/Library_librsvg-2-2.mk | 70 +++++++++++++++++
librsvg/Makefile | 7 +
librsvg/Module_librsvg.mk | 27 ++++++
librsvg/UnpackedTarball_rsvg.mk | 29 +++++++
librsvg/config.h | 27 ++++++
librsvg/librsvg-2.32.1-win32.patch | 146 -------------------------------------
librsvg/makefile.mk | 129 --------------------------------
ooo.lst.in | 2
postprocess/prj/build.lst | 2
18 files changed, 357 insertions(+), 278 deletions(-)
New commits:
commit 8615d09bb10a91444b993fa8806696a7b01f06f9
Author: Peter Foley <pefoley2 at verizon.net>
Date: Wed Oct 10 21:43:21 2012 -0400
convert librsvg to gbuild
Change-Id: I1f84f85abc4e2db3679e64d34671458779ca97fa
diff --git a/Makefile.top b/Makefile.top
index 9658703..2b0cac0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -101,6 +101,7 @@ libcmis\
libmspub\
liborcus\
libpng\
+librsvg\
libvisio\
libwpd\
libwpg\
@@ -225,7 +226,6 @@ libcroco\
libexttextcat\
libgsf\
liblangtag\
-librsvg\
libxml2\
libxmlsec\
libxslt\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index af87b1c..b6c6512 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -89,6 +89,7 @@ $(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 1914420..3768ae8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -465,6 +465,7 @@ $(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 81f412d..5a3cf89 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1205,10 +1205,25 @@ 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 \
+)
endef
+endif # SYSTEM_GLIB
+
endif # ENABLE_GIO
define gb_LinkTarget__use_gtk
@@ -1234,11 +1249,26 @@ endif
endef
+ifeq ($(SYSTEM_GLIB),YES)
+
define gb_LinkTarget__use_gthread
$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
+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
@@ -1324,6 +1354,107 @@ 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 \
+)
+
+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 \
+)
+
+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 \
+)
+
+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 \
+)
+
+endef
+
+else # !SYSTEM_GDKPIXBUF
+
+gb_LinkTarget__use_pixbuf :=
+
+endif # SYSTEM_GDKPIXBUF
ifeq ($(SYSTEM_DB),YES)
@@ -1536,6 +1667,7 @@ $(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) \
@@ -1547,6 +1679,19 @@ $(call gb_LinkTarget_set_include,$(1),\
)
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)
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 2eb16df..74f7acb 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -111,6 +111,7 @@ gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFIL
else # $(COM) != GCC
gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst croco-0.6-3:icroco-0.6-3%,croco-0.6-3:libcroco-0.6-3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
@@ -133,12 +134,18 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
gb_Library_NOILIBFILENAMES := \
+ gdk_pixbuf-2.0 \
+ gio-2.0 \
glib-2.0 \
gmodule-2.0 \
+ gobject-2.0 \
+ gthread-2.0 \
graphite2_off \
icudt icuin icule icuuc \
langtag \
lcms2 \
+ pango-1.0 \
+ pangocairo-1.0 \
nspr4 \
nss3 \
smime3 \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 303a296..acdb736 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -98,6 +98,7 @@ $(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 2d431bf..8787a2e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -318,6 +318,7 @@ 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@
diff --git a/configure.in b/configure.in
index f2eb784..8ca933f 100644
--- a/configure.in
+++ b/configure.in
@@ -11528,6 +11528,7 @@ internal|fully-internal)
ENABLE_LIBRSVG=INTERNAL
SYSTEM_LIBRSVG=NO
BUILD_TYPE="$BUILD_TYPE LIBRSVG"
+ LIBRSVG_TARBALL="d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz"
;;
no)
@@ -11541,6 +11542,7 @@ no)
esac
AC_SUBST(ENABLE_LIBRSVG)
+AC_SUBST(LIBRSVG_TARBALL)
AC_SUBST(LIBRSVG_CFLAGS)
AC_SUBST(LIBRSVG_LIBS)
AC_SUBST(SYSTEM_LIBRSVG)
@@ -11812,6 +11814,7 @@ if test "$SYSTEM_LIBRSVG" = YES; then
AC_MSG_RESULT([yes])
elif test "$enable_librsvg" = fully-internal; then
SYSTEM_LIBGSF=NO
+
AC_MSG_RESULT([no])
else
case "$_os" in
diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk
new file mode 100755
index 0000000..5623d9c
--- /dev/null
+++ b/librsvg/ExternalProject_librsvg.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,librsvg))
+
+$(eval $(call gb_ExternalProject_use_unpacked,librsvg,rsvg))
+
+$(eval $(call gb_ExternalProject_register_targets,librsvg,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,librsvg,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure --disable-gtk-theme --disable-tools --with-croco --with-svgz \
+ --disable-pixbuf-loader --disable-dependency-tracking \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ LIBCROCO_CFLAGS="-I$(OUTDIR)/inc/external/libcroco-0.6" \
+ LIBCROCO_LIBS="-lcroco-0.6" \
+ GTHREAD_CFLAGS="-I$(OUTDIR)/inc/external/glib-2.0" \
+ GTHREAD_LIBS="-lgthread-2.0" \
+ GDK_PIXBUF_CFLAGS="-I$(OUTDIR)/inc/external/gdk-pixbuf-2.0" \
+ GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0" \
+ LIBRSVG_CFLAGS="-I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS),-I$(OUTDIR)/inc/externel/libxml)" \
+ LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2) -lcairo -lintl" \
+ CFLAGS="-I$(OUTDIR)/inc/external -I$(OUTDIR)/inc/external/glib-2.0 -I$(OUTDIR)/inc/external/gdk-pixbuf-2.0 -I$(OUTDIR)/inc/external/pango-1.0 -I$(OUTDIR)/inc/cairo" \
+ LDFLAGS="$(foreach lib,cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0,-Wl,-dylib_file, at loader_path/lib$(lib).dylib:$(OUTDIR)/lib/lib$(lib).dylib) $(if $(filter NO,$(SYSTEM_LIBXML)), -Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)"
+ && $(GNUMAKE) -j$(EXTMAXPROCESS) \
+ && touch $@
+# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Library_librsvg-2-2.mk b/librsvg/Library_librsvg-2-2.mk
new file mode 100644
index 0000000..2dfb2bc
--- /dev/null
+++ b/librsvg/Library_librsvg-2-2.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,librsvg-2-2))
+
+$(eval $(call gb_Library_use_unpacked,librsvg-2-2,rsvg))
+
+$(eval $(call gb_Library_use_externals,librsvg-2-2,\
+ gobject \
+ gio \
+ glib \
+ gthread \
+ cairo \
+ libxml2 \
+ croco \
+ pango \
+ gsf \
+ pixbuf \
+))
+
+# Generate a import library
+$(eval $(call gb_Library_add_ldflags,librsvg-2-2,\
+ -EXPORT:GetVersionInfo \
+))
+
+$(eval $(call gb_Library_add_defs,librsvg-2-2,\
+ -DHAVE_GSF \
+ -DHAVE_LIBCROCO \
+))
+
+$(eval $(call gb_Library_set_warnings_not_errors,librsvg-2-2))
+
+$(eval $(call gb_Library_add_generated_cobjects,librsvg-2-2,\
+ UnpackedTarball/rsvg/librsvg-enum-types \
+ UnpackedTarball/rsvg/librsvg-features \
+ UnpackedTarball/rsvg/rsvg-affine \
+ UnpackedTarball/rsvg/rsvg-base-file-util \
+ UnpackedTarball/rsvg/rsvg-base \
+ UnpackedTarball/rsvg/rsvg-bpath-util \
+ UnpackedTarball/rsvg/rsvg-cairo-clip \
+ UnpackedTarball/rsvg/rsvg-cairo-draw \
+ UnpackedTarball/rsvg/rsvg-cairo-render \
+ UnpackedTarball/rsvg/rsvg-cond \
+ UnpackedTarball/rsvg/rsvg-convert \
+ UnpackedTarball/rsvg/rsvg-css \
+ UnpackedTarball/rsvg/rsvg-defs \
+ UnpackedTarball/rsvg/rsvg-file-util \
+ UnpackedTarball/rsvg/rsvg-filter \
+ UnpackedTarball/rsvg/rsvg-gobject \
+ UnpackedTarball/rsvg/rsvg-image \
+ UnpackedTarball/rsvg/rsvg-marker \
+ UnpackedTarball/rsvg/rsvg-mask \
+ UnpackedTarball/rsvg/rsvg-paint-server \
+ UnpackedTarball/rsvg/rsvg-path \
+ UnpackedTarball/rsvg/rsvg-shapes \
+ UnpackedTarball/rsvg/rsvg-structure \
+ UnpackedTarball/rsvg/rsvg-styles \
+ UnpackedTarball/rsvg/rsvg-text \
+ UnpackedTarball/rsvg/rsvg-xml \
+ UnpackedTarball/rsvg/rsvg \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Makefile b/librsvg/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/librsvg/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/librsvg/Module_librsvg.mk b/librsvg/Module_librsvg.mk
new file mode 100644
index 0000000..3e58b9e
--- /dev/null
+++ b/librsvg/Module_librsvg.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,librsvg))
+
+ifeq ($(SYSTEM_LIBRSVG),NO)
+$(eval $(call gb_Module_add_targets,librsvg,\
+ UnpackedTarball_rsvg \
+))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,librsvg,\
+ ExternalProject_librsvg \
+))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,librsvg,\
+ Library_librsvg-2-2 \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/librsvg/UnpackedTarball_rsvg.mk b/librsvg/UnpackedTarball_rsvg.mk
new file mode 100755
index 0000000..599af98
--- /dev/null
+++ b/librsvg/UnpackedTarball_rsvg.mk
@@ -0,0 +1,29 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,rsvg))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,rsvg,$(LIBRSVG_TARBALL)))
+
+#$(eval $(call gb_UnpackedTarball_set_patchlevel,rsvg,3))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,rsvg,\
+ librsvg/librsvg-2.32.1.patch \
+))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,rsvg,\
+ librsvg/librsvg-2.32.1-win32.patch \
+))
+$(eval $(call gb_UnpackedTarball_add_files,rsvg,,\
+ librsvg/config.h \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
\ No newline at end of file
diff --git a/librsvg/config.h b/librsvg/config.h
new file mode 100755
index 0000000..6e87dac
--- /dev/null
+++ b/librsvg/config.h
@@ -0,0 +1,27 @@
+#define HAVE_FLOAT_H 1
+/* #undef ENABLE_XEMBED */
+/* #undef HAVE_BASENAME */
+/* #undef HAVE_DLFCN_H */
+#define HAVE_GIO 1
+/* #undef HAVE_INTTYPES_H */
+/* #undef HAVE_LC_MESSAGES */
+#define HAVE_LOCALE_H 1
+#define HAVE_MEMORY_H 1
+/* #undef HAVE_STDINT_H */
+#define HAVE_STDLIB_H 1
+/* #undef HAVE_STRINGS_H */
+#define HAVE_STRING_H 1
+/* #undef HAVE_STRTOK_R */
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+/* #undef HAVE_UNISTD_H */
+
+#define PACKAGE "librsvg"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME ""
+#define PACKAGE_STRING ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_VERSION ""
+#define VERSION "2.32.1"
+#define STDC_HEADERS 1
+#define X_DISPLAY_MISSING 1
\ No newline at end of file
diff --git a/librsvg/librsvg-2.32.1-win32.patch b/librsvg/librsvg-2.32.1-win32.patch
index 0bdf11d..d3a342e 100644
--- a/librsvg/librsvg-2.32.1-win32.patch
+++ b/librsvg/librsvg-2.32.1-win32.patch
@@ -378,149 +378,3 @@
image->super.free = rsvg_node_image_free;
image->super.draw = rsvg_node_image_draw;
image->super.set_atts = rsvg_node_image_set_atts;
---- misc/librsvg-2.32.1/config.h 2011-03-28 20:38:20.301880800 +0200
-+++ misc/build/librsvg-2.32.1/config.h 2011-03-28 20:40:54.958130800 +0200
-@@ -1 +1,27 @@
--dummy
-+#define HAVE_FLOAT_H 1
-+/* #undef ENABLE_XEMBED */
-+/* #undef HAVE_BASENAME */
-+/* #undef HAVE_DLFCN_H */
-+#define HAVE_GIO 1
-+/* #undef HAVE_INTTYPES_H */
-+/* #undef HAVE_LC_MESSAGES */
-+#define HAVE_LOCALE_H 1
-+#define HAVE_MEMORY_H 1
-+/* #undef HAVE_STDINT_H */
-+#define HAVE_STDLIB_H 1
-+/* #undef HAVE_STRINGS_H */
-+#define HAVE_STRING_H 1
-+/* #undef HAVE_STRTOK_R */
-+#define HAVE_SYS_STAT_H 1
-+#define HAVE_SYS_TYPES_H 1
-+/* #undef HAVE_UNISTD_H */
-+
-+#define PACKAGE "librsvg"
-+#define PACKAGE_BUGREPORT ""
-+#define PACKAGE_NAME ""
-+#define PACKAGE_STRING ""
-+#define PACKAGE_TARNAME ""
-+#define PACKAGE_VERSION ""
-+#define VERSION "2.32.1"
-+#define STDC_HEADERS 1
-+#define X_DISPLAY_MISSING 1
---- misc/librsvg-2.32.1/makefile.mk 2011-03-28 20:38:20.489380800 +0200
-+++ misc/build/librsvg-2.32.1/makefile.mk 2011-03-28 20:40:38.786255800 +0200
-@@ -1 +1,111 @@
--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=librsvg
-+TARGET=librsvg-2-2
-+
-+VISIBILITY_HIDDEN=TRUE
-+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
-+
-+# --- Settings ----------------------------------
-+
-+.INCLUDE : settings.mk
-+
-+CFLAGS+= -DHAVE_GSF -DHAVE_LIBCROCO \
-+ -I. -I$(SOLARINCDIR)$/external/glib-2.0 \
-+ -I. -I$(SOLARINCDIR)$/external/gdk-pixbuf-2.0 \
-+ -I$(SOLARINCDIR)$/external/pango-1.0 \
-+ -I$(SOLARINCDIR)$/external/cairo \
-+ -I$(SOLARINCDIR)$/external/libgsf-1 \
-+ -I$(SOLARINCDIR)$/external/libcroco-0.6
-+
-+# --- Files -------------------------------------
-+
-+SLOFILES=\
-+ $(SLO)$/librsvg-enum-types.obj \
-+ $(SLO)$/librsvg-features.obj \
-+ $(SLO)$/rsvg-affine.obj \
-+ $(SLO)$/rsvg-base-file-util.obj \
-+ $(SLO)$/rsvg-base.obj \
-+ $(SLO)$/rsvg-bpath-util.obj \
-+ $(SLO)$/rsvg-cairo-clip.obj \
-+ $(SLO)$/rsvg-cairo-draw.obj \
-+ $(SLO)$/rsvg-cairo-render.obj \
-+ $(SLO)$/rsvg-cond.obj \
-+ $(SLO)$/rsvg-convert.obj \
-+ $(SLO)$/rsvg-css.obj \
-+ $(SLO)$/rsvg-defs.obj \
-+ $(SLO)$/rsvg-file-util.obj \
-+ $(SLO)$/rsvg-filter.obj \
-+ $(SLO)$/rsvg-gobject.obj \
-+ $(SLO)$/rsvg-image.obj \
-+ $(SLO)$/rsvg-marker.obj \
-+ $(SLO)$/rsvg-mask.obj \
-+ $(SLO)$/rsvg-paint-server.obj \
-+ $(SLO)$/rsvg-path.obj \
-+ $(SLO)$/rsvg-shapes.obj \
-+ $(SLO)$/rsvg-structure.obj \
-+ $(SLO)$/rsvg-styles.obj \
-+ $(SLO)$/rsvg-text.obj \
-+ $(SLO)$/rsvg-xml.obj \
-+ $(SLO)$/rsvg.obj
-+
-+# --- Library -----------------------------------
-+
-+SHL1TARGET= $(TARGET)
-+SHL1OBJS=$(SLOFILES)
-+SHL1STDLIBS=\
-+ intl.lib \
-+ gobject-2.0.lib \
-+ gmodule-2.0.lib \
-+ glib-2.0.lib \
-+ gio-2.0.lib \
-+ gthread-2.0.lib \
-+ gdk_pixbuf-2.0.lib \
-+ cairo.lib \
-+ libxml2.lib \
-+ igsf-1.lib \
-+ libcroco-0.6-3.lib \
-+ pango-1.0.lib \
-+ pangocairo-1.0.lib
-+
-+SHL1IMPLIB= i$(TARGET)
-+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-+DEF1NAME= $(SHL1TARGET)
-+DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt $(SLB)$/$(TARGET).lib
-+DEFLIB1NAME= $(TARGET)
-+
-+# --- Targets ----------------------------------
-+
-+.INCLUDE : target.mk
-+
-+# --- filter file ------------------------------
-+
-+$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-+ @echo CLEAR_THE_FILE > $@
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
deleted file mode 100644
index fea2c8f..0000000
--- a/librsvg/makefile.mk
+++ /dev/null
@@ -1,129 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=librsvg
-TARGET=so_librsvg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_LIBRSVG)" == "YES"
-all:
- @echo "An already available installation of librsvg should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-LIBRSVGVERSION=2.32.1
-
-TARFILE_NAME=$(PRJNAME)-$(LIBRSVGVERSION)
-TARFILE_MD5=d7a242ca43e33e1b63d3073f9d46a6a8
-
-.IF "$(OS)" == "MACOSX" || "$(OS)" == "WNT"
-
-.IF "$(OS)" == "MACOSX"
-
-PATCH_FILES=librsvg-2.32.1.patch
-
-LOADER_PATTERN:=-Wl,-dylib_file, at loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME
-LOADER_LIBS:=cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0
-EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN)))
-
-.IF "$(LIBXML_LIBS)" == ""
-LIBXML_LIBS=-lxml2
-.ENDIF
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-my_libxml2_cflags=$(LIBXML_CFLAGS)
-my_libxml2_libs=$(LIBXML_LIBS)
-my_dylib_file=
-.ELSE
-my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml
-my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2
-my_dylib_file="-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib"
-.ENDIF
-
-CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))
-CONFIGURE_DIR=
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
- --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
- LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags)" \
- LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl" \
- GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
- GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \
- GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \
- GTHREAD_LIBS=-lgthread-2.0 \
- LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \
- LIBCROCO_LIBS=-lcroco-0.6 \
- CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \
- LDFLAGS="$(CONFIGURE_LDFLAGS) $(my_dylib_file)"
-
-CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
- $(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-
-OUT2LIB+=.libs/librsvg-2.2.dylib
-
-OUT2INC+=librsvg-enum-types.h
-OUT2INC+=librsvg-features.h
-OUT2INC+=rsvg-cairo.h
-OUT2INC+=rsvg.h
-
-.ELIF "$(OS)"=="WNT"
-
-PATCH_FILES=librsvg-2.32.1-win32.patch
-ADDITIONAL_FILES=config.h makefile.mk
-
-BUILD_DIR=.
-BUILD_ACTION=dmake
-
-OUT2INC+=librsvg-enum-types.h
-OUT2INC+=librsvg-features.h
-OUT2INC+=rsvg-cairo.h
-OUT2INC+=rsvg.h
-
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/librsvg/prj/dmake b/librsvg/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index c66cfcd..f3cfcc2 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -41,7 +41,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
-d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
+ at LIBRSVG_TARBALL@
2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index f1fd67d..49180ea 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm HELP:helpcontent2 LIBRSVG:librsvg ODK:odk LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n EPM:epm HELP:helpcontent2 ODK:odk LANGUAGETOOL:languagetool MYSQLC:mysqlc DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
More information about the Libreoffice-commits
mailing list