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

[Andras Timar]

 external/libwpg/ExternalPackage_libwpg.mk     |    2 +-
 external/libwpg/UnpackedTarball_libwpg.mk     |    8 ++++++++
 external/libwpg/libwpg-bundled-soname.patch.0 |   11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 68279e04de33201b8f75b55ad8cac9deef3d044d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Aug 6 21:37:36 2015 +0200

    libwpg bundled soname patch
    
    Change-Id: Ied2f331000c83d696fb5dd662860c3b51b95c616
    Reviewed-on: https://gerrit.libreoffice.org/17547
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/external/libwpg/ExternalPackage_libwpg.mk b/external/libwpg/ExternalPackage_libwpg.mk
index fcaab4e..9de3845 100644
--- a/external/libwpg/ExternalPackage_libwpg.mk
+++ b/external/libwpg/ExternalPackage_libwpg.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.so.3,src/lib/.libs/libwpg-0.3.so.3.0.0))
+$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk
index d0b1e99..f470bdf 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -17,4 +17,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
     external/libwpg/rpath.patch \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \
+    external/libwpg/libwpg-bundled-soname.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwpg/libwpg-bundled-soname.patch.0 b/external/libwpg/libwpg-bundled-soname.patch.0
new file mode 100644
index 0000000..4fef3c2
--- /dev/null
+++ b/external/libwpg/libwpg-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig	2015-08-06 21:30:41.615633795 +0200
++++ src/lib/Makefile.in	2015-08-06 21:31:03.764633415 +0200
+@@ -357,7 +357,7 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1
+ libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@
+ libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@
+-libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
++libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
+ libwpg_ at WPG_MAJOR_VERSION@_ at WPG_MINOR_VERSION@_la_SOURCES = \
+ 	WPGraphics.cpp \
+ 	WPGDashArray.cpp \