external/librevenge/ExternalPackage_librevenge.mk | 2 +- external/librevenge/UnpackedTarball_librevenge.mk | 8 ++++++++ external/librevenge/librevenge-bundled-soname.patch.0 | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-)
New commits: commit 0c93a9dec25d262dfd04e05a5c72803c0f0fb44d Author: Andras Timar <[email protected]> Date: Fri Aug 7 12:02:04 2015 +0200 librevenge bundled soname patch Reviewed-on: https://gerrit.libreoffice.org/17572 Tested-by: Jenkins <[email protected]> Reviewed-by: Andras Timar <[email protected]> (cherry picked from commit 27ba1e316833671b1067fe8e6745530fa91c173d) Conflicts: external/librevenge/ExternalPackage_librevenge.mk Change-Id: I8c55eb6eeca40faf8201af037f31a57ce9b64ac0 Reviewed-on: https://gerrit.libreoffice.org/17798 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk index 9766bfb..56a4df2 100644 --- a/external/librevenge/ExternalPackage_librevenge.mk +++ b/external/librevenge/ExternalPackage_librevenge.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/libreven 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)),) -$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.so.0,src/lib/.libs/librevenge-0.0.so.0.0.2)) +$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.2)) endif # vim: set noet sw=4 ts=4: diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk index dabad6a..192faf4 100644 --- a/external/librevenge/UnpackedTarball_librevenge.mk +++ b/external/librevenge/UnpackedTarball_librevenge.mk @@ -21,4 +21,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \ endif endif +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,librevenge, \ + external/librevenge/librevenge-bundled-soname.patch.0 \ +)) +endif +endif + # vim: set noet sw=4 ts=4: diff --git a/external/librevenge/librevenge-bundled-soname.patch.0 b/external/librevenge/librevenge-bundled-soname.patch.0 new file mode 100644 index 0000000..f959def --- /dev/null +++ b/external/librevenge/librevenge-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ src/lib/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -470,7 +470,7 @@ + -DLIBREVENGE_BUILD $(am__append_2) + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD = @LIBREVENGE_WIN32_RESOURCE@ + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@ +-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \ + RVNGBinaryData.cpp \ + RVNGMemoryStream.cpp \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
