Philipp Hörist pushed to branch master at gajim / gajim
Commits:
e509a681 by Philipp Hörist at 2018-11-11T14:15:10Z
Determine absolut path for custom config folder
When a relative custom config path is passed via commandline, the logic
which decides if a plugin can be deleted from the plugin manager fails
- - - - -
ac5bfe2d by Philipp Hörist at 2018-11-11T14:37:30Z
Windows: Fix build
Fixes #9438
- - - - -
2 changed files:
- gajim/common/configpaths.py
- win/_base.sh
Changes:
=====================================
gajim/common/configpaths.py
=====================================
@@ -69,7 +69,7 @@ def set_profile(profile: str) -> None:
def set_config_root(config_root: str) -> None:
- _paths.custom_config_root = config_root
+ _paths.custom_config_root = str(Path(config_root).resolve())
def init() -> None:
=====================================
win/_base.sh
=====================================
@@ -71,9 +71,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
+ curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \
+
https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
+ build_pacman --noconfirm -U
"${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz
+
+ # Fix broken cryptography package
+ curl -o
"${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz
\
+
https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz
+ build_pacman --noconfirm -U
"${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz
build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3
mingw-w64-"${ARCH}"-"${PYTHON_ID}" \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \
@@ -87,7 +92,6 @@ function install_deps {
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
- mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/62b210a9e5db79413ca1eef90b74698d3357ccfa...ac5bfe2d7c2bc4e917c763fbca3100c0150bb36e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/62b210a9e5db79413ca1eef90b74698d3357ccfa...ac5bfe2d7c2bc4e917c763fbca3100c0150bb36e
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
