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


Commits:
5ec32555 by Philipp Hörist at 2023-04-09T13:04:15+02:00
ci: Windows: Update dependencies

- - - - -
7980ed6c by Philipp Hörist at 2023-04-09T13:12:41+02:00
ci: Windows: Remove support for mingw32 in build script

- - - - -


1 changed file:

- win/_base.sh


Changes:

=====================================
win/_base.sh
=====================================
@@ -10,26 +10,20 @@ set -e
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd "${DIR}"
 
-# CONFIG START
 MAJOR_PY_VERSION="3"
 MINOR_PY_VERSION="10"
 PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}"
 BUILD_VERSION="0"
 
-# CONFIG END
-
 MISC="${DIR}"/misc
 PYTHON_ID="python${MAJOR_PY_VERSION}"
-MINGW="mingw32"
+MINGW="mingw64"
 
 QL_VERSION="0.0.0"
 QL_VERSION_DESC="UNKNOWN"
 
 function set_arch {
     ARCH="$1"
-    if [ "$1" == "x86_64" ]; then
-        MINGW="mingw64"
-    fi
 }
 
 function set_build_root {
@@ -76,39 +70,40 @@ function create_root {
 }
 
 function install_deps {
-    build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \
+    build_pacman --noconfirm -S \
+        mingw-w64-"${ARCH}"-python \
+        mingw-w64-"${ARCH}"-python-pip \
         mingw-w64-"${ARCH}"-python-gobject \
+        mingw-w64-"${ARCH}"-python-certifi \
+        mingw-w64-"${ARCH}"-python-cryptography \
+        mingw-w64-"${ARCH}"-python-gssapi \
+        mingw-w64-"${ARCH}"-python-idna \
+        mingw-w64-"${ARCH}"-python-keyring \
+        mingw-w64-"${ARCH}"-python-packaging \
+        mingw-w64-"${ARCH}"-python-pillow \
+        mingw-w64-"${ARCH}"-python-pygments \
+        mingw-w64-"${ARCH}"-python-setuptools \
+        mingw-w64-"${ARCH}"-python-setuptools-scm \
+        mingw-w64-"${ARCH}"-python-six \
+        mingw-w64-"${ARCH}"-gtk3 \
         mingw-w64-"${ARCH}"-gtksourceview4 \
         mingw-w64-"${ARCH}"-gstreamer \
         mingw-w64-"${ARCH}"-gst-plugins-base \
         mingw-w64-"${ARCH}"-gst-plugins-good \
         mingw-w64-"${ARCH}"-gst-libav \
         mingw-w64-"${ARCH}"-gst-python \
-        mingw-w64-"${ARCH}"-farstream \
-        mingw-w64-"${ARCH}"-libnice \
-        mingw-w64-"${ARCH}"-python-pip \
         mingw-w64-"${ARCH}"-adwaita-icon-theme \
-        mingw-w64-"${ARCH}"-libwebp \
-        mingw-w64-"${ARCH}"-libheif \
-        mingw-w64-"${ARCH}"-sqlite3 \
-        mingw-w64-"${ARCH}"-goocanvas \
+        mingw-w64-"${ARCH}"-farstream \
         mingw-w64-"${ARCH}"-gspell \
         mingw-w64-"${ARCH}"-hunspell \
+        mingw-w64-"${ARCH}"-libheif \
+        mingw-w64-"${ARCH}"-libnice \
         mingw-w64-"${ARCH}"-libsoup3 \
-        mingw-w64-"${ARCH}"-python-setuptools \
-        mingw-w64-"${ARCH}"-python-pillow \
-        mingw-w64-"${ARCH}"-python-setuptools-scm \
-        mingw-w64-"${ARCH}"-python-cryptography \
-        mingw-w64-"${ARCH}"-python-certifi \
-        mingw-w64-"${ARCH}"-python-six \
-        mingw-w64-"${ARCH}"-python-pygments \
-        mingw-w64-"${ARCH}"-python-gssapi
-
-        build_pip install precis-i18n
+        mingw-w64-"${ARCH}"-libwebp \
+        mingw-w64-"${ARCH}"-sqlite3
 
     PIP_REQUIREMENTS="\
 git+https://dev.gajim.org/gajim/python-nbxmpp.git
-keyring
 python-gnupg
 python-axolotl
 qrcode
@@ -116,6 +111,7 @@ css_parser
 sentry-sdk
 "
 
+    build_pip install precis-i18n
     build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
 
     # remove the large png icons, they should be used rarely and svg works fine



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/9ab3d5d3afcb39b467e8dd6fdaf46671f4653324...7980ed6c2e0147f2d3231f63c48274226b29e09c

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/9ab3d5d3afcb39b467e8dd6fdaf46671f4653324...7980ed6c2e0147f2d3231f63c48274226b29e09c
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to