[Libreoffice-commits] .: 12 commits - boost/Module_boost.mk boost/StaticLibrary_boostdatetime.mk boost/StaticLibrary_boostthread.mk clucene/Library_clucene.mk config_host.mk.in configure.in libcdr/Makefile libcdr/makefile.mk libcdr/Module_libcdr.mk libcdr/Package_libcdr.mk libcdr/prj libcdr/StaticLibrary_cdr.mk libcdr/UnpackedTarball_cdr.mk libcmis/Makefile libcmis/Module_libcmis.mk libcmis/Package_libcmis.mk libcmis/prj libcmis/StaticLibrary_cmis.mk libcmis/UnpackedTarball_cmis.mk libmspub/Makefile libmspub/makefile.mk libmspub/Module_libmspub.mk libmspub/Package_libmspub.mk libmspub/prj libmspub/StaticLibrary_mspub.mk libmspub/UnpackedTarball_mspub.mk libvisio/Makefile libvisio/makefile.mk libvisio/Module_libvisio.mk libvisio/Package_libvisio.mk libvisio/prj libvisio/StaticLibrary_visio.mk libvisio/UnpackedTarball_visio.mk libwpd/Makefile libwpd/makefile.mk libwpd/Module_libwpd.mk libwpd/Package_libwpd.mk libwpd/prj libwpd/StaticLibrary_wpd.mk libwpd/UnpackedTarball_wpd.mk libwpg/libwpg -0.2.1-build.patch libwpg/Makefile libwpg/makefile.mk libwpg/Module_libwpg.mk libwpg/Package_libwpg.mk libwpg/prj libwpg/StaticLibrary_wpg.mk libwpg/UnpackedTarball_wpg.mk libwps/Makefile libwps/makefile.mk libwps/Module_libwps.mk libwps/Package_libwps.mk libwps/prj libwps/StaticLibrary_wps.mk libwps/UnpackedTarball_wps.mk Makefile.top Module_tail_build.mk ooo.lst.in RepositoryExternal.mk RepositoryModule_ooo.mk solenv/gbuild tail_build/prj ucb/prj vcl/Library_vcl.mk writerperfect/Module_writerperfect.mk writerperfect/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 8 04:15:48 PDT 2012
Makefile.top | 14 +-
Module_tail_build.mk | 7 +
RepositoryExternal.mk | 12 +-
RepositoryModule_ooo.mk | 7 +
boost/Module_boost.mk | 10 -
boost/StaticLibrary_boostdatetime.mk | 2
boost/StaticLibrary_boostthread.mk | 2
clucene/Library_clucene.mk | 2
config_host.mk.in | 11 +
configure.in | 27 ++--
libcdr/Makefile | 7 +
libcdr/Module_libcdr.mk | 22 +++
libcdr/Package_libcdr.mk | 21 +++
libcdr/StaticLibrary_cdr.mk | 44 +++++++
libcdr/UnpackedTarball_cdr.mk | 18 +++
libcdr/makefile.mk | 74 -------------
libcdr/prj/build.lst | 2
libcdr/prj/d.lst | 7 -
libcmis/Makefile | 7 +
libcmis/Module_libcmis.mk | 22 +++
libcmis/Package_libcmis.mk | 38 ++++++
libcmis/StaticLibrary_cmis.mk | 38 ++++++
libcmis/UnpackedTarball_cmis.mk | 25 ++++
libcmis/prj/d.lst | 6 -
libmspub/Makefile | 7 +
libmspub/Module_libmspub.mk | 22 +++
libmspub/Package_libmspub.mk | 20 +++
libmspub/StaticLibrary_mspub.mk | 42 +++++++
libmspub/UnpackedTarball_mspub.mk | 18 +++
libmspub/makefile.mk | 75 -------------
libmspub/prj/build.lst | 2
libmspub/prj/d.lst | 6 -
libvisio/Makefile | 7 +
libvisio/Module_libvisio.mk | 22 +++
libvisio/Package_libvisio.mk | 20 +++
libvisio/StaticLibrary_visio.mk | 45 +++++++
libvisio/UnpackedTarball_visio.mk | 14 ++
libvisio/makefile.mk | 67 -----------
libvisio/prj/build.lst | 2
libvisio/prj/d.lst | 6 -
libwpd/Makefile | 7 +
libwpd/Module_libwpd.mk | 22 +++
libwpd/Package_libwpd.mk | 31 +++++
libwpd/StaticLibrary_wpd.mk | 193 ++++++++++++++++++++++++++++++++++
libwpd/UnpackedTarball_wpd.mk | 18 +++
libwpd/makefile.mk | 60 ----------
libwpd/prj/d.lst | 15 --
libwpg/Makefile | 7 +
libwpg/Module_libwpg.mk | 22 +++
libwpg/Package_libwpg.mk | 20 +++
libwpg/StaticLibrary_wpg.mk | 35 ++++++
libwpg/UnpackedTarball_wpg.mk | 14 ++
libwpg/libwpg-0.2.1-build.patch | 11 -
libwpg/makefile.mk | 65 -----------
libwpg/prj/build.lst | 2
libwpg/prj/d.lst | 6 -
libwps/Makefile | 7 +
libwps/Module_libwps.mk | 22 +++
libwps/Package_libwps.mk | 19 +++
libwps/StaticLibrary_wps.mk | 46 ++++++++
libwps/UnpackedTarball_wps.mk | 14 ++
libwps/makefile.mk | 62 ----------
libwps/prj/build.lst | 2
libwps/prj/d.lst | 5
ooo.lst.in | 14 +-
solenv/gbuild/Executable.mk | 2
solenv/gbuild/Library.mk | 2
solenv/gbuild/LinkTarget.mk | 24 +---
solenv/gbuild/StaticLibrary.mk | 2
tail_build/prj/build.lst | 2
ucb/prj/build.lst | 2
vcl/Library_vcl.mk | 1
writerperfect/Module_writerperfect.mk | 18 +--
writerperfect/prj/build.lst | 2
74 files changed, 1035 insertions(+), 539 deletions(-)
New commits:
commit edddab206f0c86e7d2869bc72d00b4f3af7901ba
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Sep 8 13:02:32 2012 +0200
group this together
Change-Id: Ifa07910cc767c5824997c48d573e7a7601719274
diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk
index bb51163..45677ff 100644
--- a/boost/Module_boost.mk
+++ b/boost/Module_boost.mk
@@ -13,15 +13,6 @@ ifeq ($(SYSTEM_BOOST),NO)
$(eval $(call gb_Module_add_targets,boost,\
StaticLibrary_boostdatetime \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,boost,\
- StaticLibrary_boostthread \
-))
-endif
-
-$(eval $(call gb_Module_add_targets,boost,\
UnpackedTarball_boost \
))
@@ -29,6 +20,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,boost,\
Package_boostdatetime \
Package_boostthread \
+ StaticLibrary_boostthread \
))
endif
commit b409f11f8ba2595e8f630c0b82ef8d919cb98148
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 6 20:37:45 2012 +0200
rename: set_cxx_suffix -> set_generated_cxx_suffix; used for external libs
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boostdatetime.mk
index 85ba8ff..cdd2bb2 100644
--- a/boost/StaticLibrary_boostdatetime.mk
+++ b/boost/StaticLibrary_boostdatetime.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime))
$(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,boostdatetime,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk
index 1b4c8fe..9a00cd9 100644
--- a/boost/StaticLibrary_boostthread.mk
+++ b/boost/StaticLibrary_boostthread.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread))
$(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,boostthread,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostthread,\
UnpackedTarball/boost/libs/thread/src/win32/thread \
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index cd99bdb..d8874c4 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,clucene,\
))
endif
-$(eval $(call gb_Library_set_cxx_suffix,clucene,cpp))
+$(eval $(call gb_Library_set_generated_cxx_suffix,clucene,cpp))
$(eval $(call gb_Library_add_generated_exception_objects,clucene,\
UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \
diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk
index d0f07a2..6fb1a3c 100644
--- a/libcdr/StaticLibrary_cdr.mk
+++ b/libcdr/StaticLibrary_cdr.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
zlib \
))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,cdrlib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,cdrlib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
UnpackedTarball/cdr/src/lib/CDRCollector \
diff --git a/libmspub/StaticLibrary_mspub.mk b/libmspub/StaticLibrary_mspub.mk
index 2d6ab45..37c7c1d 100644
--- a/libmspub/StaticLibrary_mspub.mk
+++ b/libmspub/StaticLibrary_mspub.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,mspublib,\
zlib \
))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,mspublib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,mspublib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mspublib,\
UnpackedTarball/mspub/src/lib/ColorReference \
diff --git a/libvisio/StaticLibrary_visio.mk b/libvisio/StaticLibrary_visio.mk
index c917b6f..0bba6b6 100644
--- a/libvisio/StaticLibrary_visio.mk
+++ b/libvisio/StaticLibrary_visio.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_StaticLibrary_use_externals,visiolib,\
wpg \
))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,visiolib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,visiolib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\
UnpackedTarball/visio/src/lib/libvisio_utils \
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
index 283cddf..9464225 100644
--- a/libwpd/StaticLibrary_wpd.mk
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd))
$(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpdlib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpdlib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
UnpackedTarball/wpd/src/lib/libwpd_internal \
diff --git a/libwpg/StaticLibrary_wpg.mk b/libwpg/StaticLibrary_wpg.mk
index 6ce7499..faaa5a3 100644
--- a/libwpg/StaticLibrary_wpg.mk
+++ b/libwpg/StaticLibrary_wpg.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpglib,\
wpd \
))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpglib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpglib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\
UnpackedTarball/wpg/src/lib/WPG1Parser \
diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk
index 150d8cd..b18b583 100644
--- a/libwps/StaticLibrary_wps.mk
+++ b/libwps/StaticLibrary_wps.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpslib,\
wpd \
))
-$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpslib,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpslib,cpp))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\
UnpackedTarball/wps/src/lib/libwps_internal \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 72e9481..db901f0 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -131,7 +131,7 @@ $(eval $(foreach method,\
add_sdi_headers \
add_nativeres \
set_warnings_not_errors \
- set_cxx_suffix \
+ set_generated_cxx_suffix \
,\
$(call gb_Executable_forward_to_Linktarget,$(method))\
))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 0c36e0a..4dc30b0 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -218,7 +218,7 @@ $(eval $(foreach method,\
export_objects_list \
add_nativeres \
set_warnings_not_errors \
- set_cxx_suffix \
+ set_generated_cxx_suffix \
,\
$(call gb_Library__forward_to_Linktarget,$(method))\
))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 19e944c..955b13d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1129,8 +1129,8 @@ endef
#
# This is useful for external libraries.
#
-# gb_LinkTarget_set_cxx_suffix linktarget used-suffix
-define gb_LinkTarget_set_cxx_suffix
+# gb_LinkTarget_set_generated_cxx_suffix linktarget used-suffix
+define gb_LinkTarget_set_generated_cxx_suffix
gb_LinkTarget_CXX_SUFFIX_$(1) := $(2)
endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 8b80dda..dd972fd 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -127,7 +127,7 @@ $(eval $(foreach method,\
use_unpacked \
add_sdi_headers \
set_warnings_not_errors \
- set_cxx_suffix \
+ set_generated_cxx_suffix \
,\
$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
))
commit 707194e7b9263a33508905438281090bd201e34d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 6 18:19:34 2012 +0200
libcmis: convert to gbuild
Change-Id: I4586cb27505bbdc20a543fc812d8b480b4b94236
diff --git a/Makefile.top b/Makefile.top
index e0079a4..132e035 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -87,6 +87,7 @@ jvmaccess\
jvmfwk\
l10ntools\
libcdr\
+libcmis\
libmspub\
libvisio\
libwpd\
@@ -209,7 +210,6 @@ instsetoo_native\
jfreereport\
jpeg\
languagetool\
-libcmis\
libcroco\
libexttextcat\
libgsf\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 414651c..0fb7b08 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
io \
javaunohelper \
libcdr \
+ libcmis \
libmspub \
libvisio \
libwpd \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ed0f471..eef3e8f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -349,9 +349,9 @@ ifeq ($(SYSTEM_LIBCMIS),YES)
define gb_LinkTarget__use_cmis
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- $(LIBCMIS_CFLAGS) \
+ $(CMIS_CFLAGS) \
)
-$(call gb_LinkTarget_add_libs,$(1),$(LIBCMIS_LIBS))
+$(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS))
endef
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index c9d93c2..e110653 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmfwk \
l10ntools \
libcdr \
+ libcmis \
libmspub \
libvisio \
libwpd \
diff --git a/config_host.mk.in b/config_host.mk.in
index b63983a..21dc375 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -54,6 +54,9 @@ export CL_X64=@CL_X64@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
export CLUCENE_LIBS=@CLUCENE_LIBS@
export CLUCENE_TARBALL=@CLUCENE_TARBALL@
+export CMIS_CFLAGS=@CMIS_CFLAGS@
+export CMIS_LIBS=@CMIS_LIBS@
+export CMIS_TARBALL=@CMIS_TARBALL@
export COM=@COM@
export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export COMEX=@COMEX@
@@ -279,8 +282,6 @@ export LCMS2_CFLAGS=@LCMS2_CFLAGS@
export LCMS2_LIBS=@LCMS2_LIBS@
export LFS_CFLAGS=@LFS_CFLAGS@
export LIBBASE_JAR=@LIBBASE_JAR@
-export LIBCMIS_CFLAGS=@LIBCMIS_CFLAGS@
-export LIBCMIS_LIBS=@LIBCMIS_LIBS@
export LIBDIR=@LIBDIR@
export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@
export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@
diff --git a/configure.in b/configure.in
index f7569c5..8d27fa9 100644
--- a/configure.in
+++ b/configure.in
@@ -6676,15 +6676,16 @@ AC_MSG_CHECKING([which libcmis to use])
if test "$with_system_libcmis" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBCMIS=YES
- PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 >= 0.2.1 )
+ PKG_CHECK_MODULES( CMIS, libcmis-0.2 >= 0.2.1 )
else
AC_MSG_RESULT([internal])
SYSTEM_LIBCMIS=NO
- BUILD_TYPE="$BUILD_TYPE LIBCMIS"
+ CMIS_TARBALL=0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
fi
AC_SUBST(SYSTEM_LIBCMIS)
-AC_SUBST(LIBCMIS_CFLAGS)
-AC_SUBST(LIBCMIS_LIBS)
+AC_SUBST(CMIS_CFLAGS)
+AC_SUBST(CMIS_LIBS)
+AC_SUBST(CMIS_TARBALL)
dnl ===================================================================
diff --git a/libcmis/Makefile b/libcmis/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libcmis/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/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
new file mode 100644
index 0000000..c2c09f0
--- /dev/null
+++ b/libcmis/Module_libcmis.mk
@@ -0,0 +1,22 @@
+# -*- 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,libcmis))
+
+ifeq ($(SYSTEM_LIBCMIS),NO)
+
+$(eval $(call gb_Module_add_targets,libcmis,\
+ Package_libcmis \
+ StaticLibrary_cmis \
+ UnpackedTarball_cmis \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/Package_libcmis.mk b/libcmis/Package_libcmis.mk
new file mode 100644
index 0000000..6039aad
--- /dev/null
+++ b/libcmis/Package_libcmis.mk
@@ -0,0 +1,38 @@
+# -*- 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_Package_Package,libcmis_inc,$(call gb_UnpackedTarball_get_dir,cmis/src/libcmis)))
+
+$(eval $(call gb_Package_use_unpacked,libcmis_inc,cmis))
+
+$(eval $(call gb_Package_add_files,libcmis_inc,inc/external/libcmis,\
+ allowable-actions.hxx \
+ atom-document.hxx \
+ atom-folder.hxx \
+ atom-object-type.hxx \
+ atom-object.hxx \
+ atom-session.hxx \
+ atom-utils.hxx \
+ atom-workspace.hxx \
+ document.hxx \
+ exception.hxx \
+ folder.hxx \
+ object-type.hxx \
+ object.hxx \
+ property-type.hxx \
+ property.hxx \
+ repository.hxx \
+ session-factory.hxx \
+ session.hxx \
+ test-helpers.hxx \
+ xml-utils.hxx \
+ xmlserializable.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/StaticLibrary_cmis.mk b/libcmis/StaticLibrary_cmis.mk
new file mode 100644
index 0000000..01aa372
--- /dev/null
+++ b/libcmis/StaticLibrary_cmis.mk
@@ -0,0 +1,38 @@
+# -*- 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_StaticLibrary_StaticLibrary,cmislib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,cmislib,cmis))
+
+$(eval $(call gb_StaticLibrary_use_package,cmislib,libcmis_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,cmislib,\
+ curl \
+ libxml2 \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cmislib,\
+ UnpackedTarball/cmis/src/libcmis/allowable-actions \
+ UnpackedTarball/cmis/src/libcmis/atom-document \
+ UnpackedTarball/cmis/src/libcmis/atom-folder \
+ UnpackedTarball/cmis/src/libcmis/atom-object-type \
+ UnpackedTarball/cmis/src/libcmis/atom-object \
+ UnpackedTarball/cmis/src/libcmis/atom-session \
+ UnpackedTarball/cmis/src/libcmis/atom-utils \
+ UnpackedTarball/cmis/src/libcmis/atom-workspace \
+ UnpackedTarball/cmis/src/libcmis/property-type \
+ UnpackedTarball/cmis/src/libcmis/property \
+ UnpackedTarball/cmis/src/libcmis/session-factory \
+ UnpackedTarball/cmis/src/libcmis/xml-utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
new file mode 100644
index 0000000..d75c5f6
--- /dev/null
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -0,0 +1,25 @@
+# -*- 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,cmis))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,\
+ libcmis/libcmis-0.2.3.patch \
+ libcmis/libcmis-0.2.3-backports.patch \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcmis/prj/d.lst b/libcmis/prj/d.lst
index fb52e94..e69de29 100644
--- a/libcmis/prj/d.lst
+++ b/libcmis/prj/d.lst
@@ -1,6 +0,0 @@
-
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
-
-mkdir: %_DEST%\inc\libcmis
-..\%__SRC%\misc\build\libcmis*\src\libcmis\*.hxx %_DEST%\inc\libcmis\*.hxx
diff --git a/libcmis/prj/dmake b/libcmis/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 23080ee..16b5149 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -90,7 +90,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
@VISIO_TARBALL@
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
+ at CMIS_TARBALL@
@CDR_TARBALL@
327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
@MSPUB_TARBALL@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 45f3d2a..20609e5 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index eb59cbe..a47c955 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -1,4 +1,4 @@
-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt LIBCMIS:libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 LIBXSLT:libxslt libcmis offapi sal salhelper ucbhelper udkapi comphelper tools NULL
uc ucb\prj nmake - all uc_prj NULL
#uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL
# fails, please fix
commit 85e34a4f3a157663f49611d566554785a28848a7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 4 14:08:14 2012 +0200
libwpd: convert to gbuild
Change-Id: I5a8d3979e8b3e1e3d33882715fbb61f37bf27e35
diff --git a/Makefile.top b/Makefile.top
index b0d0279..e0079a4 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -89,6 +89,7 @@ l10ntools\
libcdr\
libmspub\
libvisio\
+libwpd\
libwpg\
libwps\
lingucomponent\
@@ -216,7 +217,6 @@ liblangtag\
liborcus\
libpng\
librsvg\
-libwpd\
libxml2\
libxmlsec\
libxslt\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 4cdeb96..414651c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
libcdr \
libmspub \
libvisio \
+ libwpd \
libwpg \
libwps \
lingucomponent \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f90b5da..c9d93c2 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
libcdr \
libmspub \
libvisio \
+ libwpd \
libwpg \
libwps \
lingucomponent \
diff --git a/config_host.mk.in b/config_host.mk.in
index 15c0a74..b63983a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -620,6 +620,7 @@ export WORKDIR_FOR_BUILD=@WORKDIR_FOR_BUILD@
export WORK_STAMP=@SOURCEVERSION@
export WPD_CFLAGS=@WPD_CFLAGS@
export WPD_LIBS=@WPD_LIBS@
+export WPD_TARBALL=@WPD_TARBALL@
export WPG_CFLAGS=@WPG_CFLAGS@
export WPG_LIBS=@WPG_LIBS@
export WPG_TARBALL=@WPG_TARBALL@
diff --git a/configure.in b/configure.in
index 9476f35..f7569c5 100644
--- a/configure.in
+++ b/configure.in
@@ -6700,11 +6700,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPD=NO
- BUILD_TYPE="$BUILD_TYPE LIBWPD"
+ WPD_TARBALL=c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
fi
AC_SUBST(SYSTEM_LIBWPD)
AC_SUBST(WPD_CFLAGS)
AC_SUBST(WPD_LIBS)
+AC_SUBST(WPD_TARBALL)
dnl ===================================================================
dnl Check for system lcms2
diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst
index 5ce6e7d..0f6815f 100644
--- a/libcdr/prj/build.lst
+++ b/libcdr/prj/build.lst
@@ -1,3 +1,3 @@
-cdr libcdr : LIBWPD:libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
+cdr libcdr : libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
cdr libcdr usr1 - all cdr_mkout NULL
cdr libcdr nmake - all cdr_libcdr NULL
diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst
index 2543c8f..3905561 100644
--- a/libmspub/prj/build.lst
+++ b/libmspub/prj/build.lst
@@ -1,3 +1,3 @@
-mspub libmspub : LIBWPD:libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
+mspub libmspub : libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
mspub libmspub usr1 - all mspub_mkout NULL
mspub libmspub nmake - all mspub_libmspub NULL
diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
index 98d7364..6a3203c 100644
--- a/libvisio/prj/build.lst
+++ b/libvisio/prj/build.lst
@@ -1,3 +1,3 @@
-vsd libvisio : LIBWPD:libwpd libwpg BOOST:boost soltools NULL
+vsd libvisio : libwpd libwpg BOOST:boost soltools NULL
vsd libvisio usr1 - all vsd_mkout NULL
vsd libvisio nmake - all vsd_libvisio NULL
diff --git a/libwpd/Makefile b/libwpd/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libwpd/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/libwpd/Module_libwpd.mk b/libwpd/Module_libwpd.mk
new file mode 100644
index 0000000..fd0d0bb
--- /dev/null
+++ b/libwpd/Module_libwpd.mk
@@ -0,0 +1,22 @@
+# -*- 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,libwpd))
+
+ifeq ($(SYSTEM_LIBWPD),NO)
+
+$(eval $(call gb_Module_add_targets,libwpd,\
+ Package_libwpd \
+ StaticLibrary_wpd \
+ UnpackedTarball_wpd \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/Package_libwpd.mk b/libwpd/Package_libwpd.mk
new file mode 100644
index 0000000..331a7d1
--- /dev/null
+++ b/libwpd/Package_libwpd.mk
@@ -0,0 +1,31 @@
+# -*- 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_Package_Package,libwpd_inc,$(call gb_UnpackedTarball_get_dir,wpd/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwpd_inc,wpd))
+
+$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd,\
+ libwpd.h \
+ WPDocument.h \
+ WPXBinaryData.h \
+ WPXDocumentInterface.h \
+ WPXProperty.h \
+ WPXPropertyList.h \
+ WPXString.h \
+ WPXPropertyListVector.h \
+))
+
+$(eval $(call gb_Package_add_files,libwpd_inc,inc/external/libwpd-stream,\
+ libwpd-stream.h \
+ WPXStream.h \
+ WPXStreamImplementation.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk
new file mode 100644
index 0000000..283cddf
--- /dev/null
+++ b/libwpd/StaticLibrary_wpd.mk
@@ -0,0 +1,193 @@
+# -*- 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_StaticLibrary_StaticLibrary,wpdlib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd))
+
+$(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpdlib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
+ UnpackedTarball/wpd/src/lib/libwpd_internal \
+ UnpackedTarball/wpd/src/lib/libwpd_math \
+ UnpackedTarball/wpd/src/lib/WP1BottomMarginGroup \
+ UnpackedTarball/wpd/src/lib/WP1CenterTextGroup \
+ UnpackedTarball/wpd/src/lib/WP1ContentListener \
+ UnpackedTarball/wpd/src/lib/WP1ExtendedCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP1FileStructure \
+ UnpackedTarball/wpd/src/lib/WP1FixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP1FlushRightGroup \
+ UnpackedTarball/wpd/src/lib/WP1FontIdGroup \
+ UnpackedTarball/wpd/src/lib/WP1FootnoteEndnoteGroup \
+ UnpackedTarball/wpd/src/lib/WP1HeaderFooterGroup \
+ UnpackedTarball/wpd/src/lib/WP1Heuristics \
+ UnpackedTarball/wpd/src/lib/WP1JustificationGroup \
+ UnpackedTarball/wpd/src/lib/WP1LeftIndentGroup \
+ UnpackedTarball/wpd/src/lib/WP1LeftRightIndentGroup \
+ UnpackedTarball/wpd/src/lib/WP1Listener \
+ UnpackedTarball/wpd/src/lib/WP1MarginReleaseGroup \
+ UnpackedTarball/wpd/src/lib/WP1MarginResetGroup \
+ UnpackedTarball/wpd/src/lib/WP1Parser \
+ UnpackedTarball/wpd/src/lib/WP1Part \
+ UnpackedTarball/wpd/src/lib/WP1PictureGroup \
+ UnpackedTarball/wpd/src/lib/WP1PointSizeGroup \
+ UnpackedTarball/wpd/src/lib/WP1SetTabsGroup \
+ UnpackedTarball/wpd/src/lib/WP1SpacingResetGroup \
+ UnpackedTarball/wpd/src/lib/WP1StylesListener \
+ UnpackedTarball/wpd/src/lib/WP1SubDocument \
+ UnpackedTarball/wpd/src/lib/WP1SuppressPageCharacteristicsGroup \
+ UnpackedTarball/wpd/src/lib/WP1TopMarginGroup \
+ UnpackedTarball/wpd/src/lib/WP1UnsupportedFixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP1UnsupportedVariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP1VariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP3AttributeGroup \
+ UnpackedTarball/wpd/src/lib/WP3ContentListener \
+ UnpackedTarball/wpd/src/lib/WP3DefinitionGroup \
+ UnpackedTarball/wpd/src/lib/WP3DisplayGroup \
+ UnpackedTarball/wpd/src/lib/WP3DoubleByteScriptCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP3EndOfLinePageGroup \
+ UnpackedTarball/wpd/src/lib/WP3ExtendedCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP3FileStructure \
+ UnpackedTarball/wpd/src/lib/WP3FixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP3FontGroup \
+ UnpackedTarball/wpd/src/lib/WP3FootnoteEndnoteGroup \
+ UnpackedTarball/wpd/src/lib/WP3Header \
+ UnpackedTarball/wpd/src/lib/WP3HeaderFooterGroup \
+ UnpackedTarball/wpd/src/lib/WP3IndentGroup \
+ UnpackedTarball/wpd/src/lib/WP3Listener \
+ UnpackedTarball/wpd/src/lib/WP3MiscellaneousGroup \
+ UnpackedTarball/wpd/src/lib/WP3PageFormatGroup \
+ UnpackedTarball/wpd/src/lib/WP3Parser \
+ UnpackedTarball/wpd/src/lib/WP3Part \
+ UnpackedTarball/wpd/src/lib/WP3Resource \
+ UnpackedTarball/wpd/src/lib/WP3ResourceFork \
+ UnpackedTarball/wpd/src/lib/WP3SingleByteFunction \
+ UnpackedTarball/wpd/src/lib/WP3StylesListener \
+ UnpackedTarball/wpd/src/lib/WP3SubDocument \
+ UnpackedTarball/wpd/src/lib/WP3TabGroup \
+ UnpackedTarball/wpd/src/lib/WP3TablesGroup \
+ UnpackedTarball/wpd/src/lib/WP3UndoGroup \
+ UnpackedTarball/wpd/src/lib/WP3UnsupportedFixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP3UnsupportedVariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP3VariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP3WindowGroup \
+ UnpackedTarball/wpd/src/lib/WP42ContentListener \
+ UnpackedTarball/wpd/src/lib/WP42DefineColumnsGroup \
+ UnpackedTarball/wpd/src/lib/WP42ExtendedCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP42FileStructure \
+ UnpackedTarball/wpd/src/lib/WP42HeaderFooterGroup \
+ UnpackedTarball/wpd/src/lib/WP42Heuristics \
+ UnpackedTarball/wpd/src/lib/WP42Listener \
+ UnpackedTarball/wpd/src/lib/WP42MarginResetGroup \
+ UnpackedTarball/wpd/src/lib/WP42MultiByteFunctionGroup \
+ UnpackedTarball/wpd/src/lib/WP42Parser \
+ UnpackedTarball/wpd/src/lib/WP42Part \
+ UnpackedTarball/wpd/src/lib/WP42StylesListener \
+ UnpackedTarball/wpd/src/lib/WP42SubDocument \
+ UnpackedTarball/wpd/src/lib/WP42SuppressPageCharacteristicsGroup \
+ UnpackedTarball/wpd/src/lib/WP42UnsupportedMultiByteFunctionGroup \
+ UnpackedTarball/wpd/src/lib/WP5AttributeGroup \
+ UnpackedTarball/wpd/src/lib/WP5BoxGroup \
+ UnpackedTarball/wpd/src/lib/WP5ContentListener \
+ UnpackedTarball/wpd/src/lib/WP5DefinitionGroup \
+ UnpackedTarball/wpd/src/lib/WP5ExtendedCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP5FileStructure \
+ UnpackedTarball/wpd/src/lib/WP5FixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP5FontGroup \
+ UnpackedTarball/wpd/src/lib/WP5FontNameStringPoolPacket \
+ UnpackedTarball/wpd/src/lib/WP5FootnoteEndnoteGroup \
+ UnpackedTarball/wpd/src/lib/WP5GeneralPacketData \
+ UnpackedTarball/wpd/src/lib/WP5GeneralPacketIndex \
+ UnpackedTarball/wpd/src/lib/WP5GraphicsInformationPacket \
+ UnpackedTarball/wpd/src/lib/WP5Header \
+ UnpackedTarball/wpd/src/lib/WP5HeaderFooterGroup \
+ UnpackedTarball/wpd/src/lib/WP5IndentGroup \
+ UnpackedTarball/wpd/src/lib/WP5Listener \
+ UnpackedTarball/wpd/src/lib/WP5ListFontsUsedPacket \
+ UnpackedTarball/wpd/src/lib/WP5PageFormatGroup \
+ UnpackedTarball/wpd/src/lib/WP5Parser \
+ UnpackedTarball/wpd/src/lib/WP5Part \
+ UnpackedTarball/wpd/src/lib/WP5PrefixData \
+ UnpackedTarball/wpd/src/lib/WP5SingleByteFunction \
+ UnpackedTarball/wpd/src/lib/WP5SpecialHeaderIndex \
+ UnpackedTarball/wpd/src/lib/WP5StylesListener \
+ UnpackedTarball/wpd/src/lib/WP5SubDocument \
+ UnpackedTarball/wpd/src/lib/WP5TabGroup \
+ UnpackedTarball/wpd/src/lib/WP5TableEOLGroup \
+ UnpackedTarball/wpd/src/lib/WP5TableEOPGroup \
+ UnpackedTarball/wpd/src/lib/WP5UnsupportedFixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP5UnsupportedVariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP5VariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP60Header \
+ UnpackedTarball/wpd/src/lib/WP61Header \
+ UnpackedTarball/wpd/src/lib/WP6AttributeGroup \
+ UnpackedTarball/wpd/src/lib/WP6BoxGroup \
+ UnpackedTarball/wpd/src/lib/WP6CharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP6ColumnGroup \
+ UnpackedTarball/wpd/src/lib/WP6CommentAnnotationPacket \
+ UnpackedTarball/wpd/src/lib/WP6ContentListener \
+ UnpackedTarball/wpd/src/lib/WP6DefaultInitialFontPacket \
+ UnpackedTarball/wpd/src/lib/WP6DisplayNumberReferenceGroup \
+ UnpackedTarball/wpd/src/lib/WP6EOLGroup \
+ UnpackedTarball/wpd/src/lib/WP6ExtendedCharacterGroup \
+ UnpackedTarball/wpd/src/lib/WP6ExtendedDocumentSummaryPacket \
+ UnpackedTarball/wpd/src/lib/WP6FileStructure \
+ UnpackedTarball/wpd/src/lib/WP6FillStylePacket \
+ UnpackedTarball/wpd/src/lib/WP6FixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP6FontDescriptorPacket \
+ UnpackedTarball/wpd/src/lib/WP6FootnoteEndnoteGroup \
+ UnpackedTarball/wpd/src/lib/WP6GeneralTextPacket \
+ UnpackedTarball/wpd/src/lib/WP6GraphicsBoxStylePacket \
+ UnpackedTarball/wpd/src/lib/WP6GraphicsCachedFileDataPacket \
+ UnpackedTarball/wpd/src/lib/WP6GraphicsFilenamePacket \
+ UnpackedTarball/wpd/src/lib/WP6Header \
+ UnpackedTarball/wpd/src/lib/WP6HeaderFooterGroup \
+ UnpackedTarball/wpd/src/lib/WP6HighlightGroup \
+ UnpackedTarball/wpd/src/lib/WP6Listener \
+ UnpackedTarball/wpd/src/lib/WP6NumberingMethodGroup \
+ UnpackedTarball/wpd/src/lib/WP6OutlineStylePacket \
+ UnpackedTarball/wpd/src/lib/WP6PageGroup \
+ UnpackedTarball/wpd/src/lib/WP6ParagraphGroup \
+ UnpackedTarball/wpd/src/lib/WP6Parser \
+ UnpackedTarball/wpd/src/lib/WP6Part \
+ UnpackedTarball/wpd/src/lib/WP6PrefixData \
+ UnpackedTarball/wpd/src/lib/WP6PrefixDataPacket \
+ UnpackedTarball/wpd/src/lib/WP6PrefixIndice \
+ UnpackedTarball/wpd/src/lib/WP6SetNumberGroup \
+ UnpackedTarball/wpd/src/lib/WP6SingleByteFunction \
+ UnpackedTarball/wpd/src/lib/WP6StyleGroup \
+ UnpackedTarball/wpd/src/lib/WP6StylesListener \
+ UnpackedTarball/wpd/src/lib/WP6SubDocument \
+ UnpackedTarball/wpd/src/lib/WP6TabGroup \
+ UnpackedTarball/wpd/src/lib/WP6TableStylePacket \
+ UnpackedTarball/wpd/src/lib/WP6UndoGroup \
+ UnpackedTarball/wpd/src/lib/WP6UnsupportedFixedLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP6UnsupportedVariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WP6VariableLengthGroup \
+ UnpackedTarball/wpd/src/lib/WPDocument \
+ UnpackedTarball/wpd/src/lib/WPXBinaryData \
+ UnpackedTarball/wpd/src/lib/WPXContentListener \
+ UnpackedTarball/wpd/src/lib/WPXEncryption \
+ UnpackedTarball/wpd/src/lib/WPXHeader \
+ UnpackedTarball/wpd/src/lib/WPXListener \
+ UnpackedTarball/wpd/src/lib/WPXMemoryStream \
+ UnpackedTarball/wpd/src/lib/WPXPageSpan \
+ UnpackedTarball/wpd/src/lib/WPXParser \
+ UnpackedTarball/wpd/src/lib/WPXProperty \
+ UnpackedTarball/wpd/src/lib/WPXPropertyList \
+ UnpackedTarball/wpd/src/lib/WPXPropertyListVector \
+ UnpackedTarball/wpd/src/lib/WPXString \
+ UnpackedTarball/wpd/src/lib/WPXStylesListener \
+ UnpackedTarball/wpd/src/lib/WPXSubDocument \
+ UnpackedTarball/wpd/src/lib/WPXTable \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/UnpackedTarball_wpd.mk b/libwpd/UnpackedTarball_wpd.mk
new file mode 100644
index 0000000..a2cdbd8
--- /dev/null
+++ b/libwpd/UnpackedTarball_wpd.mk
@@ -0,0 +1,18 @@
+# -*- 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,wpd))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wpd,$(WPD_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,wpd,\
+ libwpd/libwpd-0.9.4.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
deleted file mode 100644
index 504fb48..0000000
--- a/libwpd/makefile.mk
+++ /dev/null
@@ -1,60 +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=wpd
-TARGET=wpd
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPD)" == "YES"
- at all:
- @echo "Using system libwpd..."
-.ENDIF
-
-TARFILE_NAME=libwpd-0.9.4
-TARFILE_MD5=c01351d7db2b205de755d58769288224
-
-#PATCH_FILES=
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-PATCH_FILES=\
- $(TARFILE_NAME).patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/libwpd/prj/d.lst b/libwpd/prj/d.lst
index f891f3b..e69de29 100644
--- a/libwpd/prj/d.lst
+++ b/libwpd/prj/d.lst
@@ -1,15 +0,0 @@
-mkdir: %_DEST%\inc\libwpd
-mkdir: %_DEST%\inc\libwpd-stream
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPDocument.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXBinaryData.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXDocumentInterface.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXProperty.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyList.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXString.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXPropertyListVector.h %_DEST%\inc\libwpd\
-..\%__SRC%\misc\build\libwpd*\src\lib\libwpd-stream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStream.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\misc\build\libwpd*\src\lib\WPXStreamImplementation.h %_DEST%\inc\libwpd-stream\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpd/prj/dmake b/libwpd/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/libwpg/prj/build.lst b/libwpg/prj/build.lst
index d54a1d9..389a533 100644
--- a/libwpg/prj/build.lst
+++ b/libwpg/prj/build.lst
@@ -1,3 +1,3 @@
-lwpg libwpg : LIBWPD:libwpd soltools NULL
+lwpg libwpg : libwpd soltools NULL
lwpg libwpg usr1 - all lwpg_mkout NULL
lwpg libwpg nmake - all lwpg_libwpg NULL
diff --git a/libwps/prj/build.lst b/libwps/prj/build.lst
index 956621e..8353f04 100644
--- a/libwps/prj/build.lst
+++ b/libwps/prj/build.lst
@@ -1,3 +1,3 @@
-lwps libwps : LIBWPD:libwpd BOOST:boost soltools NULL
+lwps libwps : libwpd BOOST:boost soltools NULL
lwps libwps usr1 - all lwps_mkout NULL
lwps libwps nmake - all lwps_libwps NULL
diff --git a/ooo.lst.in b/ooo.lst.in
index 83e8425..23080ee 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -82,7 +82,7 @@ b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
@WPG_TARBALL@
-c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
+ at WPD_TARBALL@
@WPS_TARBALL@
@MDDS_TARBALL@
@BOOST_TARBALL@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index b77f04f..45f3d2a 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 526065e..7c8ecbc 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : libwpg libwps libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
commit be742b279a807f7effe758975ce0364f4a80732e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 4 14:00:07 2012 +0200
libwpg: convert to gbuild
Change-Id: If440c551aedf805eb364c0fe575e8c5f4f66c18f
diff --git a/Makefile.top b/Makefile.top
index 8a96a66..b0d0279 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -89,6 +89,7 @@ l10ntools\
libcdr\
libmspub\
libvisio\
+libwpg\
libwps\
lingucomponent\
linguistic\
@@ -216,7 +217,6 @@ liborcus\
libpng\
librsvg\
libwpd\
-libwpg\
libxml2\
libxmlsec\
libxslt\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 33ec2e1..4cdeb96 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
libcdr \
libmspub \
libvisio \
+ libwpg \
libwps \
lingucomponent \
linguistic \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 791cdff..f90b5da 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
libcdr \
libmspub \
libvisio \
+ libwpg \
libwps \
lingucomponent \
linguistic \
diff --git a/config_host.mk.in b/config_host.mk.in
index b35aa22..15c0a74 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -622,6 +622,7 @@ export WPD_CFLAGS=@WPD_CFLAGS@
export WPD_LIBS=@WPD_LIBS@
export WPG_CFLAGS=@WPG_CFLAGS@
export WPG_LIBS=@WPG_LIBS@
+export WPG_TARBALL=@WPG_TARBALL@
export WPS_CFLAGS=@WPS_CFLAGS@
export WPS_LIBS=@WPS_LIBS@
export WPS_TARBALL=@WPS_TARBALL@
diff --git a/configure.in b/configure.in
index f5cb450..9476f35 100644
--- a/configure.in
+++ b/configure.in
@@ -6792,11 +6792,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPG=NO
- BUILD_TYPE="$BUILD_TYPE LIBWPG"
+ WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
fi
AC_SUBST(SYSTEM_LIBWPG)
AC_SUBST(WPG_CFLAGS)
AC_SUBST(WPG_LIBS)
+AC_SUBST(WPG_TARBALL)
dnl ===================================================================
dnl Check whether freetype2 supports emboldening
diff --git a/libcdr/prj/build.lst b/libcdr/prj/build.lst
index a3a0e2c..5ce6e7d 100644
--- a/libcdr/prj/build.lst
+++ b/libcdr/prj/build.lst
@@ -1,3 +1,3 @@
-cdr libcdr : LIBWPD:libwpd LIBWPG:libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
+cdr libcdr : LIBWPD:libwpd libwpg LCMS2:lcms2 ZLIB:zlib soltools NULL
cdr libcdr usr1 - all cdr_mkout NULL
cdr libcdr nmake - all cdr_libcdr NULL
diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst
index 597c574..2543c8f 100644
--- a/libmspub/prj/build.lst
+++ b/libmspub/prj/build.lst
@@ -1,3 +1,3 @@
-mspub libmspub : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib BOOST:boost soltools NULL
+mspub libmspub : LIBWPD:libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
mspub libmspub usr1 - all mspub_mkout NULL
mspub libmspub nmake - all mspub_libmspub NULL
diff --git a/libvisio/prj/build.lst b/libvisio/prj/build.lst
index dd788b5..98d7364 100644
--- a/libvisio/prj/build.lst
+++ b/libvisio/prj/build.lst
@@ -1,3 +1,3 @@
-vsd libvisio : LIBWPD:libwpd LIBWPG:libwpg BOOST:boost soltools NULL
+vsd libvisio : LIBWPD:libwpd libwpg BOOST:boost soltools NULL
vsd libvisio usr1 - all vsd_mkout NULL
vsd libvisio nmake - all vsd_libvisio NULL
diff --git a/libwpg/Makefile b/libwpg/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libwpg/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/libwpg/Module_libwpg.mk b/libwpg/Module_libwpg.mk
new file mode 100644
index 0000000..9e271dc
--- /dev/null
+++ b/libwpg/Module_libwpg.mk
@@ -0,0 +1,22 @@
+# -*- 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,libwpg))
+
+ifeq ($(SYSTEM_LIBWPG),NO)
+
+$(eval $(call gb_Module_add_targets,libwpg,\
+ Package_libwpg \
+ StaticLibrary_wpg \
+ UnpackedTarball_wpg \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/Package_libwpg.mk b/libwpg/Package_libwpg.mk
new file mode 100644
index 0000000..6a1f6a4
--- /dev/null
+++ b/libwpg/Package_libwpg.mk
@@ -0,0 +1,20 @@
+# -*- 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_Package_Package,libwpg_inc,$(call gb_UnpackedTarball_get_dir,wpg/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwpg_inc,wpg))
+
+$(eval $(call gb_Package_add_files,libwpg_inc,inc/external/libwpg,\
+ libwpg.h \
+ WPGPaintInterface.h \
+ WPGraphics.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/StaticLibrary_wpg.mk b/libwpg/StaticLibrary_wpg.mk
new file mode 100644
index 0000000..6ce7499
--- /dev/null
+++ b/libwpg/StaticLibrary_wpg.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_StaticLibrary_StaticLibrary,wpglib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpglib,wpg))
+
+$(eval $(call gb_StaticLibrary_use_package,wpglib,libwpg_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,wpglib,\
+ wpd \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpglib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\
+ UnpackedTarball/wpg/src/lib/WPG1Parser \
+ UnpackedTarball/wpg/src/lib/WPG2Parser \
+ UnpackedTarball/wpg/src/lib/WPGBitmap \
+ UnpackedTarball/wpg/src/lib/WPGColor \
+ UnpackedTarball/wpg/src/lib/WPGDashArray \
+ UnpackedTarball/wpg/src/lib/WPGHeader \
+ UnpackedTarball/wpg/src/lib/WPGInternalStream \
+ UnpackedTarball/wpg/src/lib/WPGraphics \
+ UnpackedTarball/wpg/src/lib/WPGSVGGenerator \
+ UnpackedTarball/wpg/src/lib/WPGXParser \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/UnpackedTarball_wpg.mk b/libwpg/UnpackedTarball_wpg.mk
new file mode 100644
index 0000000..00c127c
--- /dev/null
+++ b/libwpg/UnpackedTarball_wpg.mk
@@ -0,0 +1,14 @@
+# -*- 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,wpg))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wpg,$(WPG_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwpg/libwpg-0.2.1-build.patch b/libwpg/libwpg-0.2.1-build.patch
deleted file mode 100644
index 1b9240e..0000000
--- a/libwpg/libwpg-0.2.1-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libwpg-0.2.1/src/lib/makefile.mk 2011-09-12 09:04:43.000000000 +0200
-+++ misc/build/libwpg-0.2.1/src/lib/makefile.mk 2011-10-05 14:47:18.028693834 +0200
-@@ -17,7 +17,7 @@
- .ENDIF
-
- .IF "$(SYSTEM_LIBWPD)" == "YES"
--INCPRE+=$(LIBWPD_CFLAGS) -I..
-+INCPRE+=$(WPD_CFLAGS) -I..
- .ELSE
- INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
- .ENDIF
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
deleted file mode 100644
index 7888b55..0000000
--- a/libwpg/makefile.mk
+++ /dev/null
@@ -1,65 +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=wpg
-TARGET=wpg
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPG)" == "YES"
- at all:
- @echo "Using system libwpg..."
-.ENDIF
-
-# libwpg depends on the libwpd framework
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-
-TARFILE_NAME=libwpg-0.2.1
-TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-PATCH_FILES=\
- libwpg-0.2.1-build.patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libwpg/prj/d.lst b/libwpg/prj/d.lst
index a6a84a3..e69de29 100644
--- a/libwpg/prj/d.lst
+++ b/libwpg/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libwpg
-..\%__SRC%\misc\build\libwpg*\src\lib\libwpg.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGPaintInterface.h %_DEST%\inc\libwpg\
-..\%__SRC%\misc\build\libwpg*\src\lib\WPGraphics.h %_DEST%\inc\libwpg\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwpg/prj/dmake b/libwpg/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 0865877..83e8425 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -81,7 +81,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
-9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
+ at WPG_TARBALL@
c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
@WPS_TARBALL@
@MDDS_TARBALL@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7ddeefd..b77f04f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 2ca4fe6..526065e 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
commit 0c6fbcad3ff71fb755406ec914da0ae15e2d21e0
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 4 13:21:43 2012 +0200
libcdr: convert to gbuild
Change-Id: I067ab0a4559bf7ee0da36a67567e0db9a6e34f87
diff --git a/Makefile.top b/Makefile.top
index feb2260..8a96a66 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
jvmaccess\
jvmfwk\
l10ntools\
+libcdr\
libmspub\
libvisio\
libwps\
@@ -206,7 +207,6 @@ instsetoo_native\
jfreereport\
jpeg\
languagetool\
-libcdr\
libcmis\
libcroco\
libexttextcat\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ad0cc62..33ec2e1 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
idl \
io \
javaunohelper \
+ libcdr \
libmspub \
libvisio \
libwps \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 18a29d0..791cdff 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmaccess \
jvmfwk \
l10ntools \
+ libcdr \
libmspub \
libvisio \
libwps \
diff --git a/config_host.mk.in b/config_host.mk.in
index 5ba7413..b35aa22 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -47,6 +47,7 @@ export CC=@CC@
export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
+export CDR_TARBALL=@CDR_TARBALL@
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLASSPATH=@CLASSPATH@
export CL_X64=@CL_X64@
diff --git a/configure.in b/configure.in
index a7ebdf7..f5cb450 100644
--- a/configure.in
+++ b/configure.in
@@ -6620,11 +6620,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBCDR=NO
- BUILD_TYPE="$BUILD_TYPE LIBCDR"
+ CDR_TARBALL=ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
fi
AC_SUBST(SYSTEM_LIBCDR)
AC_SUBST(CDR_CFLAGS)
AC_SUBST(CDR_LIBS)
+AC_SUBST(CDR_TARBALL)
dnl ===================================================================
dnl Check for system libmspub
diff --git a/libcdr/Makefile b/libcdr/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libcdr/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/libcdr/Module_libcdr.mk b/libcdr/Module_libcdr.mk
new file mode 100644
index 0000000..6fb369a
--- /dev/null
+++ b/libcdr/Module_libcdr.mk
@@ -0,0 +1,22 @@
+# -*- 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,libcdr))
+
+ifeq ($(SYSTEM_LIBCDR),NO)
+
+$(eval $(call gb_Module_add_targets,libcdr,\
+ Package_libcdr \
+ StaticLibrary_cdr \
+ UnpackedTarball_cdr \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/Package_libcdr.mk b/libcdr/Package_libcdr.mk
new file mode 100644
index 0000000..e7d21bc
--- /dev/null
+++ b/libcdr/Package_libcdr.mk
@@ -0,0 +1,21 @@
+# -*- 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_Package_Package,libcdr_inc,$(call gb_UnpackedTarball_get_dir,cdr/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libcdr_inc,cdr))
+
+$(eval $(call gb_Package_add_files,libcdr_inc,inc/external/libcdr,\
+ libcdr.h \
+ CDRDocument.h \
+ CDRStringVector.h \
+ CMXDocument.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk
new file mode 100644
index 0000000..d0f07a2
--- /dev/null
+++ b/libcdr/StaticLibrary_cdr.mk
@@ -0,0 +1,44 @@
+# -*- 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_StaticLibrary_StaticLibrary,cdrlib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,cdrlib,cdr))
+
+$(eval $(call gb_StaticLibrary_use_package,cdrlib,libcdr_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
+ lcms2 \
+ wpd \
+ wpg \
+ zlib \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,cdrlib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
+ UnpackedTarball/cdr/src/lib/CDRCollector \
+ UnpackedTarball/cdr/src/lib/CDRContentCollector \
+ UnpackedTarball/cdr/src/lib/CDRDocument \
+ UnpackedTarball/cdr/src/lib/CDRInternalStream \
+ UnpackedTarball/cdr/src/lib/CDROutputElementList \
+ UnpackedTarball/cdr/src/lib/CDRParser \
+ UnpackedTarball/cdr/src/lib/CDRPath \
+ UnpackedTarball/cdr/src/lib/CDRStringVector \
+ UnpackedTarball/cdr/src/lib/CDRStylesCollector \
+ UnpackedTarball/cdr/src/lib/CDRSVGGenerator \
+ UnpackedTarball/cdr/src/lib/CDRTypes \
+ UnpackedTarball/cdr/src/lib/CDRZipStream \
+ UnpackedTarball/cdr/src/lib/CMXDocument \
+ UnpackedTarball/cdr/src/lib/CMXParser \
+ UnpackedTarball/cdr/src/lib/CommonParser \
+ UnpackedTarball/cdr/src/lib/libcdr_utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
new file mode 100644
index 0000000..29ef930
--- /dev/null
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -0,0 +1,18 @@
+# -*- 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,cdr))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+ libcdr/libcdr-0.0.8-msc.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libcdr/makefile.mk b/libcdr/makefile.mk
deleted file mode 100644
index 771ac46..0000000
--- a/libcdr/makefile.mk
+++ /dev/null
@@ -1,74 +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=cdr
-TARGET=cdr
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBCDR)" == "YES"
- at all:
- @echo "Using system libcdr..."
-.ENDIF
-
-# libcdr depends on the libwpd, libwpg and lcms2
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-.IF "$(SYSTEM_LCMS2)" == "YES"
-INCPRE+=$(LCMS2_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2
-.ENDIF
-
-TARFILE_NAME=libcdr-0.0.8
-TARFILE_MD5=ce5a1def34578b75959ac31210f031f6
-
-PATCH_FILES = libcdr-0.0.8-msc.patch
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libcdr/prj/d.lst b/libcdr/prj/d.lst
index e3ec3bd..e69de29 100644
--- a/libcdr/prj/d.lst
+++ b/libcdr/prj/d.lst
@@ -1,7 +0,0 @@
-mkdir: %_DEST%\inc\libcdr
-..\%__SRC%\misc\build\libcdr*\src\lib\libcdr.h %_DEST%\inc\libcdr
-..\%__SRC%\misc\build\libcdr*\src\lib\CDRDocument.h %_DEST%\inc\libcdr\
-..\%__SRC%\misc\build\libcdr*\src\lib\CDRStringVector.h %_DEST%\inc\libcdr\
-..\%__SRC%\misc\build\libcdr*\src\lib\CMXDocument.h %_DEST%\inc\libcdr\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libcdr/prj/dmake b/libcdr/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index c042215..0865877 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -91,7 +91,7 @@ c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
@VISIO_TARBALL@
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+ at CDR_TARBALL@
327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
@MSPUB_TARBALL@
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7991768..7ddeefd 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e642096..2ca4fe6 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio LIBCDR:libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
commit 105edf31b9e9be7cbc033d8ed09b382457fd1264
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 4 13:11:45 2012 +0200
libmspub: convert to gbuild
Change-Id: I502c849e40d84e6038b0b83fe344699944ec4a8f
diff --git a/Makefile.top b/Makefile.top
index c06521c..feb2260 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
jvmaccess\
jvmfwk\
l10ntools\
+libmspub\
libvisio\
libwps\
lingucomponent\
@@ -211,7 +212,6 @@ libcroco\
libexttextcat\
libgsf\
liblangtag\
-libmspub\
liborcus\
libpng\
librsvg\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 2f121ea..ad0cc62 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
idl \
io \
javaunohelper \
+ libmspub \
libvisio \
libwps \
lingucomponent \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index bcedba4..18a29d0 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmaccess \
jvmfwk \
l10ntools \
+ libmspub \
libvisio \
libwps \
lingucomponent \
diff --git a/config_host.mk.in b/config_host.mk.in
index c20b633..5ba7413 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -390,6 +390,7 @@ export MOZ_LIB=@MOZ_LIB@
export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
export MSPUB_CFLAGS=@MSPUB_CFLAGS@
export MSPUB_LIBS=@MSPUB_LIBS@
+export MSPUB_TARBALL=@MSPUB_TARBALL@
export MYSQL_DEFINES=@MYSQL_DEFINES@
export MYSQL_INC=@MYSQL_INC@
export MYSQL_LIB=@MYSQL_LIB@
diff --git a/configure.in b/configure.in
index 0a9ca22..a7ebdf7 100644
--- a/configure.in
+++ b/configure.in
@@ -6640,11 +6640,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBMSPUB=NO
- BUILD_TYPE="$BUILD_TYPE LIBMSPUB"
+ MSPUB_TARBALL=b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
fi
AC_SUBST(SYSTEM_LIBMSPUB)
AC_SUBST(MSPUB_CFLAGS)
AC_SUBST(MSPUB_LIBS)
+AC_SUBST(MSPUB_TARBALL)
dnl ===================================================================
dnl Check for system libvisio
diff --git a/libmspub/Makefile b/libmspub/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libmspub/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/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
new file mode 100644
index 0000000..d81abdd
--- /dev/null
+++ b/libmspub/Module_libmspub.mk
@@ -0,0 +1,22 @@
+# -*- 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,libmspub))
+
+ifeq ($(SYSTEM_LIBMSPUB),NO)
+
+$(eval $(call gb_Module_add_targets,libmspub,\
+ Package_libmspub \
+ StaticLibrary_mspub \
+ UnpackedTarball_mspub \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/Package_libmspub.mk b/libmspub/Package_libmspub.mk
new file mode 100644
index 0000000..af25dc1
--- /dev/null
+++ b/libmspub/Package_libmspub.mk
@@ -0,0 +1,20 @@
+# -*- 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_Package_Package,libmspub_inc,$(call gb_UnpackedTarball_get_dir,mspub/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libmspub_inc,mspub))
+
+$(eval $(call gb_Package_add_files,libmspub_inc,inc/external/libmspub,\
+ libmspub.h \
+ MSPUBDocument.h \
+ MSPUBStringVector.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/StaticLibrary_mspub.mk b/libmspub/StaticLibrary_mspub.mk
new file mode 100644
index 0000000..2d6ab45
--- /dev/null
+++ b/libmspub/StaticLibrary_mspub.mk
@@ -0,0 +1,42 @@
+# -*- 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_StaticLibrary_StaticLibrary,mspublib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,mspublib,mspub))
+
+$(eval $(call gb_StaticLibrary_use_package,mspublib,libmspub_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,mspublib,\
+ wpd \
+ wpg \
+ zlib \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,mspublib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mspublib,\
+ UnpackedTarball/mspub/src/lib/ColorReference \
+ UnpackedTarball/mspub/src/lib/Dash \
+ UnpackedTarball/mspub/src/lib/Fill \
+ UnpackedTarball/mspub/src/lib/MSPUBCollector \
+ UnpackedTarball/mspub/src/lib/MSPUBDocument \
+ UnpackedTarball/mspub/src/lib/MSPUBParser2k \
+ UnpackedTarball/mspub/src/lib/MSPUBParser97 \
+ UnpackedTarball/mspub/src/lib/MSPUBParser \
+ UnpackedTarball/mspub/src/lib/MSPUBStringVector \
+ UnpackedTarball/mspub/src/lib/MSPUBSVGGenerator \
+ UnpackedTarball/mspub/src/lib/PolygonUtils \
+ UnpackedTarball/mspub/src/lib/Shadow \
+ UnpackedTarball/mspub/src/lib/ShapeGroupElement \
+ UnpackedTarball/mspub/src/lib/VectorTransformation2D \
+ UnpackedTarball/mspub/src/lib/libmspub_utils \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/UnpackedTarball_mspub.mk b/libmspub/UnpackedTarball_mspub.mk
new file mode 100644
index 0000000..cb1503f
--- /dev/null
+++ b/libmspub/UnpackedTarball_mspub.mk
@@ -0,0 +1,18 @@
+# -*- 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,mspub))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patches,mspub,\
+ libmspub/libmspub-0.0.3.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk
deleted file mode 100644
index 635d8ed..0000000
--- a/libmspub/makefile.mk
+++ /dev/null
@@ -1,75 +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=mspub
-TARGET=mspub
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBMSPUB)" == "YES"
- at all:
- @echo "Using system libmspub..."
-.ENDIF
-
-# libcdr depends on the libwpd, libwpg and zlib
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-.IF "$(SYSTEM_LIBWPG)" == "YES"
-INCPRE+=$(WPG_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
-.ENDIF
-.IF "$(SYSTEM_ZLIB)" == "YES"
-INCPRE+=$(ZLIB_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib
-.ENDIF
-
-TARFILE_NAME=libmspub-0.0.3
-TARFILE_MD5=b2db54b6e96287ac995d7ed654ace4fc
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src$/lib
-
-PATCH_FILES=\
- $(TARFILE_NAME).patch
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libmspub/prj/d.lst b/libmspub/prj/d.lst
index 3a8654e..e69de29 100644
--- a/libmspub/prj/d.lst
+++ b/libmspub/prj/d.lst
@@ -1,6 +0,0 @@
-mkdir: %_DEST%\inc\libmspub
-..\%__SRC%\misc\build\libmspub*\src\lib\libmspub.h %_DEST%\inc\libmspub
-..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBDocument.h %_DEST%\inc\libmspub\
-..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBStringVector.h %_DEST%\inc\libmspub\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libmspub/prj/dmake b/libmspub/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 692f8b4..c042215 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -93,7 +93,7 @@ e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
-b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
+ at MSPUB_TARBALL@
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
@GOOGLE_DOCS_EXTENSION_PACK@
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2d0cfeb..7991768 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index 668dbc7..e642096 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio LIBCDR:libcdr LIBMSPUB:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio LIBCDR:libcdr libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
commit 71a3db78930b7b804231e2a6c576cad672d39c8d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Sep 4 12:55:40 2012 +0200
libwps: convert to gbuild
Change-Id: I8f5312d9751d4bc4f26feb1d58b1c4b3184441c0
diff --git a/Makefile.top b/Makefile.top
index d94075d..c06521c 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -87,6 +87,7 @@ jvmaccess\
jvmfwk\
l10ntools\
libvisio\
+libwps\
lingucomponent\
linguistic\
lotuswordpro\
@@ -216,7 +217,6 @@ libpng\
librsvg\
libwpd\
libwpg\
-libwps\
libxml2\
libxmlsec\
libxslt\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index dd80586..2f121ea 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
io \
javaunohelper \
libvisio \
+ libwps \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 27ee920..bcedba4 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -83,6 +83,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmfwk \
l10ntools \
libvisio \
+ libwps \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/config_host.mk.in b/config_host.mk.in
index bd44460..c20b633 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -622,6 +622,7 @@ export WPG_CFLAGS=@WPG_CFLAGS@
export WPG_LIBS=@WPG_LIBS@
export WPS_CFLAGS=@WPS_CFLAGS@
export WPS_LIBS=@WPS_LIBS@
+export WPS_TARBALL=@WPS_TARBALL@
export XCLASSPATH=@XCLASSPATH@
export XINERAMA_LINK=@XINERAMA_LINK@
export XRANDR_CFLAGS=@XRANDR_CFLAGS@
diff --git a/configure.in b/configure.in
index a35194c..0a9ca22 100644
--- a/configure.in
+++ b/configure.in
@@ -6770,11 +6770,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBWPS=NO
- BUILD_TYPE="$BUILD_TYPE LIBWPS"
+ WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
fi
AC_SUBST(SYSTEM_LIBWPS)
AC_SUBST(WPS_CFLAGS)
AC_SUBST(WPS_LIBS)
+AC_SUBST(WPS_TARBALL)
dnl ===================================================================
dnl Check for system libwpg
diff --git a/libwps/Makefile b/libwps/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libwps/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/libwps/Module_libwps.mk b/libwps/Module_libwps.mk
new file mode 100644
index 0000000..aacdb0e
--- /dev/null
+++ b/libwps/Module_libwps.mk
@@ -0,0 +1,22 @@
+# -*- 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,libwps))
+
+ifeq ($(SYSTEM_LIBWPS),NO)
+
+$(eval $(call gb_Module_add_targets,libwps,\
+ Package_libwps \
+ StaticLibrary_wps \
+ UnpackedTarball_wps \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/Package_libwps.mk b/libwps/Package_libwps.mk
new file mode 100644
index 0000000..6ebee91
--- /dev/null
+++ b/libwps/Package_libwps.mk
@@ -0,0 +1,19 @@
+# -*- 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_Package_Package,libwps_inc,$(call gb_UnpackedTarball_get_dir,wps/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libwps_inc,wps))
+
+$(eval $(call gb_Package_add_files,libwps_inc,inc/external/libwps,\
+ libwps.h \
+ WPSDocument.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk
new file mode 100644
index 0000000..150d8cd
--- /dev/null
+++ b/libwps/StaticLibrary_wps.mk
@@ -0,0 +1,46 @@
+# -*- 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_StaticLibrary_StaticLibrary,wpslib))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,wpslib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,wpslib,wps))
+
+$(eval $(call gb_StaticLibrary_use_package,wpslib,libwps_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,wpslib,\
+ wpd \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpslib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\
+ UnpackedTarball/wps/src/lib/libwps_internal \
+ UnpackedTarball/wps/src/lib/libwps_tools_win \
+ UnpackedTarball/wps/src/lib/WPS4 \
+ UnpackedTarball/wps/src/lib/WPS4Graph \
+ UnpackedTarball/wps/src/lib/WPS4Text \
+ UnpackedTarball/wps/src/lib/WPS8 \
+ UnpackedTarball/wps/src/lib/WPSCell \
+ UnpackedTarball/wps/src/lib/WPSContentListener \
+ UnpackedTarball/wps/src/lib/WPSDebug \
+ UnpackedTarball/wps/src/lib/WPSDocument \
+ UnpackedTarball/wps/src/lib/WPSHeader \
+ UnpackedTarball/wps/src/lib/WPSList \
+ UnpackedTarball/wps/src/lib/WPSOLEParser \
+ UnpackedTarball/wps/src/lib/WPSOLEStream \
+ UnpackedTarball/wps/src/lib/WPSPageSpan \
+ UnpackedTarball/wps/src/lib/WPSParagraph \
+ UnpackedTarball/wps/src/lib/WPSParser \
+ UnpackedTarball/wps/src/lib/WPSSubDocument \
+ UnpackedTarball/wps/src/lib/WPSTable \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk
new file mode 100644
index 0000000..c5698f7
--- /dev/null
+++ b/libwps/UnpackedTarball_wps.mk
@@ -0,0 +1,14 @@
+# -*- 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,wps))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
deleted file mode 100644
index cea290e..0000000
--- a/libwps/makefile.mk
+++ /dev/null
@@ -1,62 +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=wps
-TARGET=wps
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_LIBWPS)" == "YES"
- at all:
- @echo "Using system libwps..."
-.ENDIF
-
-# libwps depends on the libwpd framework
-.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(WPD_CFLAGS)
-.ELSE
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
-.ENDIF
-
-TARFILE_NAME=libwps-0.2.7
-TARFILE_MD5=d197bd6211669a2fa4ca648faf04bcb1
-
-BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
-BUILD_DIR=src/lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/libwps/prj/d.lst b/libwps/prj/d.lst
index 3923a18..e69de29 100644
--- a/libwps/prj/d.lst
+++ b/libwps/prj/d.lst
@@ -1,5 +0,0 @@
-mkdir: %_DEST%\inc\libwps
-..\%__SRC%\misc\build\libwps*\src\lib\libwps.h %_DEST%\inc\libwps\
-..\%__SRC%\misc\build\libwps*\src\lib\WPSDocument.h %_DEST%\inc\libwps\
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/libwps/prj/dmake b/libwps/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index bd14256..692f8b4 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -83,7 +83,7 @@ b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
-d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
+ at WPS_TARBALL@
@MDDS_TARBALL@
@BOOST_TARBALL@
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 333bc5e..2d0cfeb 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPD:libwpd LIBORCUS:liborcus LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerperfect/prj/build.lst b/writerperfect/prj/build.lst
index e7f7221..668dbc7 100644
--- a/writerperfect/prj/build.lst
+++ b/writerperfect/prj/build.lst
@@ -1,3 +1,3 @@
-wp writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd libvisio LIBCDR:libcdr LIBMSPUB:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
+wp writerperfect : LIBWPG:libwpg libwps LIBWPD:libwpd libvisio LIBCDR:libcdr LIBMSPUB:libmspub LCMS2:lcms2 ZLIB:zlib sot comphelper xmloff svtools sfx2 LIBXSLT:libxslt NULL
wp writerperfect usr1 - all wp_mkout NULL
wp writerperfect\prj nmake - all wp_prj NULL
commit 97ed2616bdc104a86655f4f629870193a6b222ce
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Sep 3 13:57:46 2012 +0200
libvisio: convert to gbuild
Change-Id: Ie52c2ed87bf7631877bdf9a4cffc2f0a8fb3736c
diff --git a/Makefile.top b/Makefile.top
index 9b65103..d94075d 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -86,6 +86,7 @@ jurt\
jvmaccess\
jvmfwk\
l10ntools\
+libvisio\
lingucomponent\
linguistic\
lotuswordpro\
@@ -213,7 +214,6 @@ libmspub\
liborcus\
libpng\
librsvg\
-libvisio\
libwpd\
libwpg\
libwps\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 1f23047..dd80586 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
idl \
io \
javaunohelper \
+ libvisio \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 0f39f41..27ee920 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmaccess \
jvmfwk \
l10ntools \
+ libvisio \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/config_host.mk.in b/config_host.mk.in
index c83ae44..bd44460 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -584,6 +584,7 @@ export VERBOSE=@VERBOSE@
export VIGRA_TARBALL=@VIGRA_TARBALL@
export VISIO_CFLAGS=@VISIO_CFLAGS@
export VISIO_LIBS=@VISIO_LIBS@
+export VISIO_TARBALL=@VISIO_TARBALL@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
export WINDRES=@WINDRES@
diff --git a/configure.in b/configure.in
index 2fb4b35..a35194c 100644
--- a/configure.in
+++ b/configure.in
@@ -6660,11 +6660,12 @@ elif test $_os = iOS; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBVISIO=NO
- BUILD_TYPE="$BUILD_TYPE LIBVISIO"
+ VISIO_TARBALL=94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
fi
AC_SUBST(SYSTEM_LIBVISIO)
AC_SUBST(VISIO_CFLAGS)
AC_SUBST(VISIO_LIBS)
+AC_SUBST(VISIO_TARBALL)
dnl ===================================================================
dnl Check for system libcmis
diff --git a/libvisio/Makefile b/libvisio/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/libvisio/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/libvisio/Module_libvisio.mk b/libvisio/Module_libvisio.mk
new file mode 100644
index 0000000..6c4190d
--- /dev/null
+++ b/libvisio/Module_libvisio.mk
@@ -0,0 +1,22 @@
+# -*- 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,libvisio))
+
+ifeq ($(SYSTEM_LIBVISIO),NO)
+
+$(eval $(call gb_Module_add_targets,libvisio,\
+ Package_libvisio \
+ StaticLibrary_visio \
+ UnpackedTarball_visio \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/Package_libvisio.mk b/libvisio/Package_libvisio.mk
new file mode 100644
index 0000000..54bb8f4
--- /dev/null
+++ b/libvisio/Package_libvisio.mk
@@ -0,0 +1,20 @@
+# -*- 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_Package_Package,libvisio_inc,$(call gb_UnpackedTarball_get_dir,visio/src/lib)))
+
+$(eval $(call gb_Package_use_unpacked,libvisio_inc,visio))
+
+$(eval $(call gb_Package_add_files,libvisio_inc,inc/external/libvisio,\
+ libvisio.h \
+ VisioDocument.h \
+ VSDStringVector.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/StaticLibrary_visio.mk b/libvisio/StaticLibrary_visio.mk
new file mode 100644
index 0000000..c917b6f
--- /dev/null
+++ b/libvisio/StaticLibrary_visio.mk
@@ -0,0 +1,45 @@
+# -*- 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_StaticLibrary_StaticLibrary,visiolib))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,visiolib,visio))
+
+$(eval $(call gb_StaticLibrary_use_package,visiolib,libvisio_inc))
+
+$(eval $(call gb_StaticLibrary_use_externals,visiolib,\
+ wpd \
+ wpg \
+))
+
+$(eval $(call gb_StaticLibrary_set_cxx_suffix,visiolib,cpp))
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\
+ UnpackedTarball/visio/src/lib/libvisio_utils \
+ UnpackedTarball/visio/src/lib/VisioDocument \
+ UnpackedTarball/visio/src/lib/VSD11Parser \
+ UnpackedTarball/visio/src/lib/VSD6Parser \
+ UnpackedTarball/visio/src/lib/VSDInternalStream \
+ UnpackedTarball/visio/src/lib/VSDStringVector \
+ UnpackedTarball/visio/src/lib/VSDSVGGenerator \
+ UnpackedTarball/visio/src/lib/VSDXCharacterList \
+ UnpackedTarball/visio/src/lib/VSDXContentCollector \
+ UnpackedTarball/visio/src/lib/VSDXFieldList \
+ UnpackedTarball/visio/src/lib/VSDXGeometryList \
+ UnpackedTarball/visio/src/lib/VSDXOutputElementList \
+ UnpackedTarball/visio/src/lib/VSDXPages \
+ UnpackedTarball/visio/src/lib/VSDXParagraphList \
+ UnpackedTarball/visio/src/lib/VSDXParser \
+ UnpackedTarball/visio/src/lib/VSDXShapeList \
+ UnpackedTarball/visio/src/lib/VSDXStencils \
+ UnpackedTarball/visio/src/lib/VSDXStyles \
+ UnpackedTarball/visio/src/lib/VSDXStylesCollector \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk
new file mode 100644
index 0000000..aa9113b
--- /dev/null
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list