diff options
Diffstat (limited to 'user/openttd')
| -rw-r--r-- | user/openttd/APKBUILD | 13 | ||||
| -rw-r--r-- | user/openttd/icu-77.patch | 31 |
2 files changed, 39 insertions, 5 deletions
diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index b2802c462..9d13b34b0 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd pkgver=14.1 -pkgrel=0 +pkgrel=1 pkgdesc="Simulation game based on Transport Tycoon Deluxe" -url="https://www.openttd.org/en/" +url="https://www.openttd.org/" arch="all" #options="!check" # Test files not shipped in release package. license="GPL-2.0-only" @@ -13,7 +13,9 @@ makedepends="cmake curl-dev dbus-dev fluidsynth-dev fontconfig-dev freetype-dev grfcodec harfbuzz-dev icu-dev libpng-dev lzo-dev mesa-dev sdl2-dev xz-dev zlib-dev" subpackages="$pkgname-doc" -source="https://cdn.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz" +source="https://cdn.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz + icu-77.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -23,7 +25,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} -B build @@ -38,4 +40,5 @@ package() { make -C build DESTDIR="$pkgdir" install } -sha512sums="194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b openttd-14.1-source.tar.xz" +sha512sums="194135cc01457d9ed069c09d8961ad3de681bc9936533ca81ff23099f394bb9a83ef84a0852e85525e258f6149e14fd41cfc5f8e683c0643515005c42fb77e3b openttd-14.1-source.tar.xz +987ab198758c71e67119b3e95e97023d97882dcf235aab56a905f56351c682e822737d5385cb5385f92b6ec1ffef26f05c9997597377670747291a854b045016 icu-77.patch" diff --git a/user/openttd/icu-77.patch b/user/openttd/icu-77.patch new file mode 100644 index 000000000..1840d6d38 --- /dev/null +++ b/user/openttd/icu-77.patch @@ -0,0 +1,31 @@ +From 19c547ba99395db1b922b7291743c6ace664bc39 Mon Sep 17 00:00:00 2001 +From: fundawang <fundawang@yeah.net> +Date: Fri, 1 Nov 2024 11:40:02 +0800 +Subject: [PATCH] Fix: build with icu >= 76 where icu-i18n and icu-uc become + separated + +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 137eb7d0f8ce9..2f0248047506a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ if(NOT OPTION_DEDICATED) + find_package(Fontconfig) + endif() + find_package(Harfbuzz) +- find_package(ICU OPTIONAL_COMPONENTS i18n) ++ find_package(ICU OPTIONAL_COMPONENTS i18n uc) + endif() + endif() + endif() +@@ -331,6 +331,7 @@ if(NOT OPTION_DEDICATED) + link_package(Fontconfig TARGET Fontconfig::Fontconfig) + link_package(Harfbuzz TARGET harfbuzz::harfbuzz) + link_package(ICU_i18n) ++ link_package(ICU_uc) + + if(SDL2_FOUND AND OPENGL_FOUND AND UNIX) + # SDL2 dynamically loads OpenGL if needed, so do not link to OpenGL when |