forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add missing patches to build dependencies
- Loading branch information
Showing
5 changed files
with
156 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- a/biplist/__init__.py 2014-10-26 19:03:11.000000000 +0000 | ||
+++ b/biplist/__init__.py 2016-07-19 19:30:17.663521999 +0000 | ||
@@ -541,7 +541,7 @@ | ||
return HashableWrapper(n) | ||
elif isinstance(root, dict): | ||
n = {} | ||
- for key, value in iteritems(root): | ||
+ for key, value in sorted(iteritems(root)): | ||
n[self.wrapRoot(key)] = self.wrapRoot(value) | ||
return HashableWrapper(n) | ||
elif isinstance(root, list): | ||
@@ -616,7 +616,7 @@ | ||
elif isinstance(obj, dict): | ||
size = proc_size(len(obj)) | ||
self.incrementByteCount('dictBytes', incr=1+size) | ||
- for key, value in iteritems(obj): | ||
+ for key, value in sorted(iteritems(obj)): | ||
check_key(key) | ||
self.computeOffsets(key, asReference=True) | ||
self.computeOffsets(value, asReference=True) | ||
@@ -714,7 +714,7 @@ | ||
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: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
diff -dur a/mac_alias/alias.py b/mac_alias/alias.py | ||
--- a/mac_alias/alias.py 2015-10-19 12:12:48.000000000 +0200 | ||
+++ b/mac_alias/alias.py 2016-04-03 12:13:12.037159417 +0200 | ||
@@ -243,10 +243,10 @@ | ||
alias = Alias() | ||
alias.appinfo = appinfo | ||
|
||
- alias.volume = VolumeInfo (volname.replace('/',':'), | ||
+ alias.volume = VolumeInfo (volname.decode().replace('/',':'), | ||
voldate, fstype, disktype, | ||
volattrs, volfsid) | ||
- alias.target = TargetInfo (kind, filename.replace('/',':'), | ||
+ alias.target = TargetInfo (kind, filename.decode().replace('/',':'), | ||
folder_cnid, cnid, | ||
crdate, creator_code, type_code) | ||
alias.target.levels_from = levels_from | ||
@@ -261,9 +261,9 @@ | ||
b.read(1) | ||
|
||
if tag == TAG_CARBON_FOLDER_NAME: | ||
- alias.target.folder_name = value.replace('/',':') | ||
+ alias.target.folder_name = value.decode().replace('/',':') | ||
elif tag == TAG_CNID_PATH: | ||
- alias.target.cnid_path = struct.unpack(b'>%uI' % (length // 4), | ||
+ alias.target.cnid_path = struct.unpack('>%uI' % (length // 4), | ||
value) | ||
elif tag == TAG_CARBON_PATH: | ||
alias.target.carbon_path = value | ||
@@ -298,9 +298,9 @@ | ||
alias.target.creation_date \ | ||
= mac_epoch + datetime.timedelta(seconds=seconds) | ||
elif tag == TAG_POSIX_PATH: | ||
- alias.target.posix_path = value | ||
+ alias.target.posix_path = value.decode() | ||
elif tag == TAG_POSIX_PATH_TO_MOUNTPOINT: | ||
- alias.volume.posix_path = value | ||
+ alias.volume.posix_path = value.decode() | ||
elif tag == TAG_RECURSIVE_ALIAS_OF_DISK_IMAGE: | ||
alias.volume.disk_image_alias = Alias.from_bytes(value) | ||
elif tag == TAG_USER_HOME_LENGTH_PREFIX: | ||
@@ -422,13 +422,13 @@ | ||
# (so doing so is ridiculous, and nothing could rely on it). | ||
b.write(struct.pack(b'>h28pI2shI64pII4s4shhI2s10s', | ||
self.target.kind, | ||
- carbon_volname, voldate, | ||
+ carbon_volname, int(voldate), | ||
self.volume.fs_type, | ||
self.volume.disk_type, | ||
self.target.folder_cnid, | ||
carbon_filename, | ||
self.target.cnid, | ||
- crdate, | ||
+ int(crdate), | ||
self.target.creator_code, | ||
self.target.type_code, | ||
self.target.levels_from, | ||
@@ -449,12 +449,12 @@ | ||
|
||
b.write(struct.pack(b'>hhQhhQ', | ||
TAG_HIGH_RES_VOLUME_CREATION_DATE, | ||
- 8, long(voldate * 65536), | ||
+ 8, int(voldate * 65536), | ||
TAG_HIGH_RES_CREATION_DATE, | ||
- 8, long(crdate * 65536))) | ||
+ 8, int(crdate * 65536))) | ||
|
||
if self.target.cnid_path: | ||
- cnid_path = struct.pack(b'>%uI' % len(self.target.cnid_path), | ||
+ cnid_path = struct.pack('>%uI' % len(self.target.cnid_path), | ||
*self.target.cnid_path) | ||
b.write(struct.pack(b'>hh', TAG_CNID_PATH, | ||
len(cnid_path))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- old/qtbase/mkspecs/features/qt_module.prf | ||
+++ new/qtbase/mkspecs/features/qt_module.prf | ||
@@ -245,7 +245,7 @@ | ||
load(qt_targets) | ||
|
||
# this builds on top of qt_common | ||
-!internal_module:!lib_bundle:if(unix|mingw) { | ||
+unix|mingw { | ||
CONFIG += create_pc | ||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
host_build: \ |
22 changes: 22 additions & 0 deletions
22
depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 9114d3957725acd34aa8b8d011585812f3369411 Mon Sep 17 00:00:00 2001 | ||
From: Jeroen Ooms <jeroenooms@gmail.com> | ||
Date: Tue, 20 Oct 2015 13:10:38 +0200 | ||
Subject: [PATCH] enable static libraries on mingw | ||
|
||
--- | ||
configure.ac | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/configure.ac b/configure.ac | ||
index 393505b..e92131a 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -265,7 +265,7 @@ case "${host_os}" in | ||
libzmq_dso_visibility="no" | ||
|
||
if test "x$enable_static" = "xyes"; then | ||
- AC_MSG_ERROR([Building static libraries is not supported under MinGW32]) | ||
+ CPPFLAGS="-DZMQ_STATIC" | ||
fi | ||
|
||
# Set FD_SETSIZE to 1024 |
22 changes: 22 additions & 0 deletions
22
depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 9e6745c12e0b100cd38acecc16ce7db02905e27c Mon Sep 17 00:00:00 2001 | ||
From: David Millard <dmillard10@gmail.com> | ||
Date: Tue, 10 May 2016 13:53:53 -0700 | ||
Subject: [PATCH] Fix autotools for static MinGW builds | ||
|
||
--- | ||
configure.ac | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/configure.ac b/configure.ac | ||
index 5a0fa14..def6ea7 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -259,7 +259,7 @@ case "${host_os}" in | ||
libzmq_dso_visibility="no" | ||
|
||
if test "x$enable_static" = "xyes"; then | ||
- CPPFLAGS="-DZMQ_STATIC" | ||
+ CPPFLAGS="-DZMQ_STATIC $CPPFLAGS" | ||
fi | ||
|
||
# Set FD_SETSIZE to 1024 |