external/libwpg/UnpackedTarball_libwpg.mk | 4 ++++
external/libwpg/rpath.patch | 10 ++++++++++
2 files changed, 14 insertions(+)
New commits:
commit edf471ba8b5a69ce26e68eff26283b304c4c9a9e
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 9 08:34:43 2023 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 9 10:30:56 2023 +0200
Reinstate external/libwpg/rpath.patch
...which 0c0c9a0dd8a7b102315ab1075f78a0f1f3397b67 "tdf#155057: Wrong colors
in
some WPG2 (well rendered in WPG1)" had dropped for no apparent reason,
causing
> [CHK] CustomTarget/postprocess/check_dynamic_objects/check.done
> ~/lo/core/instdir/program/libwpg-0.3-lo.so.3 has unexpected RPATH
0x000000000000001d (RUNPATH) Library runpath:
[~/lo/core/workdir/UnpackedTarball/libwpd/src/lib/.libs:~/lo/core/workdir/UnpackedTarball/librevenge/src/lib/.libs:/usr/local/lib:$ORIGIN]
to fail (in Linux builds that execute that test)
Change-Id: Id9f87b14f571b328b98496625351bc1f87bf8c61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151555
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/libwpg/UnpackedTarball_libwpg.mk
b/external/libwpg/UnpackedTarball_libwpg.mk
index e3790c831296..9ca55c669d72 100644
--- a/external/libwpg/UnpackedTarball_libwpg.mk
+++ b/external/libwpg/UnpackedTarball_libwpg.mk
@@ -15,6 +15,10 @@ $(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
new file mode 100644
index 000000000000..5a8f56105509
--- /dev/null
+++ b/external/libwpg/rpath.patch
@@ -0,0 +1,10 @@
+--- configure
++++ configure
+@@ -13858,6 +13858,7 @@
+ esac
+ ;;
+ esac
++hardcode_libdir_flag_spec_CXX=
+ ;;
+
+ lynxos*)
