external/libxml2/ExternalPackage_libxml2.mk | 2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 29a2359c5bc5bbbbd06b6a9824146de4906eddc2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Jul 21 14:48:15 2025 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 22 08:32:27 2025 +0200
add OGLTrans target conditionally
without this patch the build breaks when --enable-mpl-subset and
--enable-mergelibs=more are passed to autogen.sh.
*** used LinkTarget Library/libOGLTranslo.dylib not defined. Stop.
Change-Id: I610055da46fd1002e9b8d70a7db8964a0f9ad0db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188131
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 00163603e34e..fccc834039d7 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -163,7 +163,7 @@ gb_MERGE_LIBRARY_LIST += \
msforms \
$(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
$(call gb_Helper_optional,MARIADBC,$(call
gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
- OGLTrans \
+ $(if $(ENABLE_OPENGL_TRANSITIONS),OGLTrans) \
odbc \
pdffilter \
$(if $(BUILD_POSTGRESQL_SDBC),postgresql-sdbc) \
commit 1cfc0d9c10a7bdff952f9ebc964371cec64f28dc
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon Jul 21 08:57:23 2025 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 22 08:32:19 2025 +0200
Fix macOS build after libxml2 upgrade to 2.14.3
Change-Id: I94c8fbfb150a214c7517c849336b0025813a181b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188130
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/external/libxml2/ExternalPackage_libxml2.mk
b/external/libxml2/ExternalPackage_libxml2.mk
index 072cfece9a74..0caabe1263af 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -13,7 +13,7 @@ $(eval $(call
gb_ExternalPackage_use_external_project,libxml2,libxml2))
ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.16.dylib,.libs/libxml2.16.dylib))
else ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
