[Libreoffice-commits] core.git: external/libmspub

[Stephan Bergmann]

 external/libmspub/UnpackedTarball_libmspub.mk |    6 ++++++
 external/libmspub/ubsan.patch                 |   12 ++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 7340bec4720340e5d43d495577db7ac19937f84a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 13 11:13:40 2015 +0100

    external/libmspub: Work around -fsanitize=enum
    
    Change-Id: Icf1d45b1cd171e868a15f841258c5368a0b213e1

diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk
index 044ce96..cce7b54 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmspub))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
+    external/libmspub/ubsan.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmspub/ubsan.patch b/external/libmspub/ubsan.patch
new file mode 100644
index 0000000..b58249e
--- /dev/null
+++ b/external/libmspub/ubsan.patch
@@ -0,0 +1,12 @@
+--- src/lib/MSPUBContentChunkType.h
++++ src/lib/MSPUBContentChunkType.h
+@@ -27,7 +27,8 @@
+   CELLS      = 0x63,
+   FONT       = 0x6C,
+   IMAGE_2K, //these don't exist in Pub 2k3 so their value in the enum is not used.
+-  IMAGE_2K_DATA
++  IMAGE_2K_DATA,
++  MSPUBContentChunkType_dummy=0xFF // MSPUBParser.cpp:2359:9: runtime error: load of value 138, which is not a valid value for type 'libmspub::MSPUBContentChunkType'
+ };
+ } // namespace libmspub
+