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

2021-05-28 Thread Caolán McNamara (via logerrit) 
 external/libetonyek/0001-allow-0-size-message.patch.1 |   30 ++
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 2 files changed, 31 insertions(+)

New commits:
commit 7f60fafe3b54e2cc86d996b3211be7e82fb478a2
Author: Caolán McNamara 
AuthorDate: Fri May 28 08:49:48 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri May 28 11:28:30 2021 +0200

crashtesting: backport assert downgrade

Change-Id: I6d813cd9996633b207e30c2f1fff707810396153
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116315
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/libetonyek/0001-allow-0-size-message.patch.1 
b/external/libetonyek/0001-allow-0-size-message.patch.1
new file mode 100644
index ..62e584b815a0
--- /dev/null
+++ b/external/libetonyek/0001-allow-0-size-message.patch.1
@@ -0,0 +1,30 @@
+From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 26 May 2021 20:39:41 +0200
+Subject: [PATCH] allow 0-size message
+
+It likely means the input is broken, but there is no need to reject it.
+Let's just produce a dummy, empty message.
+
+Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f
+---
+ src/lib/IWAMessage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp
+index c01b1b6..9456444 100644
+--- a/src/lib/IWAMessage.cpp
 b/src/lib/IWAMessage.cpp
+@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t , 
unsigned long length)
+   : m_input(input)
+   , m_fields()
+ {
+-  assert(length > 0);
++  if (length == 0)
++return;
+ 
+   parse(length);
+ }
+-- 
+2.31.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index de8c0dcd1cc5..81a3fa5b870a 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/warnings.patch \
external/libetonyek/0001-fix-build-with-MSVC.patch.1 \
external/libetonyek/0002-fix-build-with-MSVC.patch.1 \
+   external/libetonyek/0001-allow-0-size-message.patch.1 \
 ))
 
 ifneq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-01-07 Thread Mike Kaganski (via logerrit) 
 external/libetonyek/0001-add-missing-include-for-std-for_each.patch |   33 
++
 external/libetonyek/UnpackedTarball_libetonyek.mk   |1 
 2 files changed, 34 insertions(+)

New commits:
commit aa1ce583f0ad64b4ea5096c3ce9c6bd0a84794fe
Author: Mike Kaganski 
AuthorDate: Thu Jan 7 14:15:47 2021 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jan 7 15:27:07 2021 +0100

Add missing include for std::for_each

It is reported now by Windows build after
e0f1b5bd94550835c639efda4e4c9a801c78dbe9 "Upgrade external/boost to
latest Boost 1.75.0".

Change-Id: Ia69c74cd72c7e8ce56c56ffbfb1c1e467ce2bdc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108932
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git 
a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch 
b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
new file mode 100644
index ..09aaba58b7e3
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
@@ -0,0 +1,33 @@
+From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
+From: Roland Illig 
+Date: Tue, 19 May 2020 08:43:39 +0200
+Subject: [PATCH] add missing include for std::for_each
+
+On NetBSD 8.0 x86_64, gcc complains:
+ NUM3Parser.cpp: In member function 'virtual bool 
libetonyek::NUM3Parser::parseDocument()':
+ NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
+   std::for_each(sheetListRefs.begin(), sheetListRefs.end(), 
std::bind(::parseSheet, this, std::placeholders::_1));
+
+Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
+Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
+Tested-by: Thorsten Behrens 
+Reviewed-by: Thorsten Behrens 
+---
+ src/lib/NUM3Parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp
+index 66fb195..c19b611 100644
+--- src/lib/NUM3Parser.cpp
 src/lib/NUM3Parser.cpp
+@@ -7,6 +7,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include 
+ #include 
+ 
+ #include "NUM3Parser.h"
+-- 
+2.28.0
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 5e7780deb7ea..d1550f47e02a 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
external/libetonyek/warnings.patch \
+   external/libetonyek/0001-add-missing-include-for-std-for_each.patch \
 ))
 
 ifneq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-23 Thread Tor Lillqvist (via logerrit) 
 external/libetonyek/libetonyek-bundled-soname.patch.0 |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3cbcaa8d36ef889a28d790e18d68b838cfc46bb2
Author: Tor Lillqvist 
AuthorDate: Thu Apr 23 16:42:03 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 23 19:09:24 2020 +0200

Use equal number of leading and trailing context lines in patch

Change-Id: I67763a5d612b66f61ed8a60c6331c85cc88f2b85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92789
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 5aaf61464edd..15a58fa83635 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,6 +1,7 @@
 --- src/lib/Makefile.in.orig   2016-01-12 19:21:24.0 +0100
 +++ src/lib/Makefile.in2016-03-02 18:19:52.214551270 +0100
-@@ -538,6 +538,6 @@
+@@ -538,7 +538,7 @@
+   $(XML_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) $(am__append_1)
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
 -libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-06 Thread Caolán McNamara (via logerrit) 
 external/libetonyek/UnpackedTarball_libetonyek.mk  
 |1 
 
external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 
|   62 ++
 2 files changed, 63 insertions(+)

New commits:
commit f842037f72d0b29411aa1e10bec89c297e887fcf
Author: Caolán McNamara 
AuthorDate: Thu Feb 6 11:04:21 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 6 16:53:23 2020 +0100

backport glm v0.9.9.0 fix for libetonyek

Change-Id: Id21bd6f5c80e79cad653093090a96d066c56c7e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88092
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index cd7a30e8adea..5e7780deb7ea 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+   
external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 
\
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
diff --git 
a/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1
 
b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1
new file mode 100644
index ..1add51828ce2
--- /dev/null
+++ 
b/external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1
@@ -0,0 +1,62 @@
+From 548c2735c09570726f08d5ae9fee8efefb54d529 Mon Sep 17 00:00:00 2001
+From: osnola 
+Date: Sun, 31 Mar 2019 09:34:11 +0200
+Subject: [PATCH] glm: force dmat3 initialization (needed from v0.9.9.0)
+
+Change-Id: I2cb285f2d9bc1e9818ed946b38caaf8a5de9e61a
+Reviewed-on: https://gerrit.libreoffice.org/69993
+Reviewed-by: Laurent Alonso(fr) 
+Tested-by: Laurent Alonso(fr) 
+---
+ src/lib/IWORKCollector.cpp | 6 +++---
+ src/lib/KEYCollector.cpp   | 3 +--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
+index 41a9c79..794b462 100644
+--- a/src/lib/IWORKCollector.cpp
 b/src/lib/IWORKCollector.cpp
+@@ -183,8 +183,8 @@ private:
+ IWORKCollector::Level::Level()
+   : m_geometry()
+   , m_graphicStyle()
+-  , m_trafo()
+-  , m_previousTrafo()
++  , m_trafo(1)
++  , m_previousTrafo(1)
+ {
+ }
+ 
+@@ -601,7 +601,7 @@ void IWORKCollector::startLevel()
+ return;
+   }
+ 
+-  glm::dmat3 currentTrafo, prevTrafo;
++  glm::dmat3 currentTrafo(1), prevTrafo(1);
+   if (!m_levelStack.empty())
+   {
+ currentTrafo = m_levelStack.top().m_trafo;
+diff --git a/src/lib/KEYCollector.cpp b/src/lib/KEYCollector.cpp
+index a9d8cc3..08e7e69 100644
+--- a/src/lib/KEYCollector.cpp
 b/src/lib/KEYCollector.cpp
+@@ -167,7 +167,7 @@ void KEYCollector::insertTextPlaceholder(const 
KEYPlaceholderPtr_t )
+ {
+   if (bool(placeholder))
+   {
+-glm::dmat3 trafo;
++glm::dmat3 trafo(1);
+ if (bool(placeholder->m_geometry))
+   trafo = makeTransformation(*placeholder->m_geometry);
+ trafo *= m_levelStack.top().m_trafo;
+@@ -417,7 +417,6 @@ void KEYCollector::drawTextBox(const IWORKTextPtr_t , 
const glm::dmat3 
+ double w = boundingBox->m_naturalSize.m_width;
+ double h = boundingBox->m_naturalSize.m_height;
+ vec = trafo * glm::dvec3(w, h, 0);
+-
+ if (vec[0]>0)
+   props.insert("svg:width", pt2in(vec[0]));
+ if (vec[1]>0)
+-- 
+2.24.1
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libetonyek external/libwpd external/libwpg

2019-01-07 Thread Libreoffice Gerrit user 
 external/libetonyek/UnpackedTarball_libetonyek.mk |2 ++
 external/libwpd/UnpackedTarball_libwpd.mk |2 ++
 external/libwpg/UnpackedTarball_libwpg.mk |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 7fc28192864c30ae95b24aceb9cdf7e869dc9dcf
Author: Tor Lillqvist 
AuthorDate: Mon Jan 7 12:36:19 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Jan 7 13:06:31 2019 +0200

Skip these patches for iOS, too

Change-Id: I2b99cd30b151eaa0302abaa9fdfa92fe8300a4d5

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d64d7e45212b..81685831fb60 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -24,11 +24,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
+ifneq ($(OS),iOS)
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/libetonyek-bundled-soname.patch.0 \
 ))
 endif
 endif
+endif
 
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/libwpd/UnpackedTarball_libwpd.mk 
b/external/libwpd/UnpackedTarball_libwpd.mk
index 9baf6d9fce0d..8d0227b9379d 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -22,10 +22,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
+ifneq ($(OS),iOS)
 $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
external/libwpd/libwpd-bundled-soname.patch.0 \
 ))
 endif
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk 
b/external/libwpg/UnpackedTarball_libwpg.mk
index f9aa0f6b0996..9ca55c669d72 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -21,10 +21,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
+ifneq ($(OS),iOS)
 $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
 external/libwpg/libwpg-bundled-soname.patch.0 \
 ))
 endif
 endif
+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/libetonyek

2018-12-19 Thread Libreoffice Gerrit user 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 external/libetonyek/forcepoint.parsepath.null.deref.patch |   44 ++
 2 files changed, 45 insertions(+)

New commits:
commit e8cee7877823003e05e29f76187ea574610ef979
Author: Caolán McNamara 
AuthorDate: Tue Dec 18 21:11:13 2018 +
Commit: Caolán McNamara 
CommitDate: Wed Dec 19 09:54:19 2018 +0100

forcepoint#77 null-deref

Change-Id: Ib4d546f1e44eb6a682ec7cbbaab7a0a2050ffa1c
Reviewed-on: https://gerrit.libreoffice.org/65377
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d90e44955687..eb38615ffe31 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/rpath.patch \
external/libetonyek/warnings.patch \
external/libetonyek/initial-creator.patch.1 \
+   external/libetonyek/forcepoint.parsepath.null.deref.patch \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/forcepoint.parsepath.null.deref.patch 
b/external/libetonyek/forcepoint.parsepath.null.deref.patch
new file mode 100644
index ..2cdf6a5a34c2
--- /dev/null
+++ b/external/libetonyek/forcepoint.parsepath.null.deref.patch
@@ -0,0 +1,44 @@
+diff -ru src/lib/IWAParser.cpp libetonyek/src/lib/IWAParser.cpp
+--- src/lib/IWAParser.cpp  2018-12-18 21:02:45.772942197 +
 src/lib/IWAParser.cpp  2018-12-18 21:05:04.758548097 +
+@@ -998,7 +998,14 @@
+   if (get(type) == 1)
+ path->appendMoveTo(get(coords).m_x, get(coords).m_y);
+   else
++  {
++if (path->empty())
++{
++  ETONYEK_DEBUG_MSG(("IWAParser::parsePath: missing prior MoveTo 
subsequent LineTo\n", get(type) == 1 ? 'M' : 'L'));
++  return false;
++}
+ path->appendLineTo(get(coords).m_x, get(coords).m_y);
++  }
+   break;
+ }
+ case 4 :
+diff -ru src/lib/IWORKPath.cpp libetonyek/src/lib/IWORKPath.cpp
+--- src/lib/IWORKPath.cpp  2018-12-18 21:02:45.775942059 +
 src/lib/IWORKPath.cpp  2018-12-18 21:03:39.289480143 +
+@@ -594,6 +594,11 @@
+   m_impl->m_closed = false;
+ }
+ 
++bool IWORKPath::empty() const
++{
++  return m_impl->m_path.empty();
++}
++
+ void IWORKPath::appendMoveTo(const double x, const double y)
+ {
+   if (!m_impl->m_path.empty() && m_impl->m_path.back().size()<=1)
+diff -ru src/lib/IWORKPath.h libetonyek/src/lib/IWORKPath.h
+--- src/lib/IWORKPath.h2018-12-18 21:02:45.772942197 +
 src/lib/IWORKPath.h2018-12-18 21:05:48.323543888 +
+@@ -42,6 +42,7 @@
+   void swap(IWORKPath );
+ 
+   void clear();
++  bool empty() const;
+ 
+   void appendMoveTo(double x, double y);
+   void appendLineTo(double x, double y);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-28 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41b0659eb80cc84490965690f0ec0b434dcc75f
Author: David Tardon 
Date:   Sat Oct 28 11:04:15 2017 +0200

libetonyek: pass optimization flags to configure

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

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 41b793f16904..4eaa90bd99c3 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
-   CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))" \
+   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \
LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-12 Thread jan Iversen 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 +
 external/libetonyek/iOS.patch.0   |   20 
 2 files changed, 21 insertions(+)

New commits:
commit e7e02af3f98696d1bd11e8ec22b2454cae7d0f3f
Author: jan Iversen 
Date:   Mon Jun 12 17:58:27 2017 +0200

iOS patch libetonyek

support for arm64

Change-Id: Ic8e78aaf6a72fa8bfc6971544414c84c29b0ec53

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 82c1709a69b5..a836f9c4ae63 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/rpath.patch \
external/libetonyek/silence-libxml.patch \
external/libetonyek/0001-fix-brain-fart.patch.1 \
+   external/libetonyek/iOS.patch.0 \
 ))
 
 ifneq ($(OS),MACOSX)
diff --git a/external/libetonyek/iOS.patch.0 b/external/libetonyek/iOS.patch.0
new file mode 100644
index ..a7b127399480
--- /dev/null
+++ b/external/libetonyek/iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub 2014-03-29 11:29:01.0 +0100
 config.sub 2017-06-12 17:56:15.0 +0200
+@@ -257,7 +257,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -370,7 +370,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-05-30 Thread Caolán McNamara 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 external/libetonyek/silence-libxml.patch  |   24 ++
 2 files changed, 25 insertions(+)

New commits:
commit a9e3dc3c2acf95248cb0f64634ca5b203802d46e
Author: Caolán McNamara 
Date:   Tue May 30 13:21:45 2017 +0100

stop spewing libxml2 warnings during filter detection

Change-Id: Ifef3e75065e55aefba0f9498cf517efaf78ba6c1

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index eba2f6a8b574..82c1709a69b5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
+   external/libetonyek/silence-libxml.patch \
external/libetonyek/0001-fix-brain-fart.patch.1 \
 ))
 
diff --git a/external/libetonyek/silence-libxml.patch 
b/external/libetonyek/silence-libxml.patch
new file mode 100644
index ..f8730bf332b2
--- /dev/null
+++ b/external/libetonyek/silence-libxml.patch
@@ -0,0 +1,24 @@
+--- src/lib/EtonyekDocument.cpp
 src/lib/EtonyekDocument.cpp
+@@ -103,12 +103,21 @@
+   return false;
+ }
+ 
++namespace
++{
++  void handleError(void * /*arg*/, const char * /*msg*/, xmlParserSeverities 
/*severity*/, xmlTextReaderLocatorPtr /*locator*/)
++  {
++  }
++}
++
+ bool probeXML(DetectionInfo )
+ {
+   const shared_ptr reader(xmlReaderForIO(readFromStream, 
closeStream, info.m_input.get(), "", 0, 0), xmlFreeTextReader);
+   if (!reader)
+ return false;
+ 
++  xmlTextReaderSetErrorHandler(reader.get(), handleError, NULL);
++
+   int ret = 0;
+   do
+   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-03 Thread Tomáš Chvátal 
 external/libetonyek/libetonyek-bundled-soname.patch.0 |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1f182f130edeb8282f0e7e325fb823200f2db34a
Author: Tomáš Chvátal 
Date:   Wed Mar 2 18:21:04 2016 +0100

Update etonyek patch to apply with sle11 patch

Change-Id: I86b43ba29a6b7d0d4c36491234c3354c3d6edf0c
Reviewed-on: https://gerrit.libreoffice.org/22838
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
index 753e384..122763d 100644
--- a/external/libetonyek/libetonyek-bundled-soname.patch.0
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -1,9 +1,11 @@
 src/lib/Makefile.in.orig   2015-08-07 10:51:32.494810336 +0200
-+++ src/lib/Makefile.in2015-08-07 10:51:55.493809942 +0200
-@@ -463,5 +463,5 @@
+--- src/lib/Makefile.in.orig   2016-01-12 19:21:24.0 +0100
 src/lib/Makefile.in2016-03-02 18:19:52.214551270 +0100
+@@ -538,7 +538,7 @@
+ 
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
 -libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
 +libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
  libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
EtonyekDocument.cpp
-
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-19 Thread Stephan Bergmann 
 external/libetonyek/ExternalProject_libetonyek.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b03879a9396c740bca248d9fcc7d8420a414e946
Author: Stephan Bergmann 
Date:   Tue Jan 19 11:48:21 2016 +0100

Pass --enable-symbols into external/libetonyek

Change-Id: I60f7817b1d5e32ad642076ea2a9f7b7522ebb1de

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index dda5a8b..963f48e 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\ORIGIN') \
CPPFLAGS="$(CPPFLAGS) $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
-   CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11)" \
+   CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))" \
LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \
LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-07 Thread Andras Timar 
 external/libetonyek/ExternalPackage_libetonyek.mk |2 +-
 external/libetonyek/UnpackedTarball_libetonyek.mk |8 
 external/libetonyek/libetonyek-bundled-soname.patch.0 |   11 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 824e663cfbba436db32e4f2a20e3acbe275252e7
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Aug 7 10:57:36 2015 +0200

libetonyek bundled soname patch

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

diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk 
b/external/libetonyek/ExternalPackage_libetonyek.mk
index 80b0a54..98d4763 100644
--- a/external/libetonyek/ExternalPackage_libetonyek.mk
+++ b/external/libetonyek/ExternalPackage_libetonyek.mk
@@ -16,7 +16,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetony
 else ifeq ($(OS),WNT)
 $(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.so.1,src/lib/.libs/libetonyek-0.1.so.1.0.$(ETONYEK_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1-lo.so.1,src/lib/.libs/libetonyek-0.1-lo.so.1.0.$(ETONYEK_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index dd536f8..7f0d653 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -22,6 +22,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+   external/libetonyek/libetonyek-bundled-soname.patch.0 \
+))
+endif
+endif
+
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 
b/external/libetonyek/libetonyek-bundled-soname.patch.0
new file mode 100644
index 000..301aa38
--- /dev/null
+++ b/external/libetonyek/libetonyek-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig   2015-08-07 10:51:32.494810336 +0200
 src/lib/Makefile.in2015-08-07 10:51:55.493809942 +0200
+@@ -463,7 +463,7 @@
+
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = 
libetonyek_internal.la $(REVENGE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) 
@LIBETONYEK_WIN32_RESOURCE@
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = 
libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
+-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined
++libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = 
$(version_info) -export-dynamic -no-undefined -release lo
+ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
+   EtonyekDocument.cpp
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-28 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit a94acabae7defe562e3702f605c63afbd86f9696
Author: David Tardon dtar...@redhat.com
Date:   Sun Jun 28 12:33:46 2015 +0200

tdf#92376 fix build of libetonyek on OS X

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 119fe95..19be033 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -50,6 +50,10 @@ $(call gb_ExternalProject_get_state_target,libetonyek,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/libetonyek-0.1.1.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/libetonyek

2015-05-26 Thread David Tardon 
 external/libetonyek/0001-add-missing-breaks.patch.1|   36 
 external/libetonyek/0002-remove-surplus-breaks.patch.1 |   38 +
 external/libetonyek/UnpackedTarball_libetonyek.mk  |2 
 3 files changed, 76 insertions(+)

New commits:
commit 06095843f3fbfabff7752f87042fb291185fc501
Author: David Tardon dtar...@redhat.com
Date:   Tue May 26 17:17:03 2015 +0200

fix some problems found by coverity

Change-Id: Icaf543858298da4e6c8bb01c8820fa9755c3b7ae

diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1 
b/external/libetonyek/0001-add-missing-breaks.patch.1
new file mode 100644
index 000..7e11682
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-breaks.patch.1
@@ -0,0 +1,36 @@
+From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Tue, 26 May 2015 16:56:56 +0200
+Subject: [PATCH 1/2] add missing breaks
+
+Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
+---
+ src/lib/KEY2Parser.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index bb58efd..4ba70d2 100644
+--- a/src/lib/KEY2Parser.cpp
 b/src/lib/KEY2Parser.cpp
+@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char 
*const value)
+   {
+   case IWORKToken::NS_URI_SFA | IWORKToken::x :
+ m_point.first = lexical_castdouble(value);
++break;
+   case IWORKToken::NS_URI_SFA | IWORKToken::y :
+ m_point.second = lexical_castdouble(value);
++break;
+   }
+ }
+ 
+@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const 
char *const value)
+   ETONYEK_DEBUG_MSG((unknown point path type: %s\n, value));
+   break;
+ }
++break;
+   }
+   default :
+ KEY2XMLElementContextBase::attribute(name, value);
+-- 
+2.4.1
+
diff --git a/external/libetonyek/0002-remove-surplus-breaks.patch.1 
b/external/libetonyek/0002-remove-surplus-breaks.patch.1
new file mode 100644
index 000..be6b94a
--- /dev/null
+++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1
@@ -0,0 +1,38 @@
+From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Tue, 26 May 2015 17:01:22 +0200
+Subject: [PATCH 2/2] remove surplus breaks
+
+Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d
+---
+ src/lib/KEY2Parser.cpp  | 1 -
+ src/lib/contexts/IWORKStylesContext.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
+index 4ba70d2..9a37dcd 100644
+--- a/src/lib/KEY2Parser.cpp
 b/src/lib/KEY2Parser.cpp
+@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name)
+ return makeContextKEY2StyleContext(getState(), name);
+ 
+   case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref :
+-break;
+ return makeContextKEY2StyleRefContext(getState(), name, false, 
m_anonymous);
+   }
+ 
+diff --git a/src/lib/contexts/IWORKStylesContext.cpp 
b/src/lib/contexts/IWORKStylesContext.cpp
+index ef3041b..24efa1d 100644
+--- a/src/lib/contexts/IWORKStylesContext.cpp
 b/src/lib/contexts/IWORKStylesContext.cpp
+@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int 
name)
+   case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref :
+   case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref :
+   case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref :
+-break;
+ return makeContextIWORKStyleRefContext(getState(), name, false, 
m_anonymous);
+   }
+ 
+-- 
+2.4.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 834bef2b..24167e5 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
external/libetonyek/ubsan.patch \
+   external/libetonyek/0001-add-missing-breaks.patch.1 \
+   external/libetonyek/0002-remove-surplus-breaks.patch.1 \
 ))
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-21 Thread Stephan Bergmann 
 external/libetonyek/UnpackedTarball_libetonyek.mk |8 
 external/libetonyek/ubsan-visibility.patch|   11 +++
 2 files changed, 19 insertions(+)

New commits:
commit 1dbc9e022e750a16dbf5b530783c4adaafd609f5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 21 15:29:59 2015 +0100

For Clang -fsanitize=vptr use -fvisibility-ms-compat, not 
-fvisibility=hidden

...same as f0aa1a78fb209310e8baef53c02f365fca518d11

Change-Id: Ib02a20677eaaf2930bf3620c4ed2b1c3c098ce00

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4706d02..c531894 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,4 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
 ))
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
+external/libetonyek/ubsan-visibility.patch \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ubsan-visibility.patch 
b/external/libetonyek/ubsan-visibility.patch
new file mode 100644
index 000..925f4a8
--- /dev/null
+++ b/external/libetonyek/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -17443,7 +17443,7 @@
+ { $as_echo $as_me:${as_lineno-$LINENO}: checking for 
-fvisibility=hidden compiler flag 5
+ $as_echo_n checking for -fvisibility=hidden compiler flag...  6; }
+ saved_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS=$CXXFLAGS -fvisibility=hidden
++CXXFLAGS=$CXXFLAGS -fvisibility-ms-compat
+ cat confdefs.h - _ACEOF conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-21 Thread Stephan Bergmann 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 +
 external/libetonyek/ubsan.patch   |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 15cc77f8d3d1edfd0e8114829bc4b340c3d73b4d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 21 16:25:54 2015 +0100

external/libetonyek: -fsanitize=enum

e.g., during CppunitTest_writerperfect_impress

Change-Id: Ib9eb7a9ba7c9bad9cc43fbe2132ca315e2f28c0a

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index c531894..834bef2b 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
external/libetonyek/0001-missing-include.patch.1 \
external/libetonyek/win_build.patch.1 \
+   external/libetonyek/ubsan.patch \
 ))
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
diff --git a/external/libetonyek/ubsan.patch b/external/libetonyek/ubsan.patch
new file mode 100644
index 000..f0ab147
--- /dev/null
+++ b/external/libetonyek/ubsan.patch
@@ -0,0 +1,11 @@
+--- src/lib/contexts/IWORKPropertyMapElement.cpp
 src/lib/contexts/IWORKPropertyMapElement.cpp
+@@ -264,7 +264,7 @@
+ 
+ void AlignmentElement::endOfElement()
+ {
+-  IWORKAlignment prop;
++  IWORKAlignment prop = IWORK_ALIGNMENT_LEFT;
+ 
+   if (m_value)
+   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libetonyek RepositoryExternal.mk

2015-05-20 Thread David Tardon 
 RepositoryExternal.mk |   30 
 external/libetonyek/ExternalPackage_libetonyek.mk |   22 
 external/libetonyek/ExternalProject_libetonyek.mk |5 
 external/libetonyek/Library_etonyek.mk|  111 +++
 external/libetonyek/Module_libetonyek.mk  |   16 
 external/libetonyek/generated/IWORKToken.inc  |  721 ++
 external/libetonyek/generated/KEY1Token.inc   |  540 
 external/libetonyek/generated/KEY2Token.inc   |  216 ++
 external/libetonyek/generated/NUM1Token.inc   |  147 
 external/libetonyek/generated/NUMToken.inc|  146 
 external/libetonyek/generated/PAG1Token.inc   |  158 
 external/libetonyek/generated/PAGToken.inc|  158 
 12 files changed, 2266 insertions(+), 4 deletions(-)

New commits:
commit 78deb81c55266d37e35ff97fbb5b4086245d8ff2
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 16:12:08 2015 +0200

build libetonyek as shared lib

Change-Id: Id98bc62bd41846550dc9149d462a3b85bb2538c5

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a114e13..47e4d17 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1700,13 +1700,39 @@ gb_ExternalProject__use_etonyek :=
 
 else # !SYSTEM_ETONYEK
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   etonyek \
+))
+
+define gb_LinkTarget__use_etonyek
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+   etonyek \
+)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+   libetonyek \
+))
+
 define gb_LinkTarget__use_etonyek
+$(call gb_LinkTarget_use_package,$(1),libetonyek)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I${WORKDIR}/UnpackedTarball/libetonyek/inc \
+   -DLIBETONYEK_VISIBILITY \
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs/libetonyek-0.1$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/.libs 
-letonyek-0.1 \
 )
 $(call gb_LinkTarget_use_external_project,$(1),libetonyek)
 
@@ -1717,6 +1743,8 @@ $(call 
gb_ExternalProject_use_external_project,$(1),libetonyek)
 
 endef
 
+endif
+
 endif # SYSTEM_ETONYEK
 
 
diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk 
b/external/libetonyek/ExternalPackage_libetonyek.mk
new file mode 100644
index 000..08f0a63b
--- /dev/null
+++ b/external/libetonyek/ExternalPackage_libetonyek.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_ExternalPackage_ExternalPackage,libetonyek,libetonyek))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libetonyek,libetonyek))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.1.dylib,src/lib/.libs/libetonyek-0.1.1.dylib))
+else ifeq ($(OS),WNT)
+$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.dll,src/lib/.libs/libetonyek-0.1.dll))
+else ifeq ($(filter IOS ANDROID,$(OS)),)
+$(eval $(call 
gb_ExternalPackage_add_file,libetonyek,$(LIBO_LIB_FOLDER)/libetonyek-0.1.so.1,src/lib/.libs/libetonyek-0.1.so.1.0.$(ETONYEK_VERSION_MICRO)))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 4fd48b1..acfc76d 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -28,8 +28,8 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
export PKG_CONFIG= \
 MAKE=$(MAKE) ./configure \
--with-pic \
-   --enable-static \
-   --disable-shared \
+   --enable-shared \
+   --disable-static \
--without-docs \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
@@ -41,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
XML_CFLAGS=$(LIBXML_CFLAGS) \
XML_LIBS=$(LIBXML_LIBS) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
+   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 $(MAKE) \
)
 
diff --git

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

2015-05-20 Thread Tor Lillqvist 
 external/libetonyek/ExternalProject_libetonyek.mk |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 33cf177f6b26a117dac0da4940afd0b2eb03153c
Author: Tor Lillqvist t...@collabora.com
Date:   Thu May 21 01:18:11 2015 +0300

Use --disable-shared if DISABLE_DYNLOADING

Change-Id: I77f8890ed6d03f02eb8c12c5e034d119bc85addc

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index acfc76d..23cc2f1 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -28,8 +28,11 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) 
:
export PKG_CONFIG= \
 MAKE=$(MAKE) ./configure \
--with-pic \
-   --enable-shared \
-   --disable-static \
+   $(if $(DISABLE_DYNLOADING), \
+   --enable-static --disable-shared \
+   , \
+   --enable-shared --disable-static \
+   ) \
--without-docs \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libetonyek writerperfect/Library_wpftimpress.mk

2015-05-19 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |1 +
 writerperfect/Library_wpftimpress.mk  |1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b46e0d5dcef20118028a0b4bbd3afb75492d9ec0
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 16:07:12 2015 +0200

glm is only needed for libetonyek build

Change-Id: I398ae27e49ca684b7d1b8d328be90bffee825797

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index f5ea457..bbc4c02 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libetonyek,\
 
 $(eval $(call gb_ExternalProject_use_externals,libetonyek,\
boost_headers \
+   glm \
libxml2 \
revenge \
zlib \
diff --git a/writerperfect/Library_wpftimpress.mk 
b/writerperfect/Library_wpftimpress.mk
index d256c3d..3d35aa7 100644
--- a/writerperfect/Library_wpftimpress.mk
+++ b/writerperfect/Library_wpftimpress.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\
 $(eval $(call gb_Library_use_externals,wpftimpress,\
boost_headers \
etonyek \
-   glm \
mwaw \
odfgen \
revenge \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-19 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbefb58c13f470cdf4e5d0d7d81c7ce95536a6a0
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 16:13:30 2015 +0200

fix external project name

Change-Id: I8c2277384537b78255bb2115126d5b2f2812f7df

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index bbc4c02..3de8605 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libetonyek,\
 
 $(eval $(call gb_ExternalProject_use_externals,libetonyek,\
boost_headers \
-   glm \
+   glm_headers \
libxml2 \
revenge \
zlib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-19 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f0ee1e0514c29a11eb74fd8fa29f594032d1660
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 16:56:07 2015 +0200

quick  dirty fix for build with bundled glm

Change-Id: I4140f24f4b96c930c3f651cf592966534ef7

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 3de8605..31ec898 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
XML_CFLAGS=$(LIBXML_CFLAGS) \
XML_LIBS=$(LIBXML_LIBS) \
+   $(call gb_Helper_optional,GLM,GLM_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,glm)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
 $(MAKE) \
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-19 Thread David Tardon 
 external/libetonyek/0001-missing-include.patch.1  |   25 ++
 external/libetonyek/ExternalProject_libetonyek.mk |2 -
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit eb5850d63acfd3077a4c5c62d45dff48bc6a6137
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 18:46:34 2015 +0200

hopefully better fix for windows

Change-Id: I196853f0efbaab48e5e09b2728df0a8e5152dc9e

diff --git a/external/libetonyek/0001-missing-include.patch.1 
b/external/libetonyek/0001-missing-include.patch.1
new file mode 100644
index 000..f3e4e24
--- /dev/null
+++ b/external/libetonyek/0001-missing-include.patch.1
@@ -0,0 +1,25 @@
+From 3663b7b44646e1ed1218598aeb0bdf7326934029 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Tue, 19 May 2015 18:44:53 +0200
+Subject: [PATCH] missing include
+
+Change-Id: Ie7a733b49a5b9a056671f4274b5194c3891569ae
+---
+ src/lib/IWORKText.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp
+index 3413ef3..c37b1bc 100644
+--- a/src/lib/IWORKText.cpp
 b/src/lib/IWORKText.cpp
+@@ -11,6 +11,7 @@
+ 
+ #include cassert
+ #include string
++#include vector
+ 
+ #include boost/algorithm/string/classification.hpp
+ #include boost/algorithm/string/predicate.hpp
+-- 
+2.4.0
+
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index a83c654..3de8605 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-weffc \
--without-tools \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   BOOST_CFLAGS=-DBOOST_DETAIL_NO_CONTAINER_FWD $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
XML_CFLAGS=$(LIBXML_CFLAGS) \
XML_LIBS=$(LIBXML_LIBS) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4853907..01f35c3 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
+   external/libetonyek/0001-missing-include.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/libetonyek

2015-05-19 Thread Michael Stahl 
 external/libetonyek/ExternalProject_libetonyek.mk |1 +
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 +
 external/libetonyek/win_build.patch.1 |   13 +
 3 files changed, 15 insertions(+)

New commits:
commit 97b643ac862d0d6d0a305a7fd82fd20dfb3dbf72
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 20 00:52:44 2015 +0200

libetonyek: fix windows build

Putting source files into sub-directories is not really supported by
autotools apparently.

Change-Id: I6f0ff7e0ee0c2c4b59fb670a3cbaa9723b655d1f

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 3de8605..4fd48b1 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
+   $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P=$(shell 
cygpath -m /usr/bin/mkdir) -p) \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
XML_CFLAGS=$(LIBXML_CFLAGS) \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 01f35c3..4706d02 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/assert.patch \
external/libetonyek/0001-missing-include.patch.1 \
+   external/libetonyek/win_build.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/win_build.patch.1 
b/external/libetonyek/win_build.patch.1
new file mode 100644
index 000..261167b
--- /dev/null
+++ b/external/libetonyek/win_build.patch.1
@@ -0,0 +1,13 @@
+Fix the windows build - fix libtool
+
+--- libetonyek/ltmain.sh.orig  2015-05-20 00:47:55.37880 +0200
 libetonyek/ltmain.sh   2015-05-20 00:47:33.64800 +0200
+@@ -3722,6 +3722,8 @@
+   sleep 2
+   done
+ fi
++# Cygwin ar.exe does not create directories for the objects!
++mkdir -p $f_ex_an_ar_dir/contexts
+ func_show_eval (cd \$f_ex_an_ar_dir  $AR x \\$f_ex_an_ar_oldlib\) \
+  'stat=$?; rm -f $lockfile; exit $stat'
+ if test $lock_old_archive_extraction = yes; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-19 Thread David Tardon 
 external/libetonyek/UnpackedTarball_libetonyek.mk |6 ++
 external/libetonyek/assert.patch  |   20 
 2 files changed, 26 insertions(+)

New commits:
commit 7a7f73cebcd84a03a5db85d3b423b65c897651f4
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 17:47:52 2015 +0200

restore windows build fix

Change-Id: I1269be7ab26a4f7ba30a70eb8aef3023384a7de2

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 52e6a95..4853907 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+   external/libetonyek/assert.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch
new file mode 100644
index 000..fe5e282
--- /dev/null
+++ b/external/libetonyek/assert.patch
@@ -0,0 +1,20 @@
+--- src/lib/EtonyekDocument.cpp
 src/lib/EtonyekDocument.cpp
+@@ -7,6 +7,8 @@
+ 
+ #include libetonyek/libetonyek.h
+ 
++#include cassert
++
+ #include boost/scoped_ptr.hpp
+ #include boost/shared_ptr.hpp
+ #include boost/logic/tribool.hpp
+@@ -179,7 +181,7 @@
+ info.input-seek(0, RVNG_SEEK_SET);
+   }
+ 
+-  assert(!isGzipped);
++  assert(bool(!isGzipped));
+ 
+   return probeXMLImpl(info.input, probe, type, info);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-19 Thread David Tardon 
 external/libetonyek/ExternalProject_libetonyek.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d17b7e3a91fee6211b884e2e991a654c56fe8b4
Author: David Tardon dtar...@redhat.com
Date:   Tue May 19 18:23:52 2015 +0200

blind fix for windows

Change-Id: Ia042bbb7845a6de4769949230e3f1bc90099c9aa

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 3de8605..a83c654 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-weffc \
--without-tools \
$(if 
$(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   BOOST_CFLAGS=$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   BOOST_CFLAGS=-DBOOST_DETAIL_NO_CONTAINER_FWD $(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
XML_CFLAGS=$(LIBXML_CFLAGS) \
XML_LIBS=$(LIBXML_LIBS) \
$(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/libetonyek

2014-10-27 Thread Stephan Bergmann 
 external/libetonyek/ExternalProject_libetonyek.mk |2 +-
 external/libetonyek/UnpackedTarball_libetonyek.mk |6 +-
 external/libetonyek/assert.patch  |   20 
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit e7682068a184d5233229533585f9bd06298c7731
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Oct 27 22:06:10 2014 +0100

Pass ENABLE_DEBUG into external/libetonyek

(and consequently fix the argument type of one assert invocation)

Change-Id: I8bf5f024cc104a3885f7b9bf6ed63b9f6259d47b

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index 84d6e7f..0d281b5 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--enable-static \
--disable-shared \
--without-docs \
-   --disable-debug \
+   $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
--without-tools \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 7a8746c..448e41e 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
+
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
+external/libetonyek/assert.patch \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch
new file mode 100644
index 000..39d68db
--- /dev/null
+++ b/external/libetonyek/assert.patch
@@ -0,0 +1,20 @@
+--- src/lib/EtonyekDocument.cpp
 src/lib/EtonyekDocument.cpp
+@@ -7,6 +7,8 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include cassert
++
+ #include boost/scoped_ptr.hpp
+ #include boost/shared_ptr.hpp
+ #include boost/logic/tribool.hpp
+@@ -179,7 +181,7 @@
+ info.input-seek(0, RVNG_SEEK_SET);
+   }
+ 
+-  assert(!isGzipped);
++  assert(bool(!isGzipped));
+ 
+   return probeXMLImpl(info.input, probe, type, info);
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-03-24 Thread Luboš Luňák 
 external/libetonyek/UnpackedTarball_libetonyek.mk   |1 
 external/libetonyek/libetonyek-0.0.3-lexical_cast.patch |   56 
 2 files changed, 57 insertions(+)

New commits:
commit 8057b2448edfa653911fa4d42870a2d1aa7694d7
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Mar 24 16:21:44 2014 +0100

fix libetonyek build

KEY2StyleParser.cpp:65:10: error: no matching function for call to 
'readNumber'
KEY2StyleParser.cpp:34:13: note: candidate template ignored: couldn't infer 
template argument 'C'

I took the patch from Fridrich's openSUSE rpms.

Change-Id: Iba3c682539c5c978dddb0040f24f23c7299af0d9

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d452574..0db9596 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \
+   external/libetonyek/libetonyek-0.0.3-lexical_cast.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch 
b/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch
new file mode 100644
index 000..fbd8bf6
--- /dev/null
+++ b/external/libetonyek/libetonyek-0.0.3-lexical_cast.patch
@@ -0,0 +1,56 @@
+--- a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-01 
21:44:51.0 +0100
 b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.cpp 2013-12-15 
06:53:07.474721349 +0100
+@@ -125,7 +125,7 @@
+   return KEYSize(size.second, size.first);
+ }
+ 
+-bool KEY2ParserUtils::bool_cast(const char *const value)
++bool KEY2ParserUtils::bool_cast(const char *value)
+ {
+   KEY2Tokenizer tok;
+   switch (tok(value))
+@@ -142,6 +142,16 @@
+   return false;
+ }
+ 
++double KEY2ParserUtils::double_cast(const char *value)
++{
++  return lexical_castdouble, const char *(value);
++}
++
++int KEY2ParserUtils::int_cast(const char *value)
++{
++  return lexical_castint, const char *(value);
++}
++
+ double KEY2ParserUtils::deg2rad(double value)
+ {
+   // normalize range
+--- a/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h   2013-10-30 
22:04:38.0 +0100
 b/libetonyek-0.0.3/src/lib/KEY2ParserUtils.h   2013-12-15 
06:50:40.296884951 +0100
+@@ -81,6 +81,8 @@
+ * @returns the boolean value of the string
+ */
+   static bool bool_cast(const char *value);
++  static double double_cast(const char *value);
++  static int int_cast(const char *value);
+ 
+   static double deg2rad(double value);
+ 
+--- a/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-06 
10:36:13.0 +0100
 b/libetonyek-0.0.3/src/lib/KEY2StyleParser.cpp 2013-12-15 
06:53:45.353451061 +0100
+@@ -62,12 +62,12 @@
+ 
+ optionaldouble readDouble(const KEYXMLReader reader)
+ {
+-  return readNumberdouble(reader, KEY2Token::f, lexical_castdouble, const 
char *);
++  return readNumberdouble(reader, KEY2Token::f, 
KEY2ParserUtils::double_cast);
+ }
+ 
+ optionalint readInt(const KEYXMLReader reader)
+ {
+-  return readNumberint(reader, KEY2Token::i, lexical_castint, const char 
*);
++  return readNumberint(reader, KEY2Token::i, KEY2ParserUtils::double_cast);
+ }
+ 
+ optionalKEYColor readColor(const KEYXMLReader reader)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-06 Thread David Tardon 
 external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 |   26 
++
 external/libetonyek/UnpackedTarball_libetonyek.mk  |4 +
 2 files changed, 30 insertions(+)

New commits:
commit 477e26b9ab681460823f7af042713e28f043cacb
Author: David Tardon dtar...@redhat.com
Date:   Fri Dec 6 20:38:03 2013 +0100

fix build

Change-Id: I65476b98a58b749619003965c41cfe0f32ae2e13

diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 
b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
new file mode 100644
index 000..816039b
--- /dev/null
+++ b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
@@ -0,0 +1,26 @@
+From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= fridrich.st...@bluewin.ch
+Date: Fri, 6 Dec 2013 18:35:28 +0100
+Subject: [PATCH] Comma at the end of emum list
+
+Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493
+---
+ src/lib/KEYEnum.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h
+index f0e027f..9e5e61f 100644
+--- a/src/lib/KEYEnum.h
 b/src/lib/KEYEnum.h
+@@ -33,7 +33,7 @@ enum KEYCapitalization
+   KEY_CAPITALIZATION_NONE,
+   KEY_CAPITALIZATION_ALL_CAPS,
+   KEY_CAPITALIZATION_SMALL_CAPS,
+-  KEY_CAPITALIZATION_TITLE,
++  KEY_CAPITALIZATION_TITLE
+ };
+ 
+ }
+-- 
+1.8.4.2
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 52e6a95..d452574 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
+   external/libetonyek/0001-Comma-at-the-end-of-emum-list.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/libetonyek

2013-11-01 Thread David Tardon 
 external/libetonyek/0001-impl.-XML-format-detection.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46bcd543406a144c221a8055d3efeab94c08c6fc
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 1 20:20:21 2013 +0100

fix build with clang

Change-Id: I3fd7cfdf78dc221cbaa651ff351bc4ca76952d55

diff --git a/external/libetonyek/0001-impl.-XML-format-detection.patch 
b/external/libetonyek/0001-impl.-XML-format-detection.patch
index c4e1904..4ab7822 100644
--- a/external/libetonyek/0001-impl.-XML-format-detection.patch
+++ b/external/libetonyek/0001-impl.-XML-format-detection.patch
@@ -34,7 +34,7 @@ index 8ca33ad..a1a5477 100644
 +  if (input-atEOS())
 +return VERSION_UNKNOWN;
 +
-+  const KEY2Tokenizer tokenizer;
++  const KEY2Tokenizer tokenizer = KEY2Tokenizer();
 +  KEYXMLReader reader(input.get(), tokenizer);
 +
 +  if ((KEY2Token::NS_URI_KEY | KEY2Token::presentation) == getId(reader))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-31 Thread Stephan Bergmann 
 external/libetonyek/UnpackedTarball_libetonyek.mk   |1 +
 external/libetonyek/libetonyek-doubledelete.patch.0 |   18 ++
 2 files changed, 19 insertions(+)

New commits:
commit cad751d28c356ef302f8eeb0d112a8a0e16dedbc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 31 11:33:16 2013 +0100

libetonyek: I assume this is what was intended?

...at least it makes JunitTest_chart2_unoapi not crash any more.

Change-Id: Ibc14f141398e518ab8f06b661a198d50c7732e4a

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 173a6c8..1a6b32d 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-fix-windows-build.patch \
+   external/libetonyek/libetonyek-doubledelete.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/libetonyek-doubledelete.patch.0 
b/external/libetonyek/libetonyek-doubledelete.patch.0
new file mode 100644
index 000..a377c44
--- /dev/null
+++ b/external/libetonyek/libetonyek-doubledelete.patch.0
@@ -0,0 +1,18 @@
+--- src/lib/KEYXMLReader.cpp
 src/lib/KEYXMLReader.cpp
+@@ -335,6 +335,7 @@
+   catch (...)
+   {
+ delete m_impl;
++throw;
+   }
+ }
+
+@@ -350,6 +351,7 @@
+   catch (...)
+   {
+ delete m_impl;
++throw;
+   }
+ }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits