From 94538820d35fb8bee2b1b267ec5a87455a0544ae Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Sun, 10 Jan 2016 15:51:23 +0000
Subject: [PATCH] #876: packaging fixes for win32 and osx * osx needs six and
 enum at runtime * win32 needs to be told about "_cffi_backend" * both need
 urllib

git-svn-id: https://xpra.org/svn/Xpra/trunk@11640 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 osx/jhbuild/xpra.modules | 16 ++++++++++++++++
 src/setup.py             | 13 ++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/osx/jhbuild/xpra.modules b/osx/jhbuild/xpra.modules
index 2d396cfbde..976c4ca1d4 100644
--- a/osx/jhbuild/xpra.modules
+++ b/osx/jhbuild/xpra.modules
@@ -330,6 +330,20 @@
 	</dependencies>
   </distutils>
 
+  <distutils id="six">
+	<branch repo="pypi.python.org"
+		module="/packages/source/s/six/six-1.10.0.tar.gz"
+		hash="md5:34eed507548117b2ab523ab14b2f8b55"
+		version="1.10.0"/>
+  </distutils>
+
+  <distutils id="enum">
+	<branch repo="pypi.python.org"
+		module="/packages/source/e/enum/enum-0.4.6.tar.gz"
+		hash="md5:173d468112cfa13a149b2c8af3e8fd52"
+		version="0.4.6"/>
+  </distutils>
+
   <distutils id="python-cryptography">
 	<branch repo="pypi.python.org"
 		module="/packages/source/c/cryptography/cryptography-1.2.1.tar.gz"
@@ -337,6 +351,8 @@
 		version="1.2.1"/>
 	<dependencies>
 		<dep package="cffi"/>
+		<dep package="six"/>
+		<dep package="enum"/>
 	</dependencies>
   </distutils>
 
diff --git a/src/setup.py b/src/setup.py
index 60086b74f2..e57d80904f 100755
--- a/src/setup.py
+++ b/src/setup.py
@@ -300,8 +300,8 @@ def is_msvc():
                     #formats we don't use:
                     "GimpGradientFile", "GimpPaletteFile", "BmpImagePlugin", "TiffImagePlugin",
                     #not used:
-                    "curses", "email", "mimetypes", "mimetools", "pdb",
-                    "urllib", "urllib2", "tty",
+                    "curses", "mimetypes", "mimetools", "pdb",
+                    "urllib2", "tty",
                     "ssl", "_ssl",
                     "cookielib", "BaseHTTPServer", "ftplib", "httplib", "fileinput",
                     "distutils", "setuptools", "doctest"
@@ -1297,8 +1297,6 @@ def do_add_DLLs(*dll_names):
                 #END OF SOUND
 
             if client_ENABLED:
-                #pillow needs urllib:
-                external_excludes.remove("urllib")
                 #pillow links against zlib, but expects the DLL to be named z.dll:
                 data_files.append((os.path.join(gnome_include_path, "libzzz.dll"), "z.dll"))
 
@@ -1703,6 +1701,9 @@ def add_keywords(path_dirs=[], inc_dirs=[], lib_dirs=[], libs=[], noref=True, no
                         "unittest", "difflib",  #avoid numpy warning (not an error)
                         "pydoc")
 
+    #python-cryptography:
+    external_includes.append("_cffi_backend")
+
     if sound_ENABLED:
         if not PYTHON3:
             external_includes += ["pygst", "gst", "gst.extend"]
@@ -1779,9 +1780,7 @@ def run(self):
 
     if OSX:
         #pyobjc needs email.parser
-        external_excludes.remove("email")
-        external_excludes.remove("urllib")
-        external_includes += ["email", "uu", "urllib", "objc", "cups"]
+        external_includes += ["email", "uu", "urllib", "objc", "cups", "six"]
         #OSX package names (ie: gdk-x11-2.0 -> gdk-2.0, etc)
         PYGTK_PACKAGES += ["gdk-2.0", "gtk+-2.0"]
         add_packages("xpra.platform.darwin")