Philipp Hörist pushed to branch master at gajim / gajim
Commits:
eca69e39 by Philipp Hörist at 2018-09-15T00:01:40Z
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
- - - - -
2 changed files:
- win/_base.sh
- win/misc/depcheck.py
Changes:
=====================================
win/_base.sh
=====================================
--- 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 \
=====================================
win/misc/depcheck.py
=====================================
--- 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()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/eca69e399bac1fc59ddb6563879c9e407e6ddf2f
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/eca69e399bac1fc59ddb6563879c9e407e6ddf2f
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
