diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 6d862bb237..8a1615c534 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -78,7 +78,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`flex`](flex/) | flex | 2.6.4 | https://github.com/westes/flex | | [`fontconfig`](fontconfig/) | Fontconfig | 2.14.0 | https://www.freedesktop.org/wiki/Software/fontconfig/ | | [`fotaq`](fotaq/) | Flight of the Amazon Queen | 1.0 | https://www.scummvm.org/games/#games-queen | -| [`freeciv`](freeciv/) | Freeciv | 3.0.0-beta2 | http://freeciv.org/ | +| [`freeciv`](freeciv/) | Freeciv | 3.0.8 | http://freeciv.org/ | | [`freedink`](freedink/) | FreeDink | 109.6 | https://www.gnu.org/software/freedink/ | | [`freetype`](freetype/) | FreeType | 2.13.0 | https://www.freetype.org/ | | [`frotz`](frotz/) | Frotz | 2.54 | https://gitlab.com/DavidGriffith/frotz | diff --git a/Ports/freeciv/package.sh b/Ports/freeciv/package.sh index 3132d2d45e..d8b49c54bf 100755 --- a/Ports/freeciv/package.sh +++ b/Ports/freeciv/package.sh @@ -1,11 +1,11 @@ #!/usr/bin/env -S bash ../.port_include.sh port=freeciv -version=3.0.0-beta2 +version=3.0.8 useconfigure=true use_fresh_config_sub=true config_sub_paths=("bootstrap/config.sub") configopts=("--enable-client=sdl2" "--enable-fcmp=no") -files="http://files.freeciv.org/beta/freeciv-${version}.tar.xz freeciv-${version}.tar.xz 9f44dc28068b239c18bda68192ddb27622030880f8ab9c17f777eac28391269e" +files="http://files.freeciv.org/stable/freeciv-${version}.tar.xz freeciv-${version}.tar.xz 3b5aa32f628890be1741c3ac942cee82c79c065f8db6baff18d734a5c0e776d4" depends=("SDL2" "SDL2_image" "SDL2_mixer" "SDL2_ttf" "SDL2_gfx" "zstd" "libicu" "xz" "gettext" "curl") launcher_name=Freeciv launcher_category=Games diff --git a/Ports/freeciv/patches/0001-Log-to-dev-null-if-the-log-file-doesn-t-exist.patch b/Ports/freeciv/patches/0001-Log-to-dev-null-if-the-log-file-doesn-t-exist.patch deleted file mode 100644 index e53dca54e8..0000000000 --- a/Ports/freeciv/patches/0001-Log-to-dev-null-if-the-log-file-doesn-t-exist.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gunnar Beutner -Date: Fri, 4 Jun 2021 23:20:55 +0200 -Subject: [PATCH] Log to /dev/null if the log file doesn't exist - ---- - client/connectdlg_common.c | 22 ++++++++++++++-------- - 1 file changed, 14 insertions(+), 8 deletions(-) - -diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c -index 0afef96..d931378 100644 ---- a/client/connectdlg_common.c -+++ b/client/connectdlg_common.c -@@ -302,6 +302,7 @@ bool client_start_server(void) - char dbg_lvl_buf[32]; /* Do not move this inside the block where it gets filled, - * it's needed via the argv[x] pointer later on, so must - * remain in scope. */ -+ bool log_to_dev_null = FALSE; - - /* Set up the command-line parameters. */ - fc_snprintf(port_buf, sizeof(port_buf), "%d", internal_server_port); -@@ -376,16 +377,21 @@ bool client_start_server(void) - fclose(stdout); - fclose(stderr); - -- /* FIXME: include the port to avoid duplication? */ -- if (logfile) { -+ if (!logfile) { -+ log_to_dev_null = TRUE; -+ fd = open("/dev/null", O_WRONLY); -+ } else { -+ /* FIXME: include the port to avoid duplication? */ - fd = open(logfile, O_WRONLY | O_CREAT | O_APPEND, 0644); -+ } - -- if (fd != 1) { -- dup2(fd, 1); -- } -- if (fd != 2) { -- dup2(fd, 2); -- } -+ if (fd != 1) { -+ dup2(fd, 1); -+ } -+ if (fd != 2) { -+ dup2(fd, 2); -+ } -+ if (!log_to_dev_null) { - fchmod(1, 0644); - } - diff --git a/Ports/freeciv/patches/ReadMe.md b/Ports/freeciv/patches/ReadMe.md deleted file mode 100644 index 286ff85f45..0000000000 --- a/Ports/freeciv/patches/ReadMe.md +++ /dev/null @@ -1,7 +0,0 @@ -# Patches for freeciv on SerenityOS - -## `0001-Log-to-dev-null-if-the-log-file-doesn-t-exist.patch` - -Log to /dev/null if the log file doesn't exist - -