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

[Tor Lillqvist]

 external/libmwaw/UnpackedTarball_libmwaw.mk |    4 ++++
 external/libmwaw/c++11-narrowing.patch      |   11 +++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit d24cdb9c4a5de2dd856e86884ce67aa6f1c28453
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 19 09:09:29 2015 +0300

    Fix error: case value evaluates to 2168791104, which cannot be narrowed ...
    
    ... to type 'long' [-Wc++11-narrowing]
    
    Change-Id: If9d34297c08744671d2aedd6b3ef7ad3592fb431

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 50aa54c..823fab2 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -35,4 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 ))
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
+    external/libmwaw/c++11-narrowing.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/c++11-narrowing.patch b/external/libmwaw/c++11-narrowing.patch
new file mode 100644
index 0000000..8695d44
--- /dev/null
+++ b/external/libmwaw/c++11-narrowing.patch
@@ -0,0 +1,11 @@
+--- src/lib/RagTime5StructManager.cxx
++++ src/lib/RagTime5StructManager.cxx
+@@ -307,7 +307,7 @@
+     fSz-=4;
+   long debDataPos=input->tell();
+   long endDataPos=debDataPos+fSz;
+-  switch (type) {
++  switch ((unsigned long) type) {
+   case 0x360c0:
+   case 0x368c0:
+     if (fSz!=1) {