[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94830aececf309dafbd5e0485ac3c9e3d3db14fd
Author: Stephan Bergmann 
AuthorDate: Sat Sep 22 17:30:36 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Dec 12 16:43:24 2018 +0100

external/harfbuzz's libharfbuzz.a links against icuuc library

buovjaga reported on IRC that his build (implicitly 
--without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to 
harfbuzz
missing symbols from ICU, like

> /usr/bin/ld: 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o):
 in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, 
unsigned int, unsigned int*, void*)':
> 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: 
undefined reference to `unorm2_getNFKDInstance_62'
[...]

It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my 
builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some 
symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz.  (And "gb_LinkTarget_use_external,...,icuuc" conveniently only 
adds
libs for linking, and does not add C/C++ include file paths, which would 
not be
wanted here.)

( "Revert 'Add more more 
dependencies
to VCL makefiles'" was a false start trying to address the above issue.)

Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/64725
Reviewed-by: Lionel Elie Mamane 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ac962732c0c6..7e629a89cb34 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1534,6 +1534,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
+$(call gb_LinkTarget_use_external,$(1),icuuc)
 $(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit d6eabbf3e373f3966ab6b0d4e6861dfa6957ccce
Author: Christian Lohmaier 
AuthorDate: Wed Aug 22 00:47:13 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Aug 24 15:17:14 2018 +0200

tdf#118261 package libnumbertext data files into installation sets

Change-Id: I1d4bfc9de274df2b467614fba7639e7f5a653377
Reviewed-on: https://gerrit.libreoffice.org/59421
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
(cherry picked from commit 566050c5f3f3e54bfec115f9dba693404ca91770)
Reviewed-on: https://gerrit.libreoffice.org/59424
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d70b1f051968..ac962732c0c6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -828,6 +828,10 @@ else # !SYSTEM_LIBNUMBERTEXT
 
 ifneq ($(ENABLE_LIBNUMBERTEXT),)
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+   libnumbertext_numbertext \
+))
+
 define gb_LinkTarget__use_libnumbertext
 $(call gb_LinkTarget_use_package,$(1),libnumbertext_numbertext)
 $(call gb_LinkTarget_set_include,$(1),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits