diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a313cb37c2..481b4b6cd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: make gettext git - automake1.16 + automake1.17 libtool autoconf mingw-w64-ucrt-x86_64-7zip diff --git a/doc/README.msys2 b/doc/README.msys2 index 2499fbb57e..003fccb4f0 100644 --- a/doc/README.msys2 +++ b/doc/README.msys2 @@ -10,8 +10,8 @@ using MSYS2 from https://www.msys2.org/ ============== Current official premade MSYS2 environment version info: -[premade]: msys2-freeciv-win64-240516.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240507.exe +[premade]: msys2-freeciv-win64-240810.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20240727.exe See chapter "Premade environment" for what these mean. The info is located here for quick reference for the specific freeciv revision. @@ -75,7 +75,7 @@ is located here for quick reference for the specific freeciv revision. freeciv. - git - - automake1.16 + - automake1.17 - libtool - autoconf2.72 - autoconf-wrapper @@ -155,7 +155,7 @@ Following packages have been installed: - tar - git - patch -- automake1.16 +- automake1.17 - libtool - autoconf2.72 - autoconf-wrapper diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index 19d1aa55d0..bb9ae9b7df 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -79,7 +79,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) ICUVER=75 else -ICUVER=74 +ICUVER=75 endif # @@ -292,6 +292,7 @@ COMMON_DLLS := \ libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ + libnghttp3-9.dll \ libssh2-1.dll \ libcurl-4.dll \ libgmp-10.dll \ @@ -490,6 +491,7 @@ RULEDIT_QT5_DLLS := \ libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ + libnghttp3-9.dll \ libssh2-1.dll \ libcurl-4.dll \ libgmp-10.dll \ @@ -548,6 +550,7 @@ RULEDIT_QT6_DLLS := \ libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ + libnghttp3-9.dll \ libssh2-1.dll \ libcurl-4.dll \ libgmp-10.dll \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index bd53a38acc..e472bc3431 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -73,7 +73,7 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) ICUVER=75 else -ICUVER=74 +ICUVER=75 endif # @@ -236,6 +236,7 @@ COMMON_DLLS := \ libssl-${CRYPTOVERSUF}.dll \ libidn2-0.dll \ libnghttp2-14.dll \ + libnghttp3-9.dll \ libpsl-5.dll \ libssh2-1.dll \ libreadline8.dll \