Просмотр исходного кода

fix(deps): fix bmdm on Debian 13 and hyt on older distros (#5071)

* fix(deps): fix bmdm on Debian 13 and hyt on older distros

Black Mesa: Deathmatch listed libncurses5:i386 on Debian 13, which
trixie no longer packages (there is no libncurses5 or libtinfo5 compat
package). The server does not link against ncurses; dedicated_srv.so
only tries to dlopen the 32-bit libtinfo.so.5 or libncurses.so.5 to
enable readline in the console and prints a warning if they are
missing. The server starts and runs normally without them, so the
dependency is removed, as already done for Ubuntu 24.04 and 26.04.

Hytale listed openjdk-25-jre on Ubuntu 16.04 to 20.04, 23.04 and
23.10 and on Debian 9 to 12, none of which package Java 25 (not even
bookworm-backports). The package is removed from those lists and
check_deps now warns that Java 25 must be installed manually (for
example Eclipse Temurin) or the distro upgraded, unless Java 25 is
already the active java.

* fix(deps): drop the Java vendor example from the hyt warning
Daniel Gibbs 2 дней назад
Родитель
Сommit
afae02c531

+ 1 - 1
lgsm/data/debian-10.csv

@@ -53,7 +53,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/debian-11.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/debian-12.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/debian-13.csv

@@ -13,7 +13,7 @@ bb2,libcurl4-gnutls-dev:i386
 bd
 bf1942,libc6:i386
 bfv,libc6:i386
-bmdm,libncurses5:i386
+bmdm
 bo
 bs
 bt,libicu-dev,dos2unix,libxml2

+ 1 - 1
lgsm/data/debian-9.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/ubuntu-16.04.csv

@@ -55,7 +55,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/ubuntu-18.04.csv

@@ -55,7 +55,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/ubuntu-20.04.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/ubuntu-23.04.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 1 - 1
lgsm/data/ubuntu-23.10.csv

@@ -54,7 +54,7 @@ hl2dm
 hldm
 hldms
 hw,lib32z1
-hyt,openjdk-25-jre
+hyt
 hz
 ins
 inss

+ 11 - 0
lgsm/modules/check_deps.sh

@@ -423,6 +423,17 @@ if [ "${depcheckonly}" != "1" ]; then
 			fn_script_log_warn "${gamename} may require newer .NET runtimes than ${distroname} provides."
 		fi
 	fi
+
+	# Hytale needs Java 25, which Ubuntu before 22.04 and Debian before 13 do not package.
+	if [ "${shortname}" == "hyt" ]; then
+		if { [ "${distroid}" == "ubuntu" ] && [ "${distroversion}" != "22.04" ] && dpkg --compare-versions "${distroversion}" "lt" "24.04"; } || { [ "${distroid}" == "debian" ] && dpkg --compare-versions "${distroversion}" "lt" "13"; }; then
+			if ! echo "${javaversion}" | grep -Eq 'version "(2[5-9]|[3-9][0-9])'; then
+				fn_print_warning_nl "${gamename} requires Java 25, which ${distroname} does not provide."
+				echo -e "Install Java 25 manually or upgrade to Ubuntu 22.04+ or Debian 13+."
+				fn_script_log_warn "${gamename} requires Java 25, which ${distroname} does not provide."
+			fi
+		fi
+	fi
 fi
 
 if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then