Update deps

tmbasic-lang · May 27, 2024 · 3a4eca1 · 3a4eca1
1 parent 50941d4
commit 3a4eca1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/build/files/Dockerfile.build-linux b/build/files/Dockerfile.build-linux
@@ -1,4 +1,4 @@
-FROM alpine:3.19 AS first-stage
+FROM alpine:3.20 AS first-stage
 
 RUN apk update && \
     apk upgrade && \

diff --git a/build/files/deps.mk b/build/files/deps.mk
@@ -570,7 +570,8 @@ $(LIBZIP_DIR)/install: $(LIBZIP_DIR)/download $(CMAKE_DIR)/install $(ZLIB_DIR)/i
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_PREFIX_PATH=$(TARGET_PREFIX) \
 			-DCMAKE_INSTALL_PREFIX=$(TARGET_PREFIX) \
-			$(CMAKE_TOOLCHAIN_FLAG) && \
+			$(CMAKE_TOOLCHAIN_FLAG) \
+			-DCMAKE_C_FLAGS="-Wno-incompatible-pointer-types" && \
 		$(MAKE) && \
 		$(MAKE) install
 	touch $@

diff --git a/build/files/mingw.sh b/build/files/mingw.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 PKG_CONFIG_VERSION=0.29.2
 BINUTILS_VERSION=2.42
 MINGW_VERSION=11.0.1
-GCC_VERSION=13.2.0
+GCC_VERSION=14.1.0
 
 curl -L https://pkg-config.freedesktop.org/releases/pkg-config-$PKG_CONFIG_VERSION.tar.gz | tar -xz &
 curl -L https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.xz | tar -xJ &

diff --git a/build/scripts/depsDownload.sh b/build/scripts/depsDownload.sh
@@ -31,27 +31,27 @@ function downloadFile {
 }
 
 # don't update these versions by hand. instead, run scripts/depsCheck.sh
-ABSEIL_VERSION=14b8a4eac3e5a7b97ba4cc7b7dadf2a85aae8215
+ABSEIL_VERSION=baf07b1f6201e4a6b3f16d87131a558693197c6f
 BINUTILS_VERSION=2.42
-BOOST_VERSION=1.84.0
-CLI11_VERSION=2.4.1
-CMAKE_VERSION=3.28.3
+BOOST_VERSION=1.85.0
+CLI11_VERSION=2.4.2
+CMAKE_VERSION=3.29.3
 FMT_VERSION=10.2.1
 GOOGLETEST_VERSION=1.14.0
 IMMER_VERSION=0.8.1
-LIBUNISTRING_VERSION=1.1
+LIBUNISTRING_VERSION=1.2
 LIBZIP_VERSION=1.10.1
 MICROTAR_VERSION=27076e1b9290e9c7842bb7890a54fcf172406c84
 MPDECIMAL_VERSION=4.0.0
 NAMEOF_VERSION=0.10.4
-NCURSES_VERSION=6.4
-TURBO_VERSION=3251358bb06e277309b9ae678f1c88c315c7f856
-TVISION_VERSION=be6e64f85355c6c96b7c09174986fafb6a411c6a
+NCURSES_VERSION=6.5
+TURBO_VERSION=697580ec67fc70e5095b5a5657ef13e92aad29a6
+TVISION_VERSION=966226d643cd638fb516b621ac90a31f3ec8d1f6
 TZDB_VERSION=2024a
 ZLIB_VERSION=1.3.1
 
-# https://github.com/tmbasic-lang/abseil-cpp
-downloadFile "abseil-$ABSEIL_VERSION.tar.gz" "https://github.com/tmbasic-lang/abseil-cpp/archive/$ABSEIL_VERSION.tar.gz"
+# https://github.com/abseil/abseil-cpp
+downloadFile "abseil-$ABSEIL_VERSION.tar.gz" "https://github.com/abseil/abseil-cpp/archive/$ABSEIL_VERSION.tar.gz"
 
 # https://ftp.gnu.org/gnu/binutils
 downloadFile "binutils-$BINUTILS_VERSION.tar.gz" "https://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VERSION.tar.gz"

diff --git a/build/sysroots/Dockerfile.sysroot b/build/sysroots/Dockerfile.sysroot
@@ -1,4 +1,4 @@
-FROM $IMAGE_ARCH/alpine:3.19 AS initial
+FROM $IMAGE_ARCH/alpine:3.20 AS initial
 RUN apk update && apk upgrade && apk add clang linux-headers g++ musl-dev
 
 # Delete anything we won't need when using this as a sysroot for cross-compilation.

diff --git a/src/shared/InputLine.cpp b/src/shared/InputLine.cpp
@@ -13,7 +13,7 @@ InputLine::InputLine(const std::string& text, int width, int aMaxLen)
 InputLine::InputLine(int number, int width, int aMaxLen) : InputLine(std::to_string(number), width, aMaxLen) {}
 
 void InputLine::setText(const std::string& text) {
-    assert(text.size() <= maxLen);
+    assert(text.size() <= static_cast<size_t>(maxLen));
     snprintf(data, maxLen + 1, "%s", text.c_str());
 }