From b2fc5cd7bda39913ba350d12a7e97720e4a25aa0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 28 Feb 2023 09:15:46 +0200 Subject: [PATCH 21/21] Update msys2 environment to 230220 level - Update to upstream snapshot 230127 See osdn #46673 Signed-off-by: Marko Lindqvist --- doc/README.msys2 | 4 ++-- windows/installer_msys2/Makefile.autotools | 26 ++++++++++++---------- windows/installer_msys2/Makefile.meson | 16 +++++++------ 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/doc/README.msys2 b/doc/README.msys2 index 124b558ab1..4a922dbf1b 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-221223.7z -[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20221216.exe +[premade]: msys2-freeciv-win64-230220.7z +[upstream]: https://repo.msys2.org/distrib/x86_64/msys2-x86_64-20230127.exe See chapter "Premade environment" for what these mean. The info is located here for quick reference for the specific freeciv revision. diff --git a/windows/installer_msys2/Makefile.autotools b/windows/installer_msys2/Makefile.autotools index a1c3803275..c78adcadc6 100644 --- a/windows/installer_msys2/Makefile.autotools +++ b/windows/installer_msys2/Makefile.autotools @@ -62,6 +62,7 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 ICUVER=72 +CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} INSTSUB=${ARCHDIR} @@ -69,11 +70,9 @@ INSTSUB=${ARCHDIR} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} -CERTPATH=/etc +UNISTRING=libunistring-2.dll else -CRYPTOVERSUF=1_1${CRYPTOLIB_SUFFIX} -CERTPATH= +UNISTRING=libunistring-5.dll endif # @@ -337,7 +336,7 @@ install-env-common: # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs - cp -R /$(ARCHDIR)$(CERTPATH)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/ + cp -R /$(ARCHDIR)/etc/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/ DEFAULT_FCMP_DLLS := \ libgdk-3-0.dll \ @@ -348,7 +347,7 @@ DEFAULT_FCMP_DLLS := \ libpangoft2-1.0-0.dll \ libthai-0.dll \ libdatrie-1.dll \ - libunistring-2.dll \ + $(UNISTRING) \ librsvg-2-2.dll install-env-default-fcmp: install-env-common @@ -376,7 +375,7 @@ GTK4_FCMP_DLLS := \ libgraphene-1.0-0.dll \ libharfbuzz-0.dll \ libpangoft2-1.0-0.dll \ - libunistring-2.dll \ + $(UNISTRING) \ libthai-0.dll \ liblzo2-2.dll \ libgraphite2.dll \ @@ -386,7 +385,10 @@ GTK4_FCMP_DLLS := \ libLerc.dll \ libwebp-7.dll \ libdeflate.dll \ - libjbig-0.dll + libjbig-0.dll \ + libsharpyuv-0.dll \ + libEGL.dll \ + libGLESv2.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(GTK4_FCMP_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ @@ -424,7 +426,7 @@ QT5_DLLS := \ libgraphite2.dll \ libpcre2-8-0.dll \ libpcre2-16-0.dll \ - libunistring-2.dll \ + $(UNISTRING) \ libbrotlidec.dll \ libbrotlicommon.dll \ libdouble-conversion.dll \ @@ -446,7 +448,7 @@ QT6_DLLS := \ Qt6Core.dll \ Qt6Gui.dll \ Qt6Widgets.dll \ - libunistring-2.dll \ + $(UNISTRING) \ libpcre2-16-0.dll \ libharfbuzz-0.dll \ libgraphite2.dll \ @@ -463,7 +465,7 @@ install-env-qt6: install-env-common find $(INST_DIR)/$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv-*.mo" -delete RULEDIT_QT5_DLLS := \ - libstdc++-6.dll \ + libstdc++-6.dll \ libcrypto-${CRYPTOVERSUF}.dll \ libpsl-5.dll \ libssl-${CRYPTOVERSUF}.dll \ @@ -521,7 +523,7 @@ install-env-ruledit-qt5: find $(INST_DIR)/$(WINARCH)-ruledit-qt5/share/locale -type f -not -name "freeciv-*.mo" -delete RULEDIT_QT6_DLLS := \ - libstdc++-6.dll \ + libstdc++-6.dll \ libcrypto-${CRYPTOVERSUF}.dll \ libpsl-5.dll \ libssl-${CRYPTOVERSUF}.dll \ diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 3f24497660..c59f0916a0 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -60,16 +60,15 @@ endif MAGICKVER=7.Q16HDRI-10 FFIVER=8 ICUVER=72 +CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} # msys2 has dlls in... DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} -CERTPATH=/etc +UNISTRING=libunistring-2.dll else -CRYPTOVERSUF=1_1${CRYPTOLIB_SUFFIX} -CERTPATH= +UNISTRING=libunistring-5.dll endif # @@ -238,7 +237,7 @@ COMMON_DLLS := \ libltdl-7.dll \ libxml2-2.dll \ libraqm-0.dll \ - libunistring-2.dll \ + $(UNISTRING) \ exchndl.dll \ mgwhelp.dll \ $(SOUND_DLLS) @@ -247,7 +246,7 @@ install-env-common: # Add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ mkdir -p $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs - cp -R /$(ARCHDIR)$(CERTPATH)/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/ + cp -R /$(ARCHDIR)/etc/ssl/certs/ca-bundle.crt $(INST_DIR)/$(WINARCH)-$(GUI)/ssl/certs/ FCMP_GTK3_DLLS := \ libgdk-3-0.dll \ @@ -287,7 +286,10 @@ FCMP_GTK4_DLLS := \ libjbig-0.dll \ libwebp-7.dll \ libdeflate.dll \ - libLerc.dll + libLerc.dll \ + libsharpyuv-0.dll \ + libEGL.dll \ + libGLESv2.dll install-env-gtk4-fcmp: install-env-common cp -R $(addprefix $(DLLPATH_PREFIX), $(FCMP_GTK4_DLLS)) $(INST_DIR)/$(WINARCH)-$(GUI)/ -- 2.39.2