diff --git a/win/_base.sh b/win/_base.sh index 62d215718..ccb47798c 100644 --- a/win/_base.sh +++ b/win/_base.sh @@ -70,10 +70,14 @@ function create_root { } function install_deps { + # Downgrade GLIB, resolver is broken on Windows 7 + curl -o "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz \ + https://gajim.org/downloads/snap/win/build/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz + build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ - mingw-w64-"${ARCH}"-gstreamer \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-libwebp \ mingw-w64-"${ARCH}"-sqlite3 \ diff --git a/win/misc/depcheck.py b/win/misc/depcheck.py index 01ad4d02a..693794ae6 100644 --- a/win/misc/depcheck.py +++ b/win/misc/depcheck.py @@ -46,7 +46,11 @@ SYSTEM_LIBS = ['advapi32.dll', def get_dependencies(filename): deps = [] - data = subprocess.check_output(["objdump", "-p", filename]) + try: + data = subprocess.check_output(["objdump", "-p", filename]) + except Exception as error: + print(error) + return deps data = data.decode("utf-8") for line in data.splitlines(): line = line.strip()