diff --git a/0ad-link-icu-76.patch b/0ad-link-icu-76.patch new file mode 100644 index 0000000..ee6a97d --- /dev/null +++ b/0ad-link-icu-76.patch @@ -0,0 +1,20 @@ +Index: 0ad-0.0.26-alpha/build/premake/extern_libs5.lua +=================================================================== +--- 0ad-0.0.26-alpha.orig/build/premake/extern_libs5.lua ++++ 0ad-0.0.26-alpha/build/premake/extern_libs5.lua +@@ -396,6 +396,7 @@ extern_lib_defs = { + add_default_include_paths("icu") + else + pkgconfig.add_includes("icu-i18n") ++ pkgconfig.add_includes("icu-uc") + end + end, + link_settings = function() +@@ -408,6 +409,7 @@ extern_lib_defs = { + }) + else + pkgconfig.add_links("icu-i18n") ++ pkgconfig.add_links("icu-uc") + end + end, + }, diff --git a/0ad.changes b/0ad.changes index cbec427..96fac7e 100644 --- a/0ad.changes +++ b/0ad.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 22 09:16:50 UTC 2024 - Dominique Leuenberger + +- Add 0ad-link-icu-76.patch: Fix build against ICU 76.x. + ------------------------------------------------------------------- Thu Apr 25 22:29:04 UTC 2024 - Aaron Puchert diff --git a/0ad.spec b/0ad.spec index 6d6784f..bf8631a 100644 --- a/0ad.spec +++ b/0ad.spec @@ -52,6 +52,8 @@ Patch4: fix-gcc13-build.patch Patch5: fix-fmt10-build.patch # PATCH-FIX-UPSTREAM -- Fix build with boost 1.85 Patch6: fix-boost-1.85-build.patch +# PATCH-FIX-UPSTREAM -- Fix build with icu 76.x +Patch7: 0ad-link-icu-76.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libXcursor-devel @@ -112,6 +114,7 @@ flexible game engine. %if %{pkg_vcmp libboost_filesystem-devel >= 1.74} %patch -P 6 -p1 %endif +%patch -P 7 -p1 %build export CFLAGS="%{optflags}"