From 6545eeeee79e09d8575dfcffb6af81e72f4463d7 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Fri, 25 Jan 2019 09:37:25 +0000
Subject: [PATCH] #1883: more dependencies moved to MSYS2

git-svn-id: https://xpra.org/svn/Xpra/trunk@21483 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/win32/MINGW_SETUP.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/win32/MINGW_SETUP.sh b/src/win32/MINGW_SETUP.sh
index 8cdaa1147a..52f08497ff 100644
--- a/src/win32/MINGW_SETUP.sh
+++ b/src/win32/MINGW_SETUP.sh
@@ -38,7 +38,8 @@ $PACMAN --noconfirm -S ${XPKG}gst-python
 #development tools and libs for building extra packages:
 $PACMAN --noconfirm -S base-devel ${XPKG}yasm ${XPKG}nasm subversion rsync zip gtk-doc ${XPKG}cmake ${XPKG}gcc ${XPKG}pkg-config ${XPKG}libffi ${XPKG}gss ${XPKG}openldap
 #python libraries and packaging tools:
-for x in cryptography cffi pycparser numpy pillow cx_Freeze appdirs paramiko comtypes netifaces rencode; do
+$PACMAN --noconfirm -S ${XPKG}python2-enum34
+for x in cryptography cffi pycparser numpy pillow cx_Freeze appdirs paramiko comtypes netifaces rencode websocket-client setproctitle pyu2f ldap ldap3 bcrypt pynacl; do
 	$PACMAN --noconfirm -S ${XPKG}python2-${x}
 	$PACMAN --noconfirm -S ${XPKG}python3-${x}
 done
@@ -46,17 +47,15 @@ done
 $PACMAN --noconfirm -S ${XPKG}python2-ipaddress
 $PACMAN --noconfirm -S ${XPKG}cython2 ${XPKG}python2-setuptools
 $PACMAN --noconfirm -S ${XPKG}cython
-#using easy-install for python libraries which are not packaged by mingw:
-#build pynacl against the system library:
-export SODIUM_INSTALL=system
-easy_install-2.7 -U -Z enum34 enum-compat
-for x in lz4 websocket-client websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl; do
+#using easy-install for python libraries which are not yet packaged by mingw:
+easy_install-2.7 -U -Z enum-compat
+for x in lz4 websockify nvidia-ml-py; do
     easy_install-2.7 -U -Z $x
     easy_install-3.7 -U -Z $x
 done
-#last version to support python2:
+#use the last version to support python2 (not the broken one in mingw):
 easy_install-2.7 -U -Z zeroconf==0.19.1
-easy_install-3.7 -U -Z zeroconf
+$PACMAN --noconfirm -S ${XPKG}python3-zeroconf
 
 #pyopengl problems:
 #use 3.1.1a1 as there are bugs in later versions on win32: