diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 1 | ||||
| -rw-r--r-- | external/libwpg/Library_wpg.mk | 1 | ||||
| -rw-r--r-- | external/libwpg/UnpackedTarball_libwpg.mk | 4 | ||||
| -rw-r--r-- | external/libwpg/rpath.patch | 10 |
5 files changed, 4 insertions, 16 deletions
diff --git a/download.lst b/download.lst index 5dee8cfce9ab..9615e2dac051 100644 --- a/download.lst +++ b/download.lst @@ -533,8 +533,8 @@ WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -WPG_SHA256SUM := 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c -WPG_VERSION_MICRO := 3 +WPG_SHA256SUM := b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3 +WPG_VERSION_MICRO := 4 WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index 6a0d2c8984c6..dc6bdf7d6899 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -37,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(gb_CONFIGURE_PLATFORMS) \ CXXFLAGS="$(gb_CXXFLAGS) $(call gb_ExternalProject_get_build_flags,libwpg)" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(filter LINUX,$(OS)), \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ diff --git a/external/libwpg/Library_wpg.mk b/external/libwpg/Library_wpg.mk index 09dc34915238..e59133ea588d 100644 --- a/external/libwpg/Library_wpg.mk +++ b/external/libwpg/Library_wpg.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,wpg)) $(eval $(call gb_Library_use_unpacked,wpg,libwpg)) $(eval $(call gb_Library_use_externals,wpg,\ + boost_headers \ revenge \ wpd \ )) diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index 9ca55c669d72..e3790c831296 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpg,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libwpg)) -$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ - external/libwpg/rpath.patch \ -)) - ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) ifneq ($(OS),iOS) diff --git a/external/libwpg/rpath.patch b/external/libwpg/rpath.patch deleted file mode 100644 index 5a8f56105509..000000000000 --- a/external/libwpg/rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure -+++ configure -@@ -13858,6 +13858,7 @@ - esac - ;; - esac -+hardcode_libdir_flag_spec_CXX= - ;; - - lynxos*) |