From 4cceb84d1c4a43fe4f984e6e4126c08175a97c6d Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Wed, 2 Aug 2017 10:31:54 -0700
Subject: Update third party DMG dependencies

mac_alias is updated from 2.0.4 to 2.0.6 and biplist is updated from
1.0.1 to 1.0.2 since pip has trouble properly updating packages,
so now we download all packages directly from our Git forks.

Change-Id: Ia8533b90a19483763f6e48693124361eb32c3651
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../python/lib/python2.7/site-packages/biplist/__init__.py |  7 +++++--
 .../lib/python2.7/site-packages/mac_alias/bookmark.py      | 14 ++++----------
 .../python2.7/site-packages/mac_alias/qt_attribution.json  |  2 +-
 src/3rdparty/python/update.sh                              |  6 +++++-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py b/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py
index 9cab05ec3..17d35178d 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py
+++ b/src/3rdparty/python/lib/python2.7/site-packages/biplist/__init__.py
@@ -507,6 +507,9 @@ class StringWrapper(object):
         else:
             return len(self.encodedValue)//2
     
+    def __lt__(self, other):
+        return self.encodedValue < other.encodedValue
+    
     @property
     def encodingMarker(self):
         if self.encoding == 'ascii':
@@ -770,7 +773,7 @@ class PlistWriter(object):
                     output += proc_variable_length(0b1010, len(obj))
             
                 objectsToWrite = []
-                for objRef in obj:
+                for objRef in sorted(obj) if isinstance(obj, set) else obj:
                     (isNew, output) = self.writeObjectReference(objRef, output)
                     if isNew:
                         objectsToWrite.append(objRef)
@@ -781,7 +784,7 @@ class PlistWriter(object):
                 keys = []
                 values = []
                 objectsToWrite = []
-                for key, value in iteritems(obj):
+                for key, value in sorted(iteritems(obj)):
                     keys.append(key)
                     values.append(value)
                 for key in keys:
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py
index 409ed8297..0de6b9404 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py
+++ b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/bookmark.py
@@ -317,6 +317,9 @@ class Bookmark (object):
         if len(data) < 16:
             raise ValueError('Not a bookmark file (too short)')
 
+        if isinstance(data, bytearray):
+            data = bytes(data)
+
         magic,size,dummy,hdrsize = struct.unpack(b'<4sIII', data[0:16])
 
         if magic != b'book':
@@ -508,7 +511,7 @@ class Bookmark (object):
             # binary search to find data
             entries.sort()
 
-            tocs.append((tid, b''.join([struct.pack('<III',k,o,0)
+            tocs.append((tid, b''.join([struct.pack(b'<III',k,o,0)
                                         for k,o in entries])))
 
         first_toc_offset = offset
@@ -595,9 +598,6 @@ class Bookmark (object):
 
         foldername = os.path.basename(dirname)
 
-        print(repr(path))
-        print(repr(vol_path))
-        
         rel_path = os.path.relpath(path, vol_path)
 
         # Build the path arrays
@@ -624,12 +624,6 @@ class Bookmark (object):
         volprops = Data(struct.pack(b'<QQQ', 0x81 | kCFURLVolumeSupportsPersistentIDs,
                                     0x13ef | kCFURLVolumeSupportsPersistentIDs, 0))
 
-        print(repr(name_path))
-        print(repr(cnid_path))
-        print(repr(fileprops))
-        print(repr(vol_path))
-        print(repr(vol_name))
-
         toc = {
             kBookmarkPath: name_path,
             kBookmarkCNIDPath: cnid_path,
diff --git a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json
index 2c4bdccc5..968b6318c 100644
--- a/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json
+++ b/src/3rdparty/python/lib/python2.7/site-packages/mac_alias/qt_attribution.json
@@ -5,7 +5,7 @@
     "QtUsage": "Used in the qbs dmg module for building Apple disk images.",
     "Description": "Generate/parse Mac OS Alias records from Python",
     "Homepage": "https://github.com/al45tair/mac_alias",
-    "Version": "2.0.4",
+    "Version": "2.0.6",
     "License": "MIT License",
     "LicenseId": "MIT",
     "LicenseFile": "LICENSE",
diff --git a/src/3rdparty/python/update.sh b/src/3rdparty/python/update.sh
index 2eb3138c9..6d6ade63f 100755
--- a/src/3rdparty/python/update.sh
+++ b/src/3rdparty/python/update.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
-pip install -U --isolated --prefix=$PWD --no-binary :all: --no-compile --no-deps biplist dmgbuild ds_store mac_alias
+repos=(biplist.git@v1.0.2 dmgbuild.git@v1.3.1 ds_store@v1.1.2 mac_alias.git@v2.0.6)
+for repo in "${repos[@]}" ; do
+    pip install -U --isolated "--prefix=$PWD" --no-binary :all: --no-compile --no-deps \
+        "git+git://github.com/qbs/$repo"
+done
 rm lib/python2.7/site-packages/dmgbuild/resources/*.tiff
-- 
cgit v1.2.3