Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim

Commits: 60b3a1d0 by Philipp Hörist at 2019-01-07T19:49:37Z Windows: Downgrade to Gtk 3.24.1

- - - - -

1 changed file:

- win/_base.sh

Changes:

===================================== win/_base.sh ===================================== @@ -69,13 +69,20 @@ function create_root { build_pacman --noconfirm -S base }

+function download_install_dep () { + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \ + http://repo.msys2.org/mingw/%22$%7BARCH%7D%22/mingw-w64-%22$%7BARCH%7D%22-%2... + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz +} + 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-%22$%7BARCH%7D%22-glib2... - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + 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}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ + 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 \

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/60b3a1d02e581f678ea85ed331abda34c02...