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


Commits:
ae01edfc by Philipp Hörist at 2024-06-14T13:04:12+00:00
revert: Windows: Temporarily downgrade gobject-introspection

- - - - -


2 changed files:

- win/_base.sh
- win/dev_env.sh


Changes:

=====================================
win/_base.sh
=====================================
@@ -101,13 +101,6 @@ function install_deps {
         "${MINGW_PACKAGE_PREFIX}"-webp-pixbuf-loader \
         "${MINGW_PACKAGE_PREFIX}"-sqlite3
 
-    # Temporarily downgrade gobject-introspection, see:
-    # https://github.com/msys2/MINGW-packages/issues/21044
-    build_pacman --noconfirm -U \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-glib2-2.80.0-1-any.pkg.tar.zst
 \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-gobject-introspection-runtime-1.78.1-1-any.pkg.tar.zst
 \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-gobject-introspection-1.78.1-1-any.pkg.tar.zst
-
     PIP_REQUIREMENTS="\
 git+https://dev.gajim.org/gajim/python-nbxmpp.git
 git+https://dev.gajim.org/gajim/omemo-dr.git


=====================================
win/dev_env.sh
=====================================
@@ -42,16 +42,6 @@ function main {
         ${MINGW_PACKAGE_PREFIX}-libwebp \
         ${MINGW_PACKAGE_PREFIX}-sqlite3
 
-    # Temporarily downgrade gobject-introspection, see:
-    # https://github.com/msys2/MINGW-packages/issues/21044
-    pacman --noconfirm -R \
-        "${MINGW_PACKAGE_PREFIX}"-gobject-introspection
-
-    pacman --noconfirm -U \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-glib2-2.80.0-1-any.pkg.tar.zst
 \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-gobject-introspection-runtime-1.78.1-1-any.pkg.tar.zst
 \
-        
https://repo.msys2.org/mingw/mingw64/"${MINGW_PACKAGE_PREFIX}"-gobject-introspection-1.78.1-1-any.pkg.tar.zst
-
     PIP_REQUIREMENTS="\
 git+https://dev.gajim.org/gajim/python-nbxmpp.git
 git+https://dev.gajim.org/gajim/omemo-dr.git



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/ae01edfc603836d629ca6e9266467f6d583598e9

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/ae01edfc603836d629ca6e9266467f6d583598e9
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to