This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch icu-c-api in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2914bd8dcd43a7b1e734ee0a2011b2267c76a1ee Author: Damjan Jovanovic <[email protected]> AuthorDate: Thu May 1 11:00:08 2025 +0200 The ICU layout engine doesn't exist in newer ICU versions, so stop using it. FIXME: should be made conditional, and eventually replaced by eg. HarfBuzz. Patch by: me --- main/vcl/Library_desktop_detector.mk | 1 - main/vcl/Library_vcl.mk | 1 - main/vcl/Library_vclplug_gen.mk | 1 - main/vcl/Library_vclplug_gtk.mk | 1 - main/vcl/Library_vclplug_kde.mk | 1 - main/vcl/Library_vclplug_kde4.mk | 1 - main/vcl/Library_vclplug_svp.mk | 1 - main/vcl/source/gdi/sallayout.cxx | 2 ++ main/vcl/source/glyphs/gcach_layout.cxx | 3 ++- main/vcl/source/glyphs/graphite_layout.cxx | 2 ++ 10 files changed, 6 insertions(+), 8 deletions(-) diff --git a/main/vcl/Library_desktop_detector.mk b/main/vcl/Library_desktop_detector.mk index fb122af39d..9c12ed5874 100644 --- a/main/vcl/Library_desktop_detector.mk +++ b/main/vcl/Library_desktop_detector.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\ )) $(call gb_Library_use_externals,desktop_detector,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vcl.mk b/main/vcl/Library_vcl.mk index fe9b9fe860..4059f0c4b2 100644 --- a/main/vcl/Library_vcl.mk +++ b/main/vcl/Library_vcl.mk @@ -87,7 +87,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ )) $(call gb_Library_use_externals,vcl,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vclplug_gen.mk b/main/vcl/Library_vclplug_gen.mk index 73fdf72668..6f7745cdf4 100644 --- a/main/vcl/Library_vclplug_gen.mk +++ b/main/vcl/Library_vclplug_gen.mk @@ -62,7 +62,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\ )) $(call gb_Library_use_externals,vclplug_gen,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vclplug_gtk.mk b/main/vcl/Library_vclplug_gtk.mk index 52d063b41e..1d0f80ff27 100644 --- a/main/vcl/Library_vclplug_gtk.mk +++ b/main/vcl/Library_vclplug_gtk.mk @@ -91,7 +91,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\ )) $(call gb_Library_use_externals,vclplug_gtk,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vclplug_kde.mk b/main/vcl/Library_vclplug_kde.mk index 399320a6a1..74ecd0a9a0 100644 --- a/main/vcl/Library_vclplug_kde.mk +++ b/main/vcl/Library_vclplug_kde.mk @@ -75,7 +75,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ )) $(call gb_Library_use_externals,vclplug_kde,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vclplug_kde4.mk b/main/vcl/Library_vclplug_kde4.mk index 4b30a65f5b..32cf5b0d4b 100644 --- a/main/vcl/Library_vclplug_kde4.mk +++ b/main/vcl/Library_vclplug_kde4.mk @@ -75,7 +75,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ )) $(call gb_Library_use_externals,vclplug_kde4,\ - icule \ icuuc \ ) diff --git a/main/vcl/Library_vclplug_svp.mk b/main/vcl/Library_vclplug_svp.mk index 328202909c..bb32f86f16 100644 --- a/main/vcl/Library_vclplug_svp.mk +++ b/main/vcl/Library_vclplug_svp.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\ )) $(call gb_Library_use_externals,vclplug_svp,\ - icule \ icuuc \ ) diff --git a/main/vcl/source/gdi/sallayout.cxx b/main/vcl/source/gdi/sallayout.cxx index b35f00c406..266bfc3f36 100644 --- a/main/vcl/source/gdi/sallayout.cxx +++ b/main/vcl/source/gdi/sallayout.cxx @@ -43,6 +43,8 @@ #include <limits.h> +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #if defined _MSC_VER #pragma warning(push, 1) #endif diff --git a/main/vcl/source/glyphs/gcach_layout.cxx b/main/vcl/source/glyphs/gcach_layout.cxx index b24812bdcb..5feee5feca 100644 --- a/main/vcl/source/glyphs/gcach_layout.cxx +++ b/main/vcl/source/glyphs/gcach_layout.cxx @@ -24,7 +24,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#define ENABLE_ICU_LAYOUT +//Stopped existing: +//#define ENABLE_ICU_LAYOUT #include <gcach_ftyp.hxx> #include <sallayout.hxx> #include <salgdi.hxx> diff --git a/main/vcl/source/glyphs/graphite_layout.cxx b/main/vcl/source/glyphs/graphite_layout.cxx index cad81d79e5..7dd1847056 100644 --- a/main/vcl/source/glyphs/graphite_layout.cxx +++ b/main/vcl/source/glyphs/graphite_layout.cxx @@ -58,6 +58,8 @@ #include <salgdi.hxx> +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #include <unicode/uchar.h> #include <unicode/ubidi.h> #include <unicode/uscript.h>
