MSYS2: move to supported ucrt64

README.adoc

@@ -6,6 +6,10 @@ for Linux and Windows (macOS also kind of works).
 
 image::docs/fiv.webp["Screenshot of both the browser and the viewer"]
 
+*This project has been superseded by https://git.janouch.name/p/dawn[Dawn].*
+
+'''
+
 Features
 --------
  - Uses a compact thumbnail view, helping you browse collections comfortably.

msys2-configure.sh

@@ -2,21 +2,26 @@
 # msys2-configure.sh: set up an MSYS2-based Meson build (x86-64 by default)
 #
 # Dependencies: AWK, sed, coreutils, cURL, bsdtar (libarchive),
-# wine64, Meson, mingw-w64-binutils, mingw-w64-gcc, pkg-config
+# wine, Meson, mingw-w64-binutils, mingw-w64-gcc, pkg-config
 #
 # We support running directly from within MSYS2 on Windows,
 # albeit while still downloading a complete copy of runtime depencies.
-pkg=${MINGW_PACKAGE_PREFIX:-mingw-w64-x86_64}
-prefix=${MSYSTEM_PREFIX:-/mingw64}
+pkg=${MINGW_PACKAGE_PREFIX:-mingw-w64-ucrt-x86_64}
+prefix=${MSYSTEM_PREFIX:-/ucrt64}
 repo=https://repo.msys2.org/mingw$prefix
 
 chost=${MSYSTEM_CHOST:-x86_64-w64-mingw32}
 carch=${MSYSTEM_CARCH:-x86_64}
 [ "$carch" = "i686" ] && carch=x86
 
+# Wine 11 has removed wine64, so this is only backwards compatibility.
+if command -v wine64 >/dev/null
+then wine() { command wine64 "$@"; }
+fi
+
 if [ -n "$MSYSTEM" ]
 then
-	wine64() { "$@"; }
+	wine() { "$@"; }
 	awk() { command awk -v RS='\r?\n' "$@"; }
 	pacman -S --needed libarchive $pkg-ca-certificates $pkg-gcc $pkg-icoutils \
 		$pkg-librsvg $pkg-meson $pkg-msitools $pkg-pkgconf
@@ -92,9 +97,9 @@ configure() {
 	export XDG_DATA_DIRS=$msys2_root/share
 
 	status Configuring packages
-	wine64 bin/update-mime-database.exe share/mime
-	wine64 bin/glib-compile-schemas.exe share/glib-2.0/schemas
-	wine64 bin/gdk-pixbuf-query-loaders.exe \
+	wine bin/update-mime-database.exe share/mime
+	wine bin/glib-compile-schemas.exe share/glib-2.0/schemas
+	wine bin/gdk-pixbuf-query-loaders.exe \
 		> lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 }
 
@@ -144,8 +149,9 @@ msys2_root=$builddir$prefix
 mkdir -p "$msys2_root"
 cd "$msys2_root"
 dbsync
-fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-libjxl $pkg-perl \
-	$pkg-perl-win32-api $pkg-libwinpthread-git # Because we don't do "provides"?
+fetch $pkg-gtk3 $pkg-lcms2 $pkg-libraw $pkg-libheif $pkg-libjxl \
+	$pkg-perl $pkg-perl-win32-api \
+	$pkg-gcc-libs # Because we don't do "provides"?
 verify
 extract
 configure

msys2-install.sh

@@ -3,10 +3,15 @@ export LC_ALL=C
 cd "$MESON_INSTALL_DESTDIR_PREFIX"
 msys2_root=$1
 
+# Wine 11 has removed wine64, so this is only backwards compatibility.
+if command -v wine64 >/dev/null
+then wine() { command wine64 "$@"; }
+fi
+
 # Support running directly from within MSYS2 on Windows.
 if [ -n "$MSYSTEM" ]
 then
-	wine64() { "$@"; }
+	wine() { "$@"; }
 	awk() { command awk -v RS='\r?\n' "$@"; }
 fi
 
@@ -71,7 +76,7 @@ find share/icons/Adwaita -type f | awk 'BEGIN {
 		print
 }' | xargs rm --
 
-wine64 "$msys2_root"/bin/glib-compile-schemas.exe share/glib-2.0/schemas
+wine "$msys2_root"/bin/glib-compile-schemas.exe share/glib-2.0/schemas
 
 # This may speed up program start-up a little bit.
-wine64 "$msys2_root"/bin/gtk-update-icon-cache-3.0.exe share/icons/Adwaita
+wine "$msys2_root"/bin/gtk-update-icon-cache-3.0.exe share/icons/Adwaita