external/fontconfig/ExternalPackage_fontconfig.mk | 2 +-
external/fontconfig/libfontconfig-bundled-soname.patch.0 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7459d4eef300dd46bcac6ce52767541e475a5e93
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Feb 21 11:22:42 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Feb 21 15:19:29 2024 +0100
external/fontconfig: Adapt library name
...to recent bbb0663813d0476b9a654207b7006315cb417c2e "Fontconfig: upgrade
to
release 2.15.0"
Change-Id: I6abdb1889d55edc6b50beec60b5e71707695f0ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163684
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/external/fontconfig/ExternalPackage_fontconfig.mk
b/external/fontconfig/ExternalPackage_fontconfig.mk
index b09931f5e807..688ae520bfe8 100644
--- a/external/fontconfig/ExternalPackage_fontconfig.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig.mk
@@ -12,7 +12,7 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,fontconfig,fontconfig))
$(eval $(call gb_ExternalPackage_use_external_project,fontconfig,fontconfig))
ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call
gb_ExternalPackage_add_file,fontconfig,$(LIBO_LIB_FOLDER)/libfontconfig-lo.so.1.12.0,src/.libs/libfontconfig-lo.so.1.12.0))
+$(eval $(call
gb_ExternalPackage_add_file,fontconfig,$(LIBO_LIB_FOLDER)/libfontconfig-lo.so.1.12.1,src/.libs/libfontconfig-lo.so.1.12.1))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/fontconfig/libfontconfig-bundled-soname.patch.0
b/external/fontconfig/libfontconfig-bundled-soname.patch.0
index 14da823315be..46222ca0d6b0 100644
--- a/external/fontconfig/libfontconfig-bundled-soname.patch.0
+++ b/external/fontconfig/libfontconfig-bundled-soname.patch.0
@@ -5,7 +5,7 @@
lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \
- -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
-+ -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
-release lo -Wl,-soname -Wl,libfontconfig-lo.so.1.12.0
++ -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
-release lo -Wl,-soname -Wl,libfontconfig-lo.so.1.12.1
libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS)
$(EXPAT_LIBS) $(LTLIBINTL)
libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency)
