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

[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 576d3ebd831d12538db704c6e05b6accf20026f6
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Aug 7 10:57:36 2015 +0200

    libetonyek bundled soname patch
    
    Reviewed-on: https://gerrit.libreoffice.org/17567
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 824e663cfbba436db32e4f2a20e3acbe275252e7)
    
    Conflicts:
    	external/libetonyek/ExternalPackage_libetonyek.mk
    
    Change-Id: Ib9ca5d65a493db7daa094b0dea3613637c4c184b
    Reviewed-on: https://gerrit.libreoffice.org/17799
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libetonyek/ExternalPackage_libetonyek.mk b/external/libetonyek/ExternalPackage_libetonyek.mk
index 08f0a63b..9fbfff4 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 ($(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)))
+$(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 0000000..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.in	2015-08-07 10:51:55.493809942 +0200
+@@ -463,7 +463,7 @@
+
+ libetonyek_ at ETONYEK_MAJOR_VERSION@_ at ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@
+ libetonyek_ at ETONYEK_MAJOR_VERSION@_ at ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
+-libetonyek_ at ETONYEK_MAJOR_VERSION@_ at ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
++libetonyek_ at ETONYEK_MAJOR_VERSION@_ at ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
+ libetonyek_ at ETONYEK_MAJOR_VERSION@_ at ETONYEK_MINOR_VERSION@_la_SOURCES = \
+ 	EtonyekDocument.cpp
+