diff --git a/appveyor.yml b/appveyor.yml index acae29ab3..569653c1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: - - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 + - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20 - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" diff --git a/win/_base.sh b/win/_base.sh index a81c1903d..750631268 100644 --- a/win/_base.sh +++ b/win/_base.sh @@ -80,28 +80,26 @@ function install_deps { mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools - - build_pip install setuptools_scm + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six PIP_REQUIREMENTS="\ -certifi git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://github.com/dlitz/pycrypto.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git -cryptography -pyopenssl -python-gnupg -docutils -qrcode keyring -pillow==4.3.0 -six +python-gnupg +python-axolotl +qrcode " - build_pip install --no-binary ":all:" \ - --force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) - build_pip install python-axolotl + build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) # remove the large png icons, they should be used rarely and svg works fine rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512"