Philipp Hörist pushed to branch master at gajim / gajim
Commits: 4d9197ef by Philipp Hörist at 2018-05-19T09:37:01+02:00 Fix Windows build
- - - - -
2 changed files:
- appveyor.yml - win/_base.sh
Changes:
===================================== appveyor.yml ===================================== --- 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"
===================================== win/_base.sh ===================================== --- 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 +keyring python-gnupg -docutils +python-axolotl qrcode -keyring -pillow==4.3.0 -six "
- 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"
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d9197ef1cadc0419c8f55e91e9d31e1e1d...
--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d9197ef1cadc0419c8f55e91e9d31e1e1d... You're receiving this email because of your account on dev.gajim.org.