Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • appveyor.yml
    ... ... @@ -18,7 +18,7 @@ clone_depth: 1
    18 18
     #   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
    
    19 19
     
    
    20 20
     build_script:
    
    21
    -  - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127
    
    21
    +  - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
    
    22 22
       - ps: |
    
    23 23
             $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
    
    24 24
             $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
    

  • win/_base.sh
    ... ... @@ -80,28 +80,26 @@ function install_deps {
    80 80
             mingw-w64-"${ARCH}"-goocanvas \
    
    81 81
             mingw-w64-"${ARCH}"-gspell \
    
    82 82
             mingw-w64-"${ARCH}"-hunspell \
    
    83
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools
    
    84
    -
    
    85
    -    build_pip install setuptools_scm
    
    83
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
    
    84
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
    
    85
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
    
    86
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \
    
    87
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
    
    88
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \
    
    89
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
    
    90
    +        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six
    
    86 91
     
    
    87 92
         PIP_REQUIREMENTS="\
    
    88
    -certifi
    
    89 93
     git+https://dev.gajim.org/gajim/python-nbxmpp.git
    
    90 94
     git+https://github.com/dlitz/pycrypto.git
    
    91 95
     git+https://dev.gajim.org/lovetox/pybonjour-python3.git
    
    92
    -cryptography
    
    93
    -pyopenssl
    
    96
    +keyring
    
    94 97
     python-gnupg
    
    95
    -docutils
    
    98
    +python-axolotl
    
    96 99
     qrcode
    
    97
    -keyring
    
    98
    -pillow==4.3.0
    
    99
    -six
    
    100 100
     "
    
    101 101
     
    
    102
    -    build_pip install --no-binary ":all:" \
    
    103
    -        --force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
    
    104
    -    build_pip install python-axolotl
    
    102
    +    build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
    
    105 103
     
    
    106 104
         # remove the large png icons, they should be used rarely and svg works fine
    
    107 105
         rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512"