[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libmwaw

2014-11-20 Thread David Tardon 
 external/libmwaw/0001-initialize-image-data.patch |   25 ++
 external/libmwaw/UnpackedTarball_libmwaw.mk   |1 
 2 files changed, 26 insertions(+)

New commits:
commit 86863a85935516192b751bb07826fbc5487694f6
Author: David Tardon dtar...@redhat.com
Date:   Thu Nov 20 12:13:56 2014 +0100

make libmwaw unit tests valgrind-clean

Change-Id: I4bb8a1810f484f7b991e1eb3791f69cb9b744363
Reviewed-on: https://gerrit.libreoffice.org/12984
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/external/libmwaw/0001-initialize-image-data.patch 
b/external/libmwaw/0001-initialize-image-data.patch
new file mode 100644
index 000..ae188583
--- /dev/null
+++ b/external/libmwaw/0001-initialize-image-data.patch
@@ -0,0 +1,25 @@
+From 091ef2d16d3578111af40f32bf5d92759883 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Thu, 5 Jun 2014 10:17:17 -0400
+Subject: [PATCH] initialize image data
+
+valgrind complains on that on SuperPaint/1.0/paint1.sp.hqx test file.
+---
+ src/lib/MWAWPictBitmap.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/MWAWPictBitmap.hxx b/src/lib/MWAWPictBitmap.hxx
+index fe366de..666ec34 100644
+--- a/src/lib/MWAWPictBitmap.hxx
 b/src/lib/MWAWPictBitmap.hxx
+@@ -58,6 +58,7 @@ public:
+   MWAWPictBitmapContainer(Vec2i const sz) : m_size(sz), m_data(0L)
+   {
+ if (m_size[0]*m_size[1] != 0) m_data = new T[size_t(m_size[0]*m_size[1])];
++std::uninitialized_fill_n(m_data, m_size[0] * m_size[1], T());
+   }
+   //! destructor
+   virtual ~MWAWPictBitmapContainer()
+-- 
+2.1.0
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 6f63f28..ec1b248 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-initialize-image-data.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: Branch 'libreoffice-4-3' - 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 0c4a1ecc7c46f67325bfb888a8db503abb4255b8
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 4 09:27:24 2014 +0200

fdo#82035 fix loader paths

Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0
(cherry picked from commit 6cf40d263e33dd6934005af8319ae6fc8a386592)
Reviewed-on: https://gerrit.libreoffice.org/10726
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

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 f4e0072..54ff48b 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -36,6 +36,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: Branch 'libreoffice-4-3' - 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 efec628c96470eba450bf43e0d5507a49c329c12
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
(cherry picked from commit 9f339a89453808b917177a3ee675a76385758902)

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