-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
356 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,86 @@ | ||
--- cdrkit-1.1.11.old/genisoimage/tree.c 2008-10-21 19:57:47.000000000 -0400 | ||
+++ cdrkit-1.1.11/genisoimage/tree.c 2013-12-06 00:23:18.489622668 -0500 | ||
@@ -1139,8 +1139,9 @@ | ||
scan_directory_tree(struct directory *this_dir, char *path, | ||
struct directory_entry *de) | ||
{ | ||
- DIR *current_dir; | ||
+ int current_file; | ||
char whole_path[PATH_MAX]; | ||
+ struct dirent **d_list; | ||
struct dirent *d_entry; | ||
struct directory *parent; | ||
int dflag; | ||
@@ -1164,7 +1165,8 @@ | ||
this_dir->dir_flags |= DIR_WAS_SCANNED; | ||
|
||
errno = 0; /* Paranoia */ | ||
- current_dir = opendir(path); | ||
+ //current_dir = opendir(path); | ||
+ current_file = scandir(path, &d_list, NULL, alphasort); | ||
d_entry = NULL; | ||
|
||
/* | ||
@@ -1173,12 +1175,12 @@ | ||
*/ | ||
old_path = path; | ||
|
||
- if (current_dir) { | ||
+ if (current_file >= 0) { | ||
errno = 0; | ||
- d_entry = readdir(current_dir); | ||
+ d_entry = d_list[0]; | ||
} | ||
|
||
- if (!current_dir || !d_entry) { | ||
+ if (current_file < 0 || !d_entry) { | ||
int ret = 1; | ||
|
||
#ifdef USE_LIBSCHILY | ||
@@ -1191,8 +1193,8 @@ | ||
de->isorec.flags[0] &= ~ISO_DIRECTORY; | ||
ret = 0; | ||
} | ||
- if (current_dir) | ||
- closedir(current_dir); | ||
+ if(d_list) | ||
+ free(d_list); | ||
return (ret); | ||
} | ||
#ifdef ABORT_DEEP_ISO_ONLY | ||
@@ -1208,7 +1210,7 @@ | ||
errmsgno(EX_BAD, "use Rock Ridge extensions via -R or -r,\n"); | ||
errmsgno(EX_BAD, "or allow deep ISO9660 directory nesting via -D.\n"); | ||
} | ||
- closedir(current_dir); | ||
+ free(d_list); | ||
return (1); | ||
} | ||
#endif | ||
@@ -1250,13 +1252,13 @@ | ||
* The first time through, skip this, since we already asked | ||
* for the first entry when we opened the directory. | ||
*/ | ||
- if (dflag) | ||
- d_entry = readdir(current_dir); | ||
+ if (dflag && current_file >= 0) | ||
+ d_entry = d_list[current_file]; | ||
dflag++; | ||
|
||
- if (!d_entry) | ||
+ if (current_file < 0) | ||
break; | ||
- | ||
+ current_file--; | ||
/* OK, got a valid entry */ | ||
|
||
/* If we do not want all files, then pitch the backups. */ | ||
@@ -1348,7 +1350,7 @@ | ||
insert_file_entry(this_dir, whole_path, d_entry->d_name); | ||
#endif /* APPLE_HYB */ | ||
} | ||
- closedir(current_dir); | ||
+ free(d_list); | ||
|
||
#ifdef APPLE_HYB | ||
/* |
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,56 @@ | ||
diff -dur a/mac_alias/alias.py b/mac_alias/alias.py | ||
--- a/mac_alias/alias.py | ||
+++ b/mac_alias/alias.py | ||
@@ -258,10 +258,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 | ||
@@ -276,9 +276,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 | ||
@@ -313,9 +313,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: | ||
@@ -467,12 +467,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,49 @@ | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 | ||
@@ -76,8 +76,6 @@ | ||
|
||
DEFINES += $$QMAKE_DEFINES_XCB | ||
LIBS += $$QMAKE_LIBS_XCB | ||
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB | ||
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB | ||
|
||
CONFIG += qpa/genericunixfontdatabase | ||
|
||
@@ -89,7 +87,8 @@ | ||
contains(QT_CONFIG, xcb-qt) { | ||
DEFINES += XCB_USE_RENDER | ||
XCB_DIR = ../../../3rdparty/xcb | ||
- INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude | ||
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() | ||
} else { | ||
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro | ||
@@ -9,7 +9,8 @@ | ||
|
||
XCB_DIR = ../../../../3rdparty/xcb | ||
|
||
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude | ||
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude | ||
+QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude | ||
|
||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB | ||
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB | ||
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro | ||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro | ||
@@ -6,6 +6,13 @@ | ||
qxcbmain.cpp | ||
OTHER_FILES += xcb.json README | ||
|
||
+contains(QT_CONFIG, xcb-qt) { | ||
+ DEFINES += XCB_USE_RENDER | ||
+ XCB_DIR = ../../../3rdparty/xcb | ||
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB | ||
+} | ||
+ | ||
PLUGIN_TYPE = platforms | ||
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin | ||
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = - |
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: \ |
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,44 @@ | ||
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp | ||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp | ||
@@ -77,7 +77,7 @@ | ||
#include <stdlib.h> | ||
#include <stdio.h> | ||
#include <windowsx.h> | ||
-#ifndef Q_OS_WINCE | ||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1)) | ||
# include <comdef.h> | ||
#endif | ||
|
||
@@ -814,7 +814,7 @@ | ||
HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL); | ||
} | ||
|
||
-#ifndef Q_OS_WINCE | ||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1)) | ||
// Re-engineered from the inline function _com_error::ErrorMessage(). | ||
// We cannot use it directly since it uses swprintf_s(), which is not | ||
// present in the MSVCRT.DLL found on Windows XP (QTBUG-35617). | ||
@@ -833,7 +833,7 @@ | ||
return QString::asprintf("IDispatch error #%u", uint(wCode)); | ||
return QString::asprintf("Unknown error 0x0%x", uint(comError.Error())); | ||
} | ||
-#endif // !Q_OS_WINCE | ||
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1)) | ||
|
||
/*! | ||
\brief Common COM error strings. | ||
@@ -901,12 +901,12 @@ | ||
default: | ||
break; | ||
} | ||
-#ifndef Q_OS_WINCE | ||
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1)) | ||
_com_error error(hr); | ||
result += QByteArrayLiteral(" ("); | ||
result += errorMessageFromComError(error); | ||
result += ')'; | ||
-#endif // !Q_OS_WINCE | ||
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1)) | ||
return result; | ||
} | ||
|
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,37 @@ | ||
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/src/plugins/platforms/windows/qwindowscontext.h | ||
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h | ||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h | ||
@@ -136,10 +136,18 @@ | ||
inline void init(); | ||
|
||
typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **); | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, ITEMIDLIST **); | ||
+#else | ||
typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, PIDLIST_ABSOLUTE *); | ||
+#endif | ||
typedef HRESULT (WINAPI *SHGetStockIconInfo)(int , int , _SHSTOCKICONINFO *); | ||
typedef HRESULT (WINAPI *SHGetImageList)(int, REFIID , void **); | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ typedef HRESULT (WINAPI *SHCreateItemFromIDList)(const ITEMIDLIST *, REFIID, void **); | ||
+#else | ||
typedef HRESULT (WINAPI *SHCreateItemFromIDList)(PCIDLIST_ABSOLUTE, REFIID, void **); | ||
+#endif | ||
|
||
SHCreateItemFromParsingName sHCreateItemFromParsingName; | ||
SHGetKnownFolderIDList sHGetKnownFolderIDList; | ||
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | ||
--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | ||
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | ||
@@ -1016,7 +1016,11 @@ | ||
qWarning() << __FUNCTION__ << ": Invalid CLSID: " << url.path(); | ||
return Q_NULLPTR; | ||
} | ||
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3) | ||
+ ITEMIDLIST *idList; | ||
+#else | ||
PIDLIST_ABSOLUTE idList; | ||
+#endif | ||
HRESULT hr = QWindowsContext::shell32dll.sHGetKnownFolderIDList(uuid, 0, 0, &idList); | ||
if (FAILED(hr)) { | ||
qErrnoWarning("%s: SHGetKnownFolderIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString())); |
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 |