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

Commits:

1 changed file:

Changes:

  • win/_base.sh
    ... ... @@ -57,8 +57,11 @@ function build_compileall {
    57 57
     
    
    58 58
     function install_pre_deps {
    
    59 59
         pacman -S --needed --noconfirm p7zip \
    
    60
    -        mingw-w64-"${ARCH}"-nsis wget intltool mingw-w64-"${ARCH}"-toolchain \
    
    61
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"
    
    60
    +        wget \
    
    61
    +        intltool \
    
    62
    +        mingw-w64-"${ARCH}"-nsis \
    
    63
    +        mingw-w64-"${ARCH}"-toolchain \
    
    64
    +        mingw-w64-"${ARCH}"-python
    
    62 65
     }
    
    63 66
     
    
    64 67
     function create_root {
    
    ... ... @@ -73,9 +76,9 @@ function create_root {
    73 76
     }
    
    74 77
     
    
    75 78
     function install_deps {
    
    76
    -    build_pacman --noconfirm -S mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
    
    77
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
    
    78
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \
    
    79
    +    build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \
    
    80
    +        mingw-w64-"${ARCH}"-python-gobject \
    
    81
    +        mingw-w64-"${ARCH}"-python-pip \
    
    79 82
             mingw-w64-"${ARCH}"-adwaita-icon-theme \
    
    80 83
             mingw-w64-"${ARCH}"-libwebp \
    
    81 84
             mingw-w64-"${ARCH}"-sqlite3 \
    
    ... ... @@ -83,13 +86,13 @@ function install_deps {
    83 86
             mingw-w64-"${ARCH}"-gspell \
    
    84 87
             mingw-w64-"${ARCH}"-hunspell \
    
    85 88
             mingw-w64-"${ARCH}"-libsoup \
    
    86
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
    
    87
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
    
    88
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
    
    89
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
    
    90
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
    
    91
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six \
    
    92
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pygments
    
    89
    +        mingw-w64-"${ARCH}"-python-setuptools \
    
    90
    +        mingw-w64-"${ARCH}"-python-pillow \
    
    91
    +        mingw-w64-"${ARCH}"-python-setuptools-scm \
    
    92
    +        mingw-w64-"${ARCH}"-python-pyopenssl \
    
    93
    +        mingw-w64-"${ARCH}"-python-certifi \
    
    94
    +        mingw-w64-"${ARCH}"-python-six \
    
    95
    +        mingw-w64-"${ARCH}"-python-pygments
    
    93 96
     
    
    94 97
             build_pip install precis-i18n
    
    95 98
     
    
    ... ... @@ -173,7 +176,7 @@ function install_gajim {
    173 176
     function cleanup_install {
    
    174 177
     
    
    175 178
         build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-shared-mime-info \
    
    176
    -        mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true
    
    179
    +        mingw-w64-"${ARCH}"-python-pip mingw-w64-"${ARCH}"-ncurses || true
    
    177 180
         build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true
    
    178 181
         build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true
    
    179 182