diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-08-06 21:51:28 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-20 14:13:55 +0200 |
| commit | 97d69b9b0d0d7d6d69587a27ea108663ede4f1c6 (patch) | |
| tree | eee69df1906031850949d2633d98e3342e25d236 /external | |
| parent | 03153d5c42040b92dd46a9160bb4064528aa1a15 (diff) | |
libwpd bundled soname patch
Reviewed-on: https://gerrit.libreoffice.org/17548
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 4284337d92420373f2e1bcb40c9513db94a73bca)
Conflicts:
external/libwpd/ExternalPackage_libwpd.mk
Change-Id: I25dee74be0391b56587b4cc3eb9599708446825d
Reviewed-on: https://gerrit.libreoffice.org/17795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwpd/ExternalPackage_libwpd.mk | 2 | ||||
| -rw-r--r-- | external/libwpd/UnpackedTarball_libwpd.mk | 8 | ||||
| -rw-r--r-- | external/libwpd/libwpd-bundled-soname.patch.0 | 11 |
3 files changed, 20 insertions, 1 deletions
diff --git a/external/libwpd/ExternalPackage_libwpd.mk b/external/libwpd/ExternalPackage_libwpd.mk index 51badef0fd8c..ce22af0ec744 100644 --- a/external/libwpd/ExternalPackage_libwpd.mk +++ b/external/libwpd/ExternalPackage_libwpd.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10. else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.so.10,src/lib/.libs/libwpd-0.10.so.10.0.0)) +$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10-lo.so.10,src/lib/.libs/libwpd-0.10-lo.so.10.0.0)) endif # vim: set noet sw=4 ts=4: diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 9610dfb32a1a..7fb7c3b2181d 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -18,4 +18,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ )) +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ + external/libwpd/libwpd-bundled-soname.patch.0 \ +)) +endif +endif + # vim: set noet sw=4 ts=4: diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 b/external/libwpd/libwpd-bundled-soname.patch.0 new file mode 100644 index 000000000000..04661f2d464b --- /dev/null +++ b/external/libwpd/libwpd-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 +@@ -429,7 +429,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPD_BUILD=1 + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ +-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \ + libwpd_internal.cpp \ + libwpd_math.cpp \ |