copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Philipp Hörist 2018-09-15 02:01:40 +02:00 committed by Philipp Hörist
parent 4c82937d03
commit 94c3ea57d4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
win/_base.sh
View File

@ -70,10 +70,14 @@ function create_root {
} }
function install_deps { 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}" \ build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \
mingw-w64-"${ARCH}"-gstreamer \
mingw-w64-"${ARCH}"-adwaita-icon-theme \ mingw-w64-"${ARCH}"-adwaita-icon-theme \
mingw-w64-"${ARCH}"-libwebp \ mingw-w64-"${ARCH}"-libwebp \
mingw-w64-"${ARCH}"-sqlite3 \ mingw-w64-"${ARCH}"-sqlite3 \

4
win/misc/depcheck.py
View File

@ -46,7 +46,11 @@ SYSTEM_LIBS = ['advapi32.dll',
def get_dependencies(filename): def get_dependencies(filename):
deps = [] deps = []
try:
data = subprocess.check_output(["objdump", "-p", filename]) data = subprocess.check_output(["objdump", "-p", filename])
except Exception as error:
print(error)
return deps
data = data.decode("utf-8") data = data.decode("utf-8")
for line in data.splitlines(): for line in data.splitlines():
line = line.strip() line = line.strip()