external/libmspub/stdint.patch | 11 +++++++++++ external/libnumbertext/ExternalProject_libnumbertext.mk | 2 +- external/libodfgen/UnpackedTarball_libodfgen.mk | 4 ++++ external/libodfgen/includes.patch.1 | 10 ++++++++++ external/liborcus/ExternalProject_liborcus.mk | 2 ++ external/liborcus/include.patch.0 | 11 +++++++++++ solenv/gbuild/platform/com_MSC_class.mk | 6 +++--- 7 files changed, 42 insertions(+), 4 deletions(-)
New commits: commit 1ae7f1ae2fff4cee1a7f1e57b5e769265f05b973 Author: Andrea Gelmini <[email protected]> AuthorDate: Thu Dec 19 13:11:56 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 14 14:11:45 2025 +0100 Fix typo in code Change-Id: I7c71e16628819bd60664f9b4dc70f0f0762afb48 Reviewed-on: https://gerrit.libreoffice.org/85521 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit 85c10c4e4994f7be0498a6757650a22aba548e4b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193973 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 143847fb66f4..cdb1711f9172 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -44,7 +44,7 @@ define gb_CObject__compiler endef # Avoid annoying warning D9025 about overriding command-line arguments. -gb_Helper_remove_overriden_flags = \ +gb_Helper_remove_overridden_flags = \ $(lastword $(filter -W4 -w,$(1))) \ $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2,$(1)) \ $(lastword $(filter -Od -O2,$(1))) \ @@ -58,7 +58,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(filter-out -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \ $(DEFS) \ $(gb_LTOFLAGS) \ - $(call gb_Helper_remove_overriden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \ + $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(2),$(3))) \ $(2) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ $(if $(EXTERNAL_CODE), \ $(if $(filter -clr,$(2)),,$(if $(COM_IS_CLANG),-Wno-undef)), \ @@ -95,7 +95,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ unset INCLUDE && \ $(filter-out -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \ - $(call gb_Helper_remove_overriden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \ + $(call gb_Helper_remove_overridden_flags,$(filter -arch:SSE,$(call gb_CObject__compiler,$(4) $(5),$(3))) \ $(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ -Fd$(PDBFILE) \ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ commit c84f7d1940bc1423282c0f4b8873ce0fdd3d97d1 Author: Michael Stahl <[email protected]> AuthorDate: Thu Nov 13 14:27:39 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 14 14:11:40 2025 +0100 liborcus,libnumbertext: build with -Wno-deprecated-declarations Change-Id: Iedab54f9b094f018871e84f062f8ef1d3ed32002 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193972 Reviewed-by: Michael Stahl <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index c2bdaeebfba9..2ebdadf25777 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -20,7 +20,7 @@ libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11) ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) ifneq (,$(gb_ENABLE_DBGUTIL)) -libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG +libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG -Wno-deprecated-declarations endif endif diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 0bd36c379d9b..27580ab11d0e 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -68,6 +68,8 @@ liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) ifeq ($(COM),MSC) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) +else +liborcus_CXXFLAGS+= -Wno-deprecated-declarations endif ifeq ($(SYSTEM_BOOST),) liborcus_CXXFLAGS+=${BOOST_CPPFLAGS} commit 614964df49d9c2d93928e27fcecce9169ba3d1b5 Author: Michael Stahl <[email protected]> AuthorDate: Thu Nov 13 14:43:14 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 14 14:11:35 2025 +0100 libmspub,liborcus: patch in more stdint.h for GCC 15 Change-Id: I5b29e78c031feefd4103236a64b66ef09f5a3949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193971 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/external/libmspub/stdint.patch b/external/libmspub/stdint.patch index 61f1dd122904..c8bacc97bd08 100644 --- a/external/libmspub/stdint.patch +++ b/external/libmspub/stdint.patch @@ -8,3 +8,14 @@ #include <librevenge/librevenge.h> +--- src/lib/Coordinate.h.orig 2025-11-13 14:37:41.397813531 +0100 ++++ src/lib/Coordinate.h 2025-11-13 14:36:41.342433546 +0100 +@@ -12,6 +12,8 @@ + + #include "MSPUBConstants.h" + ++#include <stdint.h> ++ + namespace libmspub + { + struct Coordinate diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0 index 3bed5aebf865..30cd79585cce 100644 --- a/external/liborcus/include.patch.0 +++ b/external/liborcus/include.patch.0 @@ -49,3 +49,14 @@ using namespace std; +--- include/orcus/env.hpp.orig 2025-11-13 14:52:11.931714242 +0100 ++++ include/orcus/env.hpp 2025-11-13 14:51:51.200547313 +0100 +@@ -136,6 +136,8 @@ + #endif + #endif + ++#include <cstdint> ++ + #endif + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 9f6f0835461cc7d0e528858cd099754f0edd48fc Author: Michael Stahl <[email protected]> AuthorDate: Wed Nov 12 13:35:43 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Nov 14 14:11:31 2025 +0100 libodfgen: fix GCC 15 build Change-Id: Ia167360724181e18b6dd1c74387ede2be9270f0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193904 Tested-by: allotropia jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index d6c84e517970..0f7fd63dc737 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libodfgen)) +$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ + external/libodfgen/includes.patch.1 \ +)) + ifeq ($(SYSTEM_REVENGE),) $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ external/libodfgen/rpath.patch \ diff --git a/external/libodfgen/includes.patch.1 b/external/libodfgen/includes.patch.1 new file mode 100644 index 000000000000..e4f149d6978b --- /dev/null +++ b/external/libodfgen/includes.patch.1 @@ -0,0 +1,10 @@ +--- libodfgen/src/OdfGenerator.cxx.orig 2025-11-12 13:29:11.546144448 +0100 ++++ libodfgen/src/OdfGenerator.cxx 2025-11-12 13:29:27.349307535 +0100 +@@ -33,6 +33,7 @@ + #include <math.h> + + #include <cctype> ++#include <cstdint> + #include <limits> + #include <memory> + #include <string>
