From 60b3a1d02e581f678ea85ed331abda34c02f37e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Mon, 7 Jan 2019 20:49:37 +0100
Subject: [PATCH] Windows: Downgrade to Gtk 3.24.1

---
 win/_base.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/win/_base.sh b/win/_base.sh
index 1ceaa390e..eda7316a9 100644
--- a/win/_base.sh
+++ b/win/_base.sh
@@ -69,13 +69,20 @@ function create_root {
     build_pacman --noconfirm -S base
 }
 
-function install_deps {
-    # Downgrade GLIB, resolver is broken on Windows 7
-    curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \
-        https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
-    build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
+function download_install_dep () {
+    curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \
+    http://repo.msys2.org/mingw/"${ARCH}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
+    build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
+}
 
-    build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
+function install_deps {
+
+    # Downgrade GLIB, resolver is broken on Windows 7
+    download_install_dep glib2-2.56.2-1
+    # Downgrade Gtk, Gtk 24.2 has broken keyboard layout change
+    download_install_dep gtk3-3.24.1-1
+
+    build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
         mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
         mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \
         mingw-w64-"${ARCH}"-adwaita-icon-theme \