[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 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
|4 
 2 files changed, 60 insertions(+)

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

fix c++ snafu with msvc

(cherry picked from commit b1e5983f04095346bee48dc3b413c0ae28789c27)

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

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 7751b38..406af42 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/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: Branch 'libreoffice-5-0' - external/libmwaw

2015-08-17 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 b0ea1d1f6779dabbfd89ac720de12d4cfe934cec
Author: Andras Timar andras.ti...@collabora.com
Date:   Fri Aug 7 11:09:01 2015 +0200

libmwaw bundled soname patch

Reviewed-on: https://gerrit.libreoffice.org/17568
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 0dc79f35aa3a373414c17f596ca4491a69083864)

Conflicts:
external/libmwaw/ExternalPackage_libmwaw.mk

Change-Id: Ibaba47be8aeefca7719d1ff335f551777130c6cd
Reviewed-on: https://gerrit.libreoffice.org/17800
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk 
b/external/libmwaw/ExternalPackage_libmwaw.mk
index 97a6e6d..06342c2 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.$(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 7aeb99c..7751b38 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