From 4822f25fe67ec677991b261bcc9411d65dffc5ae Mon Sep 17 00:00:00 2001
From: cazfi <cazfi@a0f10bec-cc02-0410-94fc-a9cfff90b4cd>
Date: Wed, 1 Feb 2017 08:38:32 +0000
Subject: [PATCH] Updated msys2 environment to 170126 level.

See patch #8085


git-svn-id: svn://svn.gna.org/svn/freeciv/branches/S2_6@34918 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
---
 doc/README.msys2               | 18 ++++++------------
 win32/installer_msys2/Makefile |  4 +++-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/doc/README.msys2 b/doc/README.msys2
index 5f5c3f5bcf..adc4563d75 100644
--- a/doc/README.msys2
+++ b/doc/README.msys2
@@ -12,8 +12,7 @@ using MSYS2 from http://msys2.github.io
 - Msys1, not msys2, is still the official freeciv Windows Installer
   build method
 - Buildable clients are gtk3, gtk3.22, gtk2, sdl2, and Qt
-  - Official pre-made msys2 environment supports only gtk3-, gtk3.22- and
-    sdl2-client builds
+  - Official pre-made msys2 environment does not support building gtk2-client
 
 
  Setup
@@ -28,9 +27,9 @@ using MSYS2 from http://msys2.github.io
 1) Install MSYS2 following the documentation on their homepage
 
 1.1) Download
- https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20160205.exe
+ https://sourceforge.net/projects/msys2/files/Base/i686/msys2-i686-20161025.exe
  for win32 or
- https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20160205.exe
+ https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-x86_64-20161025.exe
  for win64
 
 1.2) Run it to install MSYS2 on build system
@@ -39,7 +38,6 @@ using MSYS2 from http://msys2.github.io
 > pacman -Syu
 
 2) Install following packages with 'pacman -Su'
-   As of 18-Oct-16, one has to use also '--force' option.
 
 2.1) Packages needed for building freeciv
  These packages are needed even if you don't plan to make installer,
@@ -103,10 +101,6 @@ using MSYS2 from http://msys2.github.io
 
  - mingw-w64-i686-nsis / mingw-w64-x86_64-nsis
 
-2.3) Packages TODO:
-
- - MagickWand support
-
 
  Premade environment
 ====================================
@@ -118,9 +112,9 @@ Current version is
 
 win64 host:
 -----------
-msys2-freeciv-win64-161212.7z, based on
-https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20160921.exe
-with packages updated to 12-Dec-16 level.
+msys2-freeciv-win64-170126.7z, based on
+https://sourceforge.net/projects/msys2/files/Base/x86-64/msys2-x86_64-20161025.exe
+with packages updated to 26-Jan-17 level.
 
 Only win64 target is included - replace <arch> with 'x86_64' in package names below
 
diff --git a/win32/installer_msys2/Makefile b/win32/installer_msys2/Makefile
index c622e813c8..eb82025cd8 100644
--- a/win32/installer_msys2/Makefile
+++ b/win32/installer_msys2/Makefile
@@ -24,7 +24,7 @@ ifeq ($(MIN_WIN_VER),)
 MIN_WIN_VER=0x0601
 endif
 
-INSTSUB=usr/local
+INSTSUB=${ARCHDIR}
 
 # msys2 has dlls in...
 DLLPATH_PREFIX=/$(ARCHDIR)/bin/
@@ -243,6 +243,8 @@ install-env-default-fcmp: install-env-common
 	cp -R /$(ARCHDIR)/share/icons/Adwaita install-$(WINARCH)-$(GUI)/share/icons/
 	mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
 	cp -R /$(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
+	mkdir -p install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/
+	cp -R /$(ARCHDIR)/lib/gdk-pixbuf-2.0/* install-$(WINARCH)-$(GUI)/lib/gdk-pixbuf-2.0/
 	cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
 	find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk30.mo -delete
 
-- 
2.11.4.GIT