Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
-
60b3a1d0
by Philipp Hörist at 2019-01-07T19:49:37Z
1 changed file:
Changes:
| ... | ... | @@ -69,13 +69,20 @@ function create_root { |
| 69 | 69 |
build_pacman --noconfirm -S base
|
| 70 | 70 |
}
|
| 71 | 71 |
|
| 72 |
+function download_install_dep () {
|
|
| 73 |
+ curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz \
|
|
| 74 |
+ http://repo.msys2.org/mingw/"${ARCH}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
|
|
| 75 |
+ build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-"$1"-any.pkg.tar.xz
|
|
| 76 |
+}
|
|
| 77 |
+ |
|
| 72 | 78 |
function install_deps {
|
| 79 |
+ |
|
| 73 | 80 |
# Downgrade GLIB, resolver is broken on Windows 7
|
| 74 |
- curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \
|
|
| 75 |
- https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
|
|
| 76 |
- build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
|
|
| 81 |
+ download_install_dep glib2-2.56.2-1
|
|
| 82 |
+ # Downgrade Gtk, Gtk 24.2 has broken keyboard layout change
|
|
| 83 |
+ download_install_dep gtk3-3.24.1-1
|
|
| 77 | 84 |
|
| 78 |
- build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
|
|
| 85 |
+ build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
|
|
| 79 | 86 |
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
|
| 80 | 87 |
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \
|
| 81 | 88 |
mingw-w64-"${ARCH}"-adwaita-icon-theme \
|