Skip to content
Snippets Groups Projects
Commit 30d21d82 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Windows: Fix build

MSYS removed python2 support
parent 965b4a6f
No related branches found
No related tags found
No related merge requests found
......@@ -57,8 +57,11 @@ function build_compileall {
function install_pre_deps {
pacman -S --needed --noconfirm p7zip \
mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"
wget \
intltool \
mingw-w64-"${ARCH}"-nsis \
mingw-w64-"${ARCH}"-toolchain \
mingw-w64-"${ARCH}"-python
}
function create_root {
......@@ -73,9 +76,9 @@ function create_root {
}
function install_deps {
build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \
build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \
mingw-w64-"${ARCH}"-python-gobject \
mingw-w64-"${ARCH}"-python-pip \
mingw-w64-"${ARCH}"-adwaita-icon-theme \
mingw-w64-"${ARCH}"-libwebp \
mingw-w64-"${ARCH}"-sqlite3 \
......@@ -83,13 +86,13 @@ function install_deps {
mingw-w64-"${ARCH}"-gspell \
mingw-w64-"${ARCH}"-hunspell \
mingw-w64-"${ARCH}"-libsoup \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pygments
mingw-w64-"${ARCH}"-python-setuptools \
mingw-w64-"${ARCH}"-python-pillow \
mingw-w64-"${ARCH}"-python-setuptools-scm \
mingw-w64-"${ARCH}"-python-pyopenssl \
mingw-w64-"${ARCH}"-python-certifi \
mingw-w64-"${ARCH}"-python-six \
mingw-w64-"${ARCH}"-python-pygments
build_pip install precis-i18n
......@@ -173,7 +176,7 @@ function install_gajim {
function cleanup_install {
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-shared-mime-info \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true
mingw-w64-"${ARCH}"-python-pip mingw-w64-"${ARCH}"-ncurses || true
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment