Commit eca69e39 authored by Philipp Hörist's avatar Philipp Hörist

Fix Windows build

- Downgrade to glib2 2.56.2 because higher is broken on Windows 7
- Dont abort build if depchecker fails on some files
parent 3b5b4574
......@@ -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 \
......
......@@ -46,7 +46,11 @@ def get_required_by_typelibs():
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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment