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

[Andras Timar]

 external/libodfgen/ExternalPackage_libodfgen.mk     |    2 +-
 external/libodfgen/UnpackedTarball_libodfgen.mk     |    9 +++++++++
 external/libodfgen/libodfgen-bundled-soname.patch.0 |   11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit f1e53ff33e976e3d3866926a67daddab5728267d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Aug 7 11:33:13 2015 +0200

    libodfgen bundled soname patch
    
    Reviewed-on: https://gerrit.libreoffice.org/17569
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit cc22b245bee8b6d243c22f73b8715f12ebd03f88)
    
    Conflicts:
    	external/libodfgen/ExternalPackage_libodfgen.mk
    
    Change-Id: I09f0528420577e4b417ee4e39a52150777910d13
    Reviewed-on: https://gerrit.libreoffice.org/17797
    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/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 1708430..bd46be5 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
 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)),)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.$(ODFGEN_VERSION_MICRO)))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1-lo.so.1,src/.libs/libodfgen-0.1-lo.so.1.0.$(ODFGEN_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 32c8b36..1c002c8 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -27,4 +27,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
 ))
 endif
 
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
+    external/libodfgen/libodfgen-bundled-soname.patch.0 \
+))
+endif
+endif
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0
new file mode 100644
index 0000000..297cd303
--- /dev/null
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2015-08-07 11:26:16.388774624 +0200
++++ src/Makefile.in	2015-08-07 11:27:01.428773852 +0200
+@@ -372,7 +372,7 @@
+ AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD
+ libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
+ libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@
+-libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
++libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
+ libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_SOURCES = \
+ 	DocumentElement.cxx \
+ 	DocumentElement.hxx \