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

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

2019-01-15 Thread Libreoffice Gerrit user

 external/libmwaw/UnpackedTarball_libmwaw.mk |6 --
 external/libmwaw/libmwaw_android_arm.patch.1|   20 ---
 external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 |   34 
 external/libwps/UnpackedTarball_libwps.mk   |6 --
 4 files changed, 66 deletions(-)

New commits:
commit 6619fa914fed096326bd88d970660d40bbfae729
Author: Stephan Bergmann 
AuthorDate: Tue Jan 15 14:47:30 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Jan 15 22:31:02 2019 +0100

Revert "Fix nan is not a member of std when building android"

This reverts commit cc2bc0bf3cf75307aaa04f4dc8ddce8db678b450.  As discussed 
at
 "Fix nan is not a member of std 
when
building android":

Stephan: "with exactly what architecture and toolchain did that failure 
happen;
is this commit still relevant after  'Switch 
Android
armeabi-v7a to libc++/libc++abi/libunwind too'?"

Tomaž: "It was a consequence of that limited Bionic libstdc++ that was used 
in
ANdorid. libc++ should be a modern up-to-date replacements so I guess this
workaraunds are now obsolete and irrelevant."

(And a --with-distro=LibreOfficeAndroid build against NDK r16b indeed 
succeeded
for me with this revert.)

Conflicts:
external/libwps/UnpackedTarball_libwps.mk

Change-Id: I2dba64e5712b20fa07f6374ae01c226025c52d8b
Reviewed-on: https://gerrit.libreoffice.org/66390
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 56b723a3dd16..bb39a27382b9 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -41,10 +41,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
 ))
 
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-external/libmwaw/libmwaw_android_arm.patch.1 \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw_android_arm.patch.1 
b/external/libmwaw/libmwaw_android_arm.patch.1
deleted file mode 100644
index 23582dd1535e..
--- a/external/libmwaw/libmwaw_android_arm.patch.1
+++ /dev/null
@@ -1,20 +0,0 @@
 a/src/lib/MultiplanParser.cxx
-+++ b/src/lib/MultiplanParser.cxx
-@@ -747,7 +747,7 @@ bool MultiplanParser::readSharedData(int pos, int 
cellType, MWAWVec2i const 
- f << "Nan" << input->readULong(1) << ",";
- input->seek(7, librevenge::RVNG_SEEK_CUR);
- content.m_contentType=content.C_NUMBER;
--content.setValue(std::nan(""));
-+content.setValue(nan(""));
-   }
-   break;
- case 3:
-@@ -1594,7 +1594,7 @@ bool MultiplanParser::sendCell(MWAWVec2i const , 
int p)
- f << name << ",";
-   }
-   else if ((type&0x3)==2 && dSz==8) {
--content.setValue(std::nan(""));
-+content.setValue(nan(""));
- f << "Nan" << input->readULong(1) << ",";
- input->seek(7, librevenge::RVNG_SEEK_CUR);
-   }
diff --git a/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 
b/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
deleted file mode 100644
index f668a5251eba..
--- a/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
+++ /dev/null
@@ -1,34 +0,0 @@
-From 11d84de5628a6afaebdf85e09791221888e641f4 Mon Sep 17 00:00:00 2001
-From: Mert Tumer 
-Date: Wed, 13 Jun 2018 17:32:15 -0700
-Subject: Fix nan is not a member of std
-

- src/lib/Multiplan.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 26ceca3..11f83c8 100644
 a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -,7 +,7 @@ bool MultiplanParser::readSharedData(int pos, int 
cellType, Vec2i const 
-   f << "Nan" << libwps::readU8(input) << ",";
-   input->seek(7, librevenge::RVNG_SEEK_CUR);
-   content.m_contentType=content.C_NUMBER;
--  content.setValue(std::nan(""));
-+  content.setValue(nan(""));
-   }
-   break;
-   case 3:
-@@ -2622,7 +2622,7 @@ bool MultiplanParser::sendCell(Vec2i const , int 
p)
-   }
-   else if (type==2 && dSz==8)
-   {
--  content.setValue(std::nan(""));
-+  content.setValue(nan(""));
-   f << "Nan" << int(libwps::readU8(input)) << ",";
-   input->seek(7, librevenge::RVNG_SEEK_CUR);
-   }
--- 
-2.17.1
-
diff --git a/external/libwps/UnpackedTarball_libwps.mk 
b/external/libwps/UnpackedTarball_libwps.mk
index

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

2018-06-15 Thread Mert Tumer

 external/libmwaw/UnpackedTarball_libmwaw.mk |6 ++
 external/libmwaw/libmwaw_android_arm.patch.1|   20 +++
 external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 |   34 
 external/libwps/UnpackedTarball_libwps.mk   |6 ++
 4 files changed, 66 insertions(+)

New commits:
commit cc2bc0bf3cf75307aaa04f4dc8ddce8db678b450
Author: Mert Tumer 
Date:   Thu Jun 14 01:27:49 2018 -0700

Fix nan is not a member of std when building android

Change-Id: I4eab47fd3358d26587e61c9f030f9ed10b067677
Reviewed-on: https://gerrit.libreoffice.org/55783
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index bb39a27382b9..56b723a3dd16 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -41,4 +41,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 \
 ))
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
+external/libmwaw/libmwaw_android_arm.patch.1 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw_android_arm.patch.1 
b/external/libmwaw/libmwaw_android_arm.patch.1
new file mode 100644
index ..23582dd1535e
--- /dev/null
+++ b/external/libmwaw/libmwaw_android_arm.patch.1
@@ -0,0 +1,20 @@
+--- a/src/lib/MultiplanParser.cxx
 b/src/lib/MultiplanParser.cxx
+@@ -747,7 +747,7 @@ bool MultiplanParser::readSharedData(int pos, int 
cellType, MWAWVec2i const 
+ f << "Nan" << input->readULong(1) << ",";
+ input->seek(7, librevenge::RVNG_SEEK_CUR);
+ content.m_contentType=content.C_NUMBER;
+-content.setValue(std::nan(""));
++content.setValue(nan(""));
+   }
+   break;
+ case 3:
+@@ -1594,7 +1594,7 @@ bool MultiplanParser::sendCell(MWAWVec2i const , 
int p)
+ f << name << ",";
+   }
+   else if ((type&0x3)==2 && dSz==8) {
+-content.setValue(std::nan(""));
++content.setValue(nan(""));
+ f << "Nan" << input->readULong(1) << ",";
+ input->seek(7, librevenge::RVNG_SEEK_CUR);
+   }
diff --git a/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 
b/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
new file mode 100644
index ..f668a5251eba
--- /dev/null
+++ b/external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1
@@ -0,0 +1,34 @@
+From 11d84de5628a6afaebdf85e09791221888e641f4 Mon Sep 17 00:00:00 2001
+From: Mert Tumer 
+Date: Wed, 13 Jun 2018 17:32:15 -0700
+Subject: Fix nan is not a member of std
+
+---
+ src/lib/Multiplan.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
+index 26ceca3..11f83c8 100644
+--- a/src/lib/Multiplan.cpp
 b/src/lib/Multiplan.cpp
+@@ -,7 +,7 @@ bool MultiplanParser::readSharedData(int pos, int 
cellType, Vec2i const 
+   f << "Nan" << libwps::readU8(input) << ",";
+   input->seek(7, librevenge::RVNG_SEEK_CUR);
+   content.m_contentType=content.C_NUMBER;
+-  content.setValue(std::nan(""));
++  content.setValue(nan(""));
+   }
+   break;
+   case 3:
+@@ -2622,7 +2622,7 @@ bool MultiplanParser::sendCell(Vec2i const , int 
p)
+   }
+   else if (type==2 && dSz==8)
+   {
+-  content.setValue(std::nan(""));
++  content.setValue(nan(""));
+   f << "Nan" << int(libwps::readU8(input)) << ",";
+   input->seek(7, librevenge::RVNG_SEEK_CUR);
+   }
+-- 
+2.17.1
+
diff --git a/external/libwps/UnpackedTarball_libwps.mk 
b/external/libwps/UnpackedTarball_libwps.mk
index d82b2be75783..6805e746f2cc 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -39,4 +39,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\

external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 
\
 ))
 
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
+external/libwps/0001-Fix-nan-is-not-a-member-of-std.patch.1 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-06-13 Thread David Tardon

 external/libmwaw/Library_mwaw.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d5d7f94f4911b293812d421493ae0c633628bba1
Author: David Tardon 
Date:   Wed Jun 13 15:54:18 2018 +0200

drop unneeded define

Change-Id: Icced4a3f9a7ad4cbcc908412e577b4dfb85fc6eb
Reviewed-on: https://gerrit.libreoffice.org/55757
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 0b28836cdb80..fbdd9e1cf1da 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,mwaw,\
-DBUILD_MWAW \
-DNDEBUG \
-D_WINDLL \
-   -DSHAREDPTR_STD \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-28 Thread David Tardon

 external/libmwaw/ExternalProject_libmwaw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d73adb887ce08c22121c7bb02681efd49fd5781c
Author: David Tardon 
Date:   Sat Oct 28 15:37:24 2017 +0200

libmwaw: pass optimization flags to configure

Change-Id: Ia824b2897fbac5a0cb969c91b8f1feeefd73f448
Reviewed-on: https://gerrit.libreoffice.org/43996
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index 2e9f91ba8131..50483717eebd 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \
-   CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11)" \
+   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN')) 
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-07-17 Thread David Tardon

 external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 | 
   3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8cba7fd59eae4dfb88a6b16653eaf880bbb0e3c0
Author: David Tardon 
Date:   Mon Jul 17 14:18:12 2017 +0200

try harder

Change-Id: I575a61ba87218fe1071cfd151dd6de27c9df7085

diff --git 
a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 
b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
index c983002f086f..dbbe6bfd204c 100644
--- 
a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
+++ 
b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
@@ -19,7 +19,8 @@ index 4c9580d..cbf0fc0 100644
  
  /** fall through attributes */
 -#define MWAW_FALLTHROUGH
- #if defined(__clang__)
+-#if defined(__clang__)
++#if defined(__clang__) && defined(__has_cpp_attribute)
 -#  if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
 -#undef MWAW_FALLTHROUGH
 +#  if __has_cpp_attribute(clang::fallthrough)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-07-17 Thread David Tardon

 external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 | 
  45 ++
 external/libmwaw/UnpackedTarball_libmwaw.mk  | 
   1 
 2 files changed, 46 insertions(+)

New commits:
commit df1d2d9d732e54a9596722b75e5117ed36cdc664
Author: David Tardon 
Date:   Mon Jul 17 10:53:17 2017 +0200

try to fix osx build

Change-Id: I4b9f29f6221b6c4206a961e9951fff2d3ab93e21

diff --git 
a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 
b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
new file mode 100644
index ..c983002f086f
--- /dev/null
+++ 
b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
@@ -0,0 +1,45 @@
+From a7648cda4017551c1c97c61362eb52d95fbe68e7 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Mon, 17 Jul 2017 10:43:01 +0200
+Subject: [PATCH] make MWAW_FALLTHROUGH decl. more verbose again
+
+... because older clang doesn't like the former one:
+./libmwaw_internal.hxx:122:58: error: token is not a valid binary operator in 
a preprocessor subexpression
+  ~~~^
+---
+ src/lib/libmwaw_internal.hxx | 13 -
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
+index 4c9580d..cbf0fc0 100644
+--- a/src/lib/libmwaw_internal.hxx
 b/src/lib/libmwaw_internal.hxx
+@@ -117,17 +117,20 @@ struct MWAW_shared_ptr_noop_deleter {
+ #endif
+ 
+ /** fall through attributes */
+-#define MWAW_FALLTHROUGH
+ #if defined(__clang__)
+-#  if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
+-#undef MWAW_FALLTHROUGH
++#  if __has_cpp_attribute(clang::fallthrough)
+ #define MWAW_FALLTHROUGH [[clang::fallthrough]]
++#  else
++#define MWAW_FALLTHROUGH
+ #  endif
+ #elif defined(__GNUC__)
+ #  if __GNUC__>=7
+-#undef MWAW_FALLTHROUGH
+-#define MWAW_FALLTHROUGH __attribute__ ((fallthrough))
++#define MWAW_FALLTHROUGH [[fallthrough]]
++#  else
++#define MWAW_FALLTHROUGH
+ #  endif
++#else
++#  define MWAW_FALLTHROUGH
+ #endif
+ 
+ /* -- debug  --- */
+-- 
+2.13.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index c51473a3fe82..bf44de96c3f3 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 external/libmwaw/iOS.patch.0 \
+
external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-15 Thread David Tardon

 external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 |   25 
++
 external/libmwaw/UnpackedTarball_libmwaw.mk|1 
 2 files changed, 26 insertions(+)

New commits:
commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9
Author: David Tardon 
Date:   Thu Jun 15 13:17:40 2017 +0200

use correct size

Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0

diff --git a/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 
b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
new file mode 100644
index ..df64f7bcf4d2
--- /dev/null
+++ b/external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1
@@ -0,0 +1,25 @@
+From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Sat, 8 Apr 2017 14:03:29 +0200
+Subject: [PATCH] ofz#1037 resize vector correctly
+
+---
+ src/lib/MsWrd1Parser.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
+index 63547e6..3626064 100644
+--- a/src/lib/MsWrd1Parser.cxx
 b/src/lib/MsWrd1Parser.cxx
+@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i 
limits)
+ int id = fIt++->second;
+ fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
+ if (id >= int(m_state->m_footnotesList.size()))
+-  m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
++  m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
+ m_state->m_footnotesList[size_t(id)]=fPos;
+   }
+   ascii().addDelimiter(input->tell(),'|');
+-- 
+2.13.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index d26751708956..9fa7f0bfdab9 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -38,6 +38,7 @@ endif
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-fix-build-with-MSVC.patch.1 \
external/libmwaw/libmwaw-fix-compare-assert.patch.1 \
+   external/libmwaw/0001-ofz-1037-resize-vector-correctly.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-06 Thread Michael Stahl

 external/libmwaw/UnpackedTarball_libmwaw.mk |1 +
 external/libmwaw/libmwaw-fix-compare-assert.patch.1 |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 3510a0e2245e619a2e2518f8702686d608522cdf
Author: Michael Stahl 
Date:   Thu Apr 6 14:27:31 2017 +0200

libmwaw: fix MSVC2017 "invalid comparator" assert

Change-Id: Ic1ace8da86d6306d1cc3d3b124a236bf794cc7be

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index ce283807e490..de99d5685378 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-fix-build-with-MSVC.patch.1 \
+   external/libmwaw/libmwaw-fix-compare-assert.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/libmwaw-fix-compare-assert.patch.1 
b/external/libmwaw/libmwaw-fix-compare-assert.patch.1
new file mode 100755
index ..d7dae34a90bb
--- /dev/null
+++ b/external/libmwaw/libmwaw-fix-compare-assert.patch.1
@@ -0,0 +1,13 @@
+Assertion failed: invalid comparator
+
+--- libmwaw/src/lib/MWAWFont.hxx.orig  2017-04-06 14:19:52.75100 +0200
 libmwaw/src/lib/MWAWFont.hxx   2017-04-06 13:50:51.38540 +0200
+@@ -505,7 +505,7 @@
+ int diff = id() - oth.id();
+ if (diff != 0) return diff;
+ if (size() < oth.size()) return -1;
+-if (size() > oth.size()) return -1;
++if (size() > oth.size()) return 1;
+ if (m_sizeIsRelative.get() != oth.m_sizeIsRelative.get()) return 
m_sizeIsRelative.get() ? 1 : -1;
+ if (flags() < oth.flags()) return -1;
+ if (flags() > oth.flags()) return 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-11-24 Thread David Tardon

 
external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
 |   56 ++
 external/libmwaw/UnpackedTarball_libmwaw.mk
|1 
 2 files changed, 57 insertions(+)

New commits:
commit b1e5983f04095346bee48dc3b413c0ae28789c27
Author: David Tardon 
Date:   Tue Nov 24 15:33:20 2015 +0100

fix c++ snafu with msvc

Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150

diff --git 
a/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
 
b/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
new file mode 100644
index 000..b9ed2e1
--- /dev/null
+++ 
b/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
@@ -0,0 +1,56 @@
+From 2d178367e7029a98fb555a084c1c946c8826ff06 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Tue, 24 Nov 2015 15:15:36 +0100
+Subject: [PATCH] if ptr to member var. is defined, ensure the class is
+ complete
+
+... because MSVC represents pointers to member as variable size,
+depending on context (e.g., multiple inheritance). So it can happen that
+the size of the pointer in the header (where the class is only
+forward-declared) differs from the size of the same pointer in an impl.
+file (where the class is complete).
+---
+ src/lib/ClarisWksDocument.hxx | 1 +
+ src/lib/GreatWksDocument.hxx  | 1 +
+ src/lib/MsWksDocument.hxx | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/lib/ClarisWksDocument.hxx b/src/lib/ClarisWksDocument.hxx
+index 2b70860..3003b6a 100644
+--- a/src/lib/ClarisWksDocument.hxx
 b/src/lib/ClarisWksDocument.hxx
+@@ -42,6 +42,7 @@
+ 
+ #include "libmwaw_internal.hxx"
+ 
++#include "MWAWParser.hxx"
+ #include "MWAWPosition.hxx"
+ 
+ #include "ClarisWksStruct.hxx"
+diff --git a/src/lib/GreatWksDocument.hxx b/src/lib/GreatWksDocument.hxx
+index 2e00451..2e13dc2 100644
+--- a/src/lib/GreatWksDocument.hxx
 b/src/lib/GreatWksDocument.hxx
+@@ -41,6 +41,7 @@
+ 
+ #include "MWAWCell.hxx"
+ #include "MWAWDebug.hxx"
++#include "MWAWParser.hxx"
+ 
+ namespace GreatWksDocumentInternal
+ {
+diff --git a/src/lib/MsWksDocument.hxx b/src/lib/MsWksDocument.hxx
+index a212e7f..e96f5dd 100644
+--- a/src/lib/MsWksDocument.hxx
 b/src/lib/MsWksDocument.hxx
+@@ -44,6 +44,7 @@
+ 
+ #include "MWAWDebug.hxx"
+ #include "MWAWCell.hxx"
++#include "MWAWParser.hxx"
+ 
+ namespace MsWksDocumentInternal
+ {
+-- 
+2.5.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 072da50..0b04abb 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 external/libmwaw/c++11-narrowing.patch \
+   
external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
 \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-09-19 Thread 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 
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 000..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) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-07 Thread Andras Timar

 external/libmwaw/ExternalPackage_libmwaw.mk |2 +-
 external/libmwaw/UnpackedTarball_libmwaw.mk |8 
 external/libmwaw/libmwaw-bundled-soname.patch.0 |   14 ++
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 0dc79f35aa3a373414c17f596ca4491a69083864
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Aug 7 11:09:01 2015 +0200

libmwaw bundled soname patch

Change-Id: Ibaba47be8aeefca7719d1ff335f551777130c6cd
Reviewed-on: https://gerrit.libreoffice.org/17568
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Andras Timar andras.ti...@collabora.com

diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index b6bda7d..6f3f27c 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.$(MWAW_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3-lo.so.3,src/lib/.libs/libmwaw-0.3-lo.so.3.0.$(MWAW_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 4ba779a..50aa54c 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -21,6 +21,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 endif
 endif
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
+external/libmwaw/libmwaw-bundled-soname.patch.0 \
+))
+endif
+endif
+
 ifeq ($(SYSTEM_REVENGE),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 external/libmwaw/rpath.patch \
diff --git a/external/libmwaw/libmwaw-bundled-soname.patch.0 
b/external/libmwaw/libmwaw-bundled-soname.patch.0
new file mode 100644
index 000..2abf77c
--- /dev/null
+++ b/external/libmwaw/libmwaw-bundled-soname.patch.0
@@ -0,0 +1,14 @@
+--- src/lib/Makefile.in.orig   2015-08-07 14:04:47.646611627 +0200
 src/lib/Makefile.in2015-08-07 14:25:49.888589996 +0200
+@@ -418,8 +418,8 @@
+ 
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS)
+ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) 
@LIBMWAW_WIN32_RESOURCE@
+-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBMWAW_WIN32_RESOURCE@  
+-libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic  -no-undefined
++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBMWAW_WIN32_RESOURCE@
++libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
+ libmwaw_@MWAW_MAJOR_VERSION@_@MWAW_MINOR_VERSION@_la_SOURCES = \
+   libmwaw_internal.cxx\
+   libmwaw_internal.hxx\
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-11 Thread Stephan Bergmann

 external/libmwaw/UnpackedTarball_libmwaw.mk |4 ++--
 external/libmwaw/ubsan-visibility.patch |   11 +++
 external/libmwaw/ubsan-visibility.patch.0   |   11 ---
 3 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 555911d7442c8f1170f67708774cdd26a3ca33ad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jun 11 17:02:42 2015 +0200

external/libmwaw: use patchlevel 0

Change-Id: I374df5ffc4dac7824db0d6faf59db7143449767b

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index b18f32a..26492df 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,12 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-external/libmwaw/ubsan-visibility.patch.0 \
+external/libmwaw/ubsan-visibility.patch \
 ))
 endif
 endif
diff --git a/external/libmwaw/ubsan-visibility.patch.0 
b/external/libmwaw/ubsan-visibility.patch
similarity index 100%
rename from external/libmwaw/ubsan-visibility.patch.0
rename to external/libmwaw/ubsan-visibility.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-01-13 Thread Stephan Bergmann

 external/libmwaw/UnpackedTarball_libmwaw.mk |1 +
 external/libmwaw/ubsan.patch.0  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit fcfa399067a7606e0ffc426265428b25c8e9260d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 13 10:54:36 2015 +0100

external/libmwaw: Work around -fsanitize=shift

Change-Id: Ia44ef02bc19653e2a20b2da52f5b5b377950353d

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index e37d82d..5338ce5 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\

external/libmwaw/0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 \

external/libmwaw/0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
 \
+   external/libmwaw/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ubsan.patch.0 b/external/libmwaw/ubsan.patch.0
new file mode 100644
index 000..4a7f210
--- /dev/null
+++ b/external/libmwaw/ubsan.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/WingzParser.cxx
 src/lib/WingzParser.cxx
+@@ -1120,7 +1120,7 @@
+   MWAWColor colors[4];
+   for (int i=0; i4; ++i) { // font, back, unknown,font color
+ val=(int) input-readULong(4);
+-int col=((val16)0xFF)|(val0xFF00)|((val16)0xFF);
++int col=((val16)0xFF)|(val0xFF00)|((val0xFF)16);
+ int high=(val24);
+ colors[i]=MWAWColor(uint32_t(col)|0xFF00);
+ switch (i) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-17 Thread David Tardon

 external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch | 
  24 
 external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch | 
 293 --
 external/libmwaw/0001-msvc2013-does-not-like-this.patch  | 
  25 
 external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch | 
  54 -
 external/libmwaw/ubsan.patch.0   | 
  11 
 5 files changed, 407 deletions(-)

New commits:
commit 0a9051782cfa261a3a1fe48fa95a4ec135ec042d
Author: David Tardon dtar...@redhat.com
Date:   Fri Oct 17 09:38:09 2014 +0200

drop unneeded patches

Change-Id: I67314a12717ada0bdb49d9578821abf66fb41302

diff --git 
a/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch 
b/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch
deleted file mode 100644
index 0b33534..000
--- 
a/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3355f5314cd01d8c264c91014d136a58f68d03f4 Mon Sep 17 00:00:00 2001
-From: osnola alo...@loria.fr
-Date: Wed, 13 Aug 2014 11:00:35 +0200
-Subject: [PATCH] MWAWDocument.cxx: remove an useless debug message.
-

- src/lib/MWAWDocument.cxx | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/lib/MWAWDocument.cxx b/src/lib/MWAWDocument.cxx
-index 5591f70..8246bf7 100644
 a/src/lib/MWAWDocument.cxx
-+++ b/src/lib/MWAWDocument.cxx
-@@ -109,7 +109,6 @@ MWAWDocument::Confidence 
MWAWDocument::isFileFormatSupported(librevenge::RVNGInp
-   }
- 
-   try {
--MWAW_DEBUG_MSG((MWAWDocument::isFileFormatSupported()\n));
- MWAWInputStreamPtr ip(new MWAWInputStream(input, false, true));
- MWAWInputStreamPtr rsrc=ip-getResourceForkStream();
- shared_ptrMWAWRSRCParser rsrcParser;
--- 
-1.8.4.5
-
diff --git 
a/external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch 
b/external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch
deleted file mode 100644
index 2b42f90..000
--- 
a/external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 7b7cf183a7ad454706aa0f1657c851c578ec476e Mon Sep 17 00:00:00 2001
-From: David Tardon dtar...@redhat.com
-Date: Sun, 25 May 2014 15:51:54 +0200
-Subject: [PATCH] librevenge-stream is optional: don't depend on it
-

- src/lib/MWAWStringStream.cxx | 153 +++
- src/lib/MWAWStringStream.hxx |  50 ++
- src/lib/Makefile.am  |   2 +
- src/lib/WingzParser.cxx  |   3 +-
- 4 files changed, 207 insertions(+), 1 deletion(-)
- create mode 100644 src/lib/MWAWStringStream.cxx
- create mode 100644 src/lib/MWAWStringStream.hxx
-
-diff --git a/src/lib/MWAWStringStream.cxx b/src/lib/MWAWStringStream.cxx
-new file mode 100644
-index 000..efea071
 /dev/null
-+++ b/src/lib/MWAWStringStream.cxx
-@@ -0,0 +1,153 @@
-+/* -*- Mode: C++; c-default-style: kr; indent-tabs-mode: nil; tab-width: 
2; c-basic-offset: 2 -*- */
-+
-+/* libmwaw
-+* Version: MPL 2.0 / LGPLv2+
-+*
-+* The contents of this file are subject to the Mozilla Public License Version
-+* 2.0 (the License); you may not use this file except in compliance with
-+* the License or as specified alternatively below. You may obtain a copy of
-+* the License at http://www.mozilla.org/MPL/
-+*
-+* Software distributed under the License is distributed on an AS IS basis,
-+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+* for the specific language governing rights and limitations under the
-+* License.
-+*
-+* Alternatively, the contents of this file may be used under the terms of
-+* the GNU Lesser General Public License Version 2 or later (the LGPLv2+),
-+* in which case the provisions of the LGPLv2+ are applicable
-+* instead of those above.
-+*/
-+
-+#include cstring
-+#include vector
-+
-+#include librevenge-stream/librevenge-stream.h
-+
-+#include MWAWStringStream.hxx
-+
-+class MWAWStringStreamPrivate
-+{
-+public:
-+  MWAWStringStreamPrivate(const unsigned char *data, unsigned dataSize);
-+  ~MWAWStringStreamPrivate();
-+  std::vectorunsigned char buffer;
-+  long offset;
-+private:
-+  MWAWStringStreamPrivate(const MWAWStringStreamPrivate );
-+  MWAWStringStreamPrivate operator=(const MWAWStringStreamPrivate );
-+};
-+
-+MWAWStringStreamPrivate::MWAWStringStreamPrivate(const unsigned char *data, 
unsigned dataSize) :
-+  buffer(dataSize),
-+  offset(0)
-+{
-+  std::memcpy(buffer[0], data, dataSize);
-+}
-+
-+MWAWStringStreamPrivate::~MWAWStringStreamPrivate()
-+{
-+}
-+
-+MWAWStringStream::MWAWStringStream(const unsigned char *data, const unsigned 
int dataSize) :
-+  librevenge::RVNGInputStream(),
-+  d(new MWAWStringStreamPrivate(data, dataSize))
-+{
-+}
-+
-+MWAWStringStream::~MWAWStringStream()
-+{
-+  delete d;
-+}
-+
-+const unsigned char *MWAWStringStream::read(unsigned long numBytes, unsigned 
long

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

2014-10-16 Thread Miklos Vajna

 external/libmwaw/ExternalPackage_libmwaw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8bc1ee9b4cd46d645e8aca0f9ea6844c702a64c0
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 16 21:10:25 2014 +0200

file libmwaw-0.3.so.3.0.1 does not exist in the tarball

Change-Id: I6b1592af199fcd79ac16827332014ea703a48a1e

diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index 9f8ad1e..3b3bcb6 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.1))
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.3))
 endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-29 Thread Stephan Bergmann

 external/libmwaw/UnpackedTarball_libmwaw.mk |1 +
 external/libmwaw/ubsan.patch.0  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 7a1d8c2187300aaa24d3aea239360bc360d8c950
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 29 12:20:00 2014 +0200

external/libmwaw: Invalid downcasts to libmwaw_applepict2::OpCode

cf. https://sourceforge.net/p/libmwaw/tickets/6/

Change-Id: Id59fc23ab25a8b4e12a96a0eb88d091cc5ae6e25

diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index c1b7db7..cfa63c5 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\

external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
external/libmwaw/0001-msvc2013-does-not-like-this.patch \

external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch \
+   external/libmwaw/ubsan.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ubsan.patch.0 b/external/libmwaw/ubsan.patch.0
new file mode 100644
index 000..26f1d96
--- /dev/null
+++ b/external/libmwaw/ubsan.patch.0
@@ -0,0 +1,11 @@
+See https://sourceforge.net/p/libmwaw/tickets/6/attachment/minimal.patch:
+--- src/lib/MWAWPictMac.cxx
 src/lib/MWAWPictMac.cxx
+@@ -1060,7 +1060,6 @@
+ if (type5==WP_NONE) return;
+ else m_types.push_back(type5);
+   }
+-  virtual ~OpCode() {}
+ 
+   /** tries to read the data in the file
+*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-08-04 Thread David Tardon

 external/libmwaw/ExternalProject_libmwaw.mk   |4 
 external/libodfgen/ExternalProject_libodfgen.mk   |4 
 external/librevenge/ExternalProject_librevenge.mk |4 
 external/libwps/ExternalProject_libwps.mk |4 
 4 files changed, 16 insertions(+)

New commits:
commit 6cf40d263e33dd6934005af8319ae6fc8a386592
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 4 09:27:24 2014 +0200

fdo#82035 fix loader paths

Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index 1b51225..5a19d85 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -41,6 +41,10 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 (cd $(EXTERNAL_WORKDIR)/src/lib  \
$(MAKE)) \
+   $(if $(filter MACOSX,$(OS)),\
+$(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index 8d88486..6e1c7ff 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+$(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk 
b/external/librevenge/ExternalProject_librevenge.mk
index 1783993..707b16e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) 
:
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+$(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk 
b/external/libwps/ExternalProject_libwps.mk
index 004c912..708b667 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+$(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-07 Thread David Tardon

 external/libmwaw/0001-msvc2013-does-not-like-this.patch |   25 
 external/libmwaw/UnpackedTarball_libmwaw.mk |1 
 2 files changed, 26 insertions(+)

New commits:
commit 56ccb184e0289734059d259a0ccb0fbb15d71aa7
Author: David Tardon dtar...@redhat.com
Date:   Mon Jul 7 19:39:34 2014 +0200

fix build with msvc2013

Change-Id: Ic027cd02f590db06a75fdd2b23d6f67bd42f575a

diff --git a/external/libmwaw/0001-msvc2013-does-not-like-this.patch 
b/external/libmwaw/0001-msvc2013-does-not-like-this.patch
new file mode 100644
index 000..691e799
--- /dev/null
+++ b/external/libmwaw/0001-msvc2013-does-not-like-this.patch
@@ -0,0 +1,25 @@
+From f61d5c4ba6812aac5539084f6b23816fbb51b132 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Mon, 7 Jul 2014 19:37:25 +0200
+Subject: [PATCH] msvc2013 does not like this
+
+---
+ src/lib/RagTimeParser.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/RagTimeParser.cxx b/src/lib/RagTimeParser.cxx
+index 2fb8e41..0f7d9e8 100644
+--- a/src/lib/RagTimeParser.cxx
 b/src/lib/RagTimeParser.cxx
+@@ -2404,7 +2404,7 @@ bool RagTimeParser::sendPicture(int zId, MWAWPosition 
const position)
+ }
+ input-seek(pict.m_pos.begin(), librevenge::RVNG_SEEK_SET);
+ shared_ptrMWAWPict thePict(MWAWPictData::get(input, pictSize));
+-bool ok=thePict;
++bool ok=bool(thePict);
+ if (ok) {
+   librevenge::RVNGBinaryData data;
+   std::string type;
+-- 
+1.9.3
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 6f63f28..27bc24d 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\

external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch \

external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
+   external/libmwaw/0001-msvc2013-does-not-like-this.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-17 Thread Douglas Mencken

 external/libmwaw/ExternalPackage_libmwaw.mk   |2 +-
 external/libodfgen/ExternalPackage_libodfgen.mk   |2 +-
 external/librevenge/ExternalPackage_librevenge.mk |2 +-
 external/libwps/ExternalPackage_libwps.mk |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9f339a89453808b917177a3ee675a76385758902
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Sat Jun 14 08:11:52 2014 -0400

external/librevenge,libmwaw,libodfgen,libwps: fix self-linked symlinks 
build problem

...LibreOfficeDev.app/Contents/MacOS/librevenge-0.0.0.dylib: Too many 
levels of symbolic links
(librevenge-0.0.0.dylib -- librevenge-0.0.0.dylib: broken symbolic link to 
librevenge-0.0.0.dylib)

The reason for this is that symlink librevenge-0.0.dylib
(UnpackedTarball/librevenge/src/lib/.libs/librevenge-0.0.dylib - 
librevenge-0.0.0.dylib)
is copied via cp --no-dereference, thus becoming linked to self.

Change-Id: I4b918c35c594800fb2d7f84ee0ee9f2ff2a5fe14
Reviewed-on: https://gerrit.libreoffice.org/9783
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com

diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index 18a0e1c..9f8ad1e 100644
--- a/external/libmwaw/ExternalPackage_libmwaw.mk
+++ b/external/libmwaw/ExternalPackage_libmwaw.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw))
 $(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.3.dylib,src/lib/.libs/libmwaw-0.3.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.3.dylib,src/lib/.libs/libmwaw-0.3.3.dylib))
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk 
b/external/libodfgen/ExternalPackage_libodfgen.mk
index a6d40f6..74423b4 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen))
 $(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.1.dylib,src/.libs/libodfgen-0.1.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.1.dylib,src/.libs/libodfgen-0.1.1.dylib))
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
diff --git a/external/librevenge/ExternalPackage_librevenge.mk 
b/external/librevenge/ExternalPackage_librevenge.mk
index 9b868ca..2df2110 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,librevenge,librevenge))
 $(eval $(call gb_ExternalPackage_use_external_project,librevenge,librevenge))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.0.dylib,src/lib/.libs/librevenge-0.0.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.0.dylib,src/lib/.libs/librevenge-0.0.0.dylib))
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
diff --git a/external/libwps/ExternalPackage_libwps.mk 
b/external/libwps/ExternalPackage_libwps.mk
index 0c12b02..da71b85 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,libwps,libwps))
 $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.3.dylib,src/lib/.libs/libwps-0.3.dylib))
+$(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.3.dylib,src/lib/.libs/libwps-0.3.3.dylib))
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.dll,src/lib/.libs/libwps-0.3.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-24 Thread Stephan Bergmann

 external/libmwaw/ExternalProject_libmwaw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f36769fd9288e97b7af666f4b83743a65df9f74a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 24 10:27:11 2014 +0200

libmwaw: --enable-debug when appropriate

Change-Id: Ic10971f077994a0015f6b66bd219a11612084409

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index c69f321..e8d837b 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--enable-static \
--disable-shared \
--without-docs \
-   --disable-debug \
+   $(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
CXXFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) 
-I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-24 Thread Stephan Bergmann

 external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch 
|   29 ++
 external/libmwaw/UnpackedTarball_libmwaw.mk   
|1 
 2 files changed, 30 insertions(+)

New commits:
commit 90055e3f22d737c31f65a5a84cdd9a31664ac382
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 24 10:54:30 2014 +0200

libmwaw: values4003 apparently contains 22 patterns, not 28

cf https://sourceforge.net/p/libmwaw/tickets/4/

Change-Id: Ib139992b90818838b12d51530c66498b2e2d1dc4

diff --git 
a/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch 
b/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch
new file mode 100644
index 000..c06de94
--- /dev/null
+++ 
b/external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch
@@ -0,0 +1,29 @@
+From 83188cec2826a2bffdb3daf27702510c3e02edea Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann sberg...@redhat.com
+Date: Thu, 24 Apr 2014 10:40:05 +0200
+Subject: [PATCH] values4003 apparently contains 22 patterns, not 28
+
+(cherry picked from commit c2ee6f30deb497dcf0ffa18a7ade603f398d889f)
+
+Conflicts:
+   src/lib/MSKGraph.cxx
+---
+ src/lib/MSKGraph.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/MSKGraph.cxx b/src/lib/MSKGraph.cxx
+index 7c1a9f6..f32d7c6 100644
+--- a/src/lib/MSKGraph.cxx
 b/src/lib/MSKGraph.cxx
+@@ -728,7 +728,7 @@ void State::initPatterns(int vers)
+ 0x55ff, 0x55ff, 0x55ff, 0x55ff,  0x55ff, 0xeeff, 0x55ff, 0xbbff,  0x77ff, 
0xddff, 0x77ff, 0xddff,  0x7fff, 0xf7ff, 0x7fff, 0xf7ff,
+ 0x7fff, 0x, 0xf7ff, 0x,  0x, 0x, 0x, 0x
+   };
+-  m_rsrcPatternsMap.insert(std::maplong, 
Patterns::value_type(4003,Patterns(28, values4003)));
++  m_rsrcPatternsMap.insert(std::maplong, 
Patterns::value_type(4003,Patterns(22, values4003)));
+   static uint16_t const (values4004[]) = {
+ 0xf0f0, 0xf0f0, 0x0f0f, 0x0f0f,  0x, 0x, 0x, 0x,  0x, 
0x, 0x, 0x
+   };
+-- 
+1.9.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index efd8797..44fa61f 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-std-isfinite-is-C-11.patch \
external/libmwaw/0001-use-correct-type.patch \
+   
external/libmwaw/0001-values4003-apparently-contains-22-patterns-not-28.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-03 Thread David Tardon

 external/libmwaw/0001-std-isfinite-is-C-11.patch |   64 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk  |6 ++
 2 files changed, 70 insertions(+)

New commits:
commit 3f5a48bf8aae758f5eb2cae5fafae68e2adaec6c
Author: David Tardon dtar...@redhat.com
Date:   Sun Nov 3 12:30:36 2013 +0100

fix windows build

Change-Id: I6ee6738fe869fbcd15ec045523c250fd1811e343

diff --git a/external/libmwaw/0001-std-isfinite-is-C-11.patch 
b/external/libmwaw/0001-std-isfinite-is-C-11.patch
new file mode 100644
index 000..3943879
--- /dev/null
+++ b/external/libmwaw/0001-std-isfinite-is-C-11.patch
@@ -0,0 +1,64 @@
+From 5da59d9aa9298136d447e4014aef207f00cdc82b Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Sun, 3 Nov 2013 12:26:26 +0100
+Subject: [PATCH] std::isfinite is C++11
+
+---
+ configure.ac   | 10 ++
+ src/lib/CWDbaseContent.cxx |  5 +++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b350b91..286939d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -357,6 +357,16 @@ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LIBS)
+ AM_CONDITIONAL([WITH_LIBMWAW_ZIP], [test x$with_zip != xno])
+ 
++# ==
++# Find boost headers
++# ==
++AC_CHECK_HEADERS(
++boost/math/special_functions/fpclassify.hpp,
++[],
++[AC_MSG_ERROR([Required boost headers not found.])],
++[]
++)
++
+ # =
+ # Documentation
+ # =
+diff --git a/src/lib/CWDbaseContent.cxx b/src/lib/CWDbaseContent.cxx
+index f27148d..7198103 100644
+--- a/src/lib/CWDbaseContent.cxx
 b/src/lib/CWDbaseContent.cxx
+@@ -33,7 +33,6 @@
+ 
+ #include time.h
+ 
+-#include cmath
+ #include cstring
+ #include ctime
+ #include iomanip
+@@ -41,6 +40,8 @@
+ #include set
+ #include sstream
+ 
++#include boost/math/special_functions/fpclassify.hpp
++
+ #include libwpd/libwpd.h
+ 
+ #include MWAWContentListener.hxx
+@@ -969,7 +970,7 @@ void CWDbaseContent::send(double val, 
CWStyleManager::CellFormat const format)
+ if (type=10type=11) type += 4;
+ else if (type=14) type=16;
+   }
+-  if (type = 0 || type =16 || type==10 || type==11 || !std::isfinite(val)) {
++  if (type = 0 || type =16 || type==10 || type==11 || 
!boost::math::isfinite(val)) {
+ s  val;
+ listener-insertUnicodeString(s.str().c_str());
+ return;
+-- 
+1.8.3.1
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 96fe9df..eea0a94 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
+   external/libmwaw/0001-std-isfinite-is-C-11.patch \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-03 Thread David Tardon

 external/libmwaw/0001-std-isfinite-is-C-11.patch |   21 -
 1 file changed, 21 deletions(-)

New commits:
commit 9b40f2c805b79500b352d3f9cda54ae11b3d6186
Author: David Tardon dtar...@redhat.com
Date:   Sun Nov 3 12:36:44 2013 +0100

discard the configure part

Change-Id: I8bca5acdee197016748ab1d9c55f3bd8238583f0

diff --git a/external/libmwaw/0001-std-isfinite-is-C-11.patch 
b/external/libmwaw/0001-std-isfinite-is-C-11.patch
index 3943879..73fde5a 100644
--- a/external/libmwaw/0001-std-isfinite-is-C-11.patch
+++ b/external/libmwaw/0001-std-isfinite-is-C-11.patch
@@ -8,27 +8,6 @@ Subject: [PATCH] std::isfinite is C++11
  src/lib/CWDbaseContent.cxx |  5 +++--
  2 files changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index b350b91..286939d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -357,6 +357,16 @@ AC_SUBST(ZLIB_CFLAGS)
- AC_SUBST(ZLIB_LIBS)
- AM_CONDITIONAL([WITH_LIBMWAW_ZIP], [test x$with_zip != xno])
- 
-+# ==
-+# Find boost headers
-+# ==
-+AC_CHECK_HEADERS(
-+boost/math/special_functions/fpclassify.hpp,
-+[],
-+[AC_MSG_ERROR([Required boost headers not found.])],
-+[]
-+)
-+
- # =
- # Documentation
- # =
 diff --git a/src/lib/CWDbaseContent.cxx b/src/lib/CWDbaseContent.cxx
 index f27148d..7198103 100644
 --- a/src/lib/CWDbaseContent.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-11-03 Thread David Tardon

 external/libmwaw/0001-use-correct-type.patch |   52 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk  |1 
 2 files changed, 53 insertions(+)

New commits:
commit 2cb29ab6a364716fb6f2811099178c10045302ab
Author: David Tardon dtar...@redhat.com
Date:   Sun Nov 3 13:00:46 2013 +0100

fix a bit more

Change-Id: I8961fa9279a955f5570e58f29e23d412e5fd049c

diff --git a/external/libmwaw/0001-use-correct-type.patch 
b/external/libmwaw/0001-use-correct-type.patch
new file mode 100644
index 000..7a6ef2d
--- /dev/null
+++ b/external/libmwaw/0001-use-correct-type.patch
@@ -0,0 +1,52 @@
+From cde8d7c47cdea327f8153ab72cde650f1b36f7f8 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Sun, 3 Nov 2013 12:59:29 +0100
+Subject: [PATCH] use correct type
+
+---
+ src/lib/HMWJGraph.cxx | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/HMWJGraph.cxx b/src/lib/HMWJGraph.cxx
+index fca366c..dd83ace 100644
+--- a/src/lib/HMWJGraph.cxx
 b/src/lib/HMWJGraph.cxx
+@@ -2668,7 +2668,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const 
group, MWAWPosition po
+ return true;
+   }
+ 
+-  std::multimaplong, int::const_iterator fIt;
++  std::maplong, int::const_iterator fIt;
+   int numFrames = int(m_state-m_framesList.size());
+   for (size_t c=0; cgroup.m_childsList.size(); ++c) {
+ long fId=group.m_childsList[c];
+@@ -2690,7 +2690,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const 
group, MWAWPosition po
+ 
+ bool HMWJGraph::canCreateGraphic(HMWJGraphInternal::Group const group)
+ {
+-  std::multimaplong, int::const_iterator fIt;
++  std::maplong, int::const_iterator fIt;
+   int page = group.m_page;
+   int numFrames = int(m_state-m_framesList.size());
+   for (size_t c=0; cgroup.m_childsList.size(); ++c) {
+@@ -2726,7 +2726,7 @@ void HMWJGraph::sendGroup(HMWJGraphInternal::Group const 
group, MWAWGraphicList
+   if (!listener) return;
+   group.m_parsed=true;
+   MWAWInputStreamPtr input= m_parserState-m_input;
+-  std::multimaplong, int::const_iterator fIt;
++  std::maplong, int::const_iterator fIt;
+   int numFrames = int(m_state-m_framesList.size());
+   for (size_t c=0; cgroup.m_childsList.size(); ++c) {
+ long fId=group.m_childsList[c];
+@@ -2784,7 +2784,7 @@ void HMWJGraph::sendGroupChild(HMWJGraphInternal::Group 
const group, MWAWPositi
+   Box2f partialBdBox;
+   MWAWPosition partialPos(pos);
+   MWAWInputStreamPtr input= m_parserState-m_input;
+-  std::multimaplong, int::const_iterator fIt;
++  std::maplong, int::const_iterator fIt;
+   int numFrames = int(m_state-m_framesList.size());
+   for (size_t c=0; cnumChilds; ++c) {
+ long fId=group.m_childsList[c];
+-- 
+1.8.3.1
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index eea0a94..efd8797 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0001-std-isfinite-is-C-11.patch \
+   external/libmwaw/0001-use-correct-type.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

24 matches

Site Navigation

Mail list logo

Footer information