Upload libmspub 0.0.4

Change-Id: Icb47740815fabff2338196ec194a51a23f7adadd
(cherry picked from commit 093a5c95a3724eb4795713c5cb4472611ca22324)

add boost dependency and header-finding hackery to libmspub

Change-Id: I5206cb1719164c6adc0dee46db40a8a63a45c19b
(cherry picked from commit 61ab813abf4d2b1d02987535c5920d0328422203)

Fix internal boost variables

Change-Id: Id0011bf9b40cfaf02887edf6fdbee9cf51cefc86

Use the BOOST_INCLUDE_DIR variable in Windows build

(cherry picked from commit a8fd6b51e96999bea19904f183ccb2bf847c5e4f)

Conflicts:
	libmspub/ExternalProject_libmspub.mk

Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c

Silence some warnings

(cherry picked from commit 6d850419434c5df8cfdcd7682d49bc3d92b8de83)

Conflicts:
	libmspub/ExternalProject_libmspub.mk

Change-Id: I5a644fbe698b31bded3a5bf0fc96f1bf2be415e2

Update the internal libmspub to 0.0.5

Change-Id: Ia1e2807a9f8d624e734afa93102fb6ff27eee091
(cherry picked from commit ede5fccc348986528d52149426d344f880790637)
Reviewed-on: https://gerrit.libreoffice.org/2234
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>

10 files changed, 104 insertions, 101 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 97b661a564b3..e153b74b1ea4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1026,12 +1026,15 @@ endef
 else # !SYSTEM_LIBMSPUB
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	mspublib \
+	mspub-0.0 \
 ))
 
 define gb_LinkTarget__use_mspub
+$(call gb_LinkTarget_use_package,$(1),\
+	libmspub \
+)
 $(call gb_LinkTarget_use_static_libraries,$(1),\
-	mspublib \
+	mspub-0.0 \
 )
 
 endef
diff --git a/download.lst b/download.lst
index 276097f6b4ee..bc83a8ba8700 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
 CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
 export CDR_TARBALL := libcdr-0.0.10.tar.bz2
-MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc
-export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2
+MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
+export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
 VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
 export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
 
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk
index 89aecd81cda4..83a0c87da148 100644
--- a/libmspub/ExternalPackage_libmspub.mk
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -7,12 +7,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub))
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,mspub))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\
 	src/lib/libmspub.h \
 	src/lib/MSPUBDocument.h \
 	src/lib/MSPUBStringVector.h \
 ))
 
+$(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub))
+
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,build/win32/Release/lib/libmspub-0.0.lib))
+else
+$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a))
+endif
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
new file mode 100644
index 000000000000..8fa5166ddeeb
--- /dev/null
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -0,0 +1,81 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub))
+
+$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub))
+
+$(eval $(call gb_ExternalProject_register_targets,libmspub,\
+	build \
+))
+
+$(eval $(call gb_ExternalProject_use_externals,libmspub,\
+	boost_headers \
+	wpd \
+	wpg \
+))
+
+ifeq ($(OS)$(COM),WNTMSC)
+
+ifeq ($(VCVER),90)
+$(call gb_ExternalProject_get_state_target,libmspub,build) :
+	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \
+	&& touch $@
+else ifeq ($(VCVER),100)
+$(call gb_ExternalProject_get_state_target,libmspub,build) :
+	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& msbuild.exe libmspub.vcxproj /p:Configuration=Release \
+	&& touch $@
+else
+$(call gb_ExternalProject_get_state_target,libmspub,build) :
+	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
+	&& export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \
+	&& msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
+	&& touch $@
+endif
+
+else
+
+$(call gb_ExternalProject_get_state_target,libmspub,build) :
+	cd $(EXTERNAL_WORKDIR) \
+	&& export PKG_CONFIG="" \
+	&& export ICU_LIBS=" " && export ICU_CFLAGS="-I$(OUTDIR)/inc/external" \
+	&& export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \
+	&& export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \
+	&& ./configure \
+		--with-pic \
+		--enable-static \
+		--disable-shared \
+		--without-docs \
+		--disable-debug \
+		--disable-werror \
+		--disable-weffc \
+        $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
+		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+	&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+	&& touch $@
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libmspub/Module_libmspub.mk b/libmspub/Module_libmspub.mk
index 0106a9f27f71..fd67e906c2f1 100644
--- a/libmspub/Module_libmspub.mk
+++ b/libmspub/Module_libmspub.mk
@@ -13,7 +13,7 @@ ifeq ($(SYSTEM_LIBMSPUB),NO)
 
 $(eval $(call gb_Module_add_targets,libmspub,\
 	ExternalPackage_libmspub \
-	StaticLibrary_mspub \
+	ExternalProject_libmspub \
 	UnpackedTarball_mspub \
 ))
 
diff --git a/libmspub/StaticLibrary_mspub.mk b/libmspub/StaticLibrary_mspub.mk
deleted file mode 100644
index 81d081eb7069..000000000000
--- a/libmspub/StaticLibrary_mspub.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_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 \
-	boost_headers \
-))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,mspublib))
-
-$(eval $(call gb_StaticLibrary_set_generated_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
index 34232f55e0e2..51931694422e 100644
--- a/libmspub/UnpackedTarball_mspub.mk
+++ b/libmspub/UnpackedTarball_mspub.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,mspub,\
-	libmspub/libmspub-0.0.3.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libmspub/libmspub-0.0.3.patch b/libmspub/libmspub-0.0.3.patch
deleted file mode 100644
index 26a96277b084..000000000000
--- a/libmspub/libmspub-0.0.3.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- misc/libmspub-0.0.3/src/lib/MSPUBParser.cpp	2012-08-21 11:40:41.000000000 +0200
-+++ misc/build/libmspub-0.0.3/src/lib/MSPUBParser.cpp	2012-08-21 12:58:58.435884355 +0200
-@@ -52,7 +52,9 @@
- #include "TableInfo.h"
- #include "VerticalAlign.h"
- 
-+#if !defined(_MSC_VER) && !defined(BOOST_CSTDINT_HPP)
- using boost::int32_t;
-+#endif
- using boost::uint32_t;
- 
- libmspub::MSPUBParser::MSPUBParser(WPXInputStream *input, MSPUBCollector *collector)
-@@ -1151,7 +1151,7 @@
-   ParagraphStyle ret;
- 
-   bool isList = false;
--  uint32_t bulletChar = '\u0000';
-+  uint32_t bulletChar = 0;
-   NumberingType numberingType = STANDARD_WESTERN;
-   NumberingDelimiter numberingDelimiter = NO_DELIMITER;
-   boost::optional<unsigned> numberIfRestarted;
-@@ -1256,7 +1256,7 @@
-   }
-   if (isList)
-   {
--    if (bulletChar != '\u0000')
-+    if (bulletChar)
-     {
-       ret.m_listInfo = ListInfo(bulletChar);
-     }
---- misc/libmspub-0.0.3/src/lib/libmspub_utils.h
-+++ misc/build/libmspub-0.0.3/src/lib/libmspub_utils.h
-@@ -43,7 +43,11 @@
- 
- typedef unsigned char uint8_t;
- typedef unsigned short uint16_t;
-+#ifndef BOOST_CSTDINT_HPP
- typedef unsigned uint32_t;
-+#endif
-+typedef signed char int8_t;
-+typedef short int16_t;
- typedef int int32_t;
- typedef unsigned __int64 uint64_t;
- 
diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst
index 6a0f643782eb..23854758cc94 100644
--- a/libmspub/prj/build.lst
+++ b/libmspub/prj/build.lst
@@ -1,2 +1,2 @@
-mspub	libmspub	: libwpd libwpg ZLIB:zlib BOOST:boost soltools NULL
+mspub	libmspub	: libwpd libwpg ZLIB:zlib BOOST:boost ICU:icu soltools NULL
 mspub	libmspub\prj	nmake	-	all	mspub_libmspub NULL
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 191a712b90a5..38627990d270 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -26,6 +26,7 @@ ifeq ($(OS)$(COM),WNTMSC)
 ifeq ($(VCVER),90)
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \
@@ -35,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 else ifeq ($(VCVER),100)
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/extrenal \
@@ -44,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 else
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
 	cd $(EXTERNAL_WORKDIR)/build/win32 \
+	&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LIBXML_INCLUDE_DIR=$(OUTDIR)/inc/external \