diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-08-06 21:37:36 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-17 12:26:14 +0000 |
| commit | 4f7e1943e5605636d34da110d3216aa12d9b9573 (patch) | |
| tree | 522c875b58d46f44ca081e22bb30ac6c010fffde /external | |
| parent | 678e555286e2f1dc727074ef1496ed87613d4907 (diff) | |
libwpg bundled soname patch
Reviewed-on: https://gerrit.libreoffice.org/17547
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 68279e04de33201b8f75b55ad8cac9deef3d044d)
Conflicts:
external/libwpg/ExternalPackage_libwpg.mk
Change-Id: Ied2f331000c83d696fb5dd662860c3b51b95c616
Reviewed-on: https://gerrit.libreoffice.org/17796
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/libwpg/ExternalPackage_libwpg.mk | 2 | ||||
| -rw-r--r-- | external/libwpg/UnpackedTarball_libwpg.mk | 8 | ||||
| -rw-r--r-- | external/libwpg/libwpg-bundled-soname.patch.0 | 11 |
3 files changed, 20 insertions, 1 deletions
diff --git a/external/libwpg/ExternalPackage_libwpg.mk b/external/libwpg/ExternalPackage_libwpg.mk index c03a5cfd9e99..5c326872cb69 100644 --- a/external/libwpg/ExternalPackage_libwpg.mk +++ b/external/libwpg/ExternalPackage_libwpg.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3 else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.so.3,src/lib/.libs/libwpg-0.3.so.3.0.0)) +$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3-lo.so.3,src/lib/.libs/libwpg-0.3-lo.so.3.0.0)) endif # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index d0b1e9979d48..f470bdf45cc6 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -17,4 +17,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ external/libwpg/rpath.patch \ )) +ifneq ($(OS),MACOSX) +ifneq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ + external/libwpg/libwpg-bundled-soname.patch.0 \ +)) +endif +endif + # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/libwpg-bundled-soname.patch.0 b/external/libwpg/libwpg-bundled-soname.patch.0 new file mode 100644 index 000000000000..4fef3c27e4e7 --- /dev/null +++ b/external/libwpg/libwpg-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:30:41.615633795 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:31:03.764633415 +0200 +@@ -357,7 +357,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1 + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@ + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@ +-libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_SOURCES = \ + WPGraphics.cpp \ + WPGDashArray.cpp \ |