diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2021-09-13 14:45:48 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2021-09-13 14:45:48 +0000 |
| commit | 98936bda48a278bf4b450b66a40a618d0e83ecc3 (patch) | |
| tree | 97c7e41c42f37d96e3643cc232439d32e8892bc0 | |
| parent | 62141f42b2da4a78a3b9cbb8261255aff71b1e52 (diff) | |
editors/libreoffice: Unbreak build
Adds liblocaledata_en dependency to solenv.
Tested using poudriere build & testport.
See also:
https://gerrit.libreoffice.org/c/core/+/120837
PR: 257997
Reported by: ddrinnon
Approved by: portmgr (build fix blanket)
| -rw-r--r-- | editors/libreoffice/files/patch-RepositoryExternal.mk | 12 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-solenv_gbuild_extensions_pre__BuildTools.mk | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/editors/libreoffice/files/patch-RepositoryExternal.mk b/editors/libreoffice/files/patch-RepositoryExternal.mk new file mode 100644 index 000000000000..4fe3c836125c --- /dev/null +++ b/editors/libreoffice/files/patch-RepositoryExternal.mk @@ -0,0 +1,12 @@ +See https://git.libreoffice.org/core/+/0e7d4d99beda181f4e22725e4b8295d25489696f + +--- RepositoryExternal.mk.orig 2021-08-16 19:56:28 UTC ++++ RepositoryExternal.mk +@@ -3870,6 +3870,7 @@ endef + define gb_Executable__register_gengal + $(call gb_Executable_add_runtime_dependencies,gengal,\ + $(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \ ++ $(call gb_Library_get_target_for_build,localedata_en) \ + $(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \ + $(if $(filter WNT,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_win)) \ + $(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \ diff --git a/editors/libreoffice/files/patch-solenv_gbuild_extensions_pre__BuildTools.mk b/editors/libreoffice/files/patch-solenv_gbuild_extensions_pre__BuildTools.mk new file mode 100644 index 000000000000..f053c0c291a6 --- /dev/null +++ b/editors/libreoffice/files/patch-solenv_gbuild_extensions_pre__BuildTools.mk @@ -0,0 +1,12 @@ +See https://git.libreoffice.org/core/+/0e7d4d99beda181f4e22725e4b8295d25489696f + +--- solenv/gbuild/extensions/pre_BuildTools.mk.orig 2021-08-16 19:56:28 UTC ++++ solenv/gbuild/extensions/pre_BuildTools.mk +@@ -47,7 +47,6 @@ gb_BUILD_TOOLS = \ + $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \ + $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ + $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ +- $(if $(WITH_GALLERY_BUILD),$(call gb_Library_get_target,localedata_en)) \ + + endif + |