[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/libwps

[Andras Timar]

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

New commits:
commit 678e555286e2f1dc727074ef1496ed87613d4907
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Aug 6 12:07:40 2015 +0200

    libwps bundled soname patch
    
    Reviewed-on: https://gerrit.libreoffice.org/17533
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit fff1d5bdd087f72178321f47b649323013d933cf)
    
    Conflicts:
    	external/libwps/ExternalPackage_libwps.mk
    	external/libwps/UnpackedTarball_libwps.mk
    
    Change-Id: I6661ff49e25921ce11dc04fffab84cf5db3c95fe
    Reviewed-on: https://gerrit.libreoffice.org/17794
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk
index 034900c..24b00c6 100644
--- a/external/libwps/ExternalPackage_libwps.mk
+++ b/external/libwps/ExternalPackage_libwps.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.so.4,src/lib/.libs/libwps-0.4.so.4.0.$(WPS_VERSION_MICRO)))
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.0.$(WPS_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 77f1265..52d9ab3 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -19,4 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+	external/libwps/libwps-bundled-soname.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/libwps-bundled-soname.patch.0 b/external/libwps/libwps-bundled-soname.patch.0
new file mode 100644
index 0000000..734cdc6
--- /dev/null
+++ b/external/libwps/libwps-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/lib/Makefile.in.orig	2015-08-06 11:41:55.081239194 +0200
++++ src/lib/Makefile.in	2015-08-06 11:42:16.903238820 +0200
+@@ -369,7 +369,7 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DBUILD_WPS=1
+ libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPS_WIN32_RESOURCE@
+ libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPS_WIN32_RESOURCE@
+-libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
++libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
+ libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_SOURCES = \
+ 	libwps_internal.cpp	\
+ 	libwps_tools_win.h	\