@@ -1,30 +1,30 @@ | |||
PACKAGE=qt | |||
$(package)_version=5.6.1 | |||
$(package)_download_path=http://download.qt.io/official_releases/qt/5.6/$($(package)_version)/submodules | |||
$(package)_version=5.7.1 | |||
$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules | |||
$(package)_suffix=opensource-src-$($(package)_version).tar.gz | |||
$(package)_file_name=qtbase-$($(package)_suffix) | |||
$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde | |||
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410 | |||
$(package)_dependencies=openssl | |||
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext | |||
$(package)_build_subdir=qtbase | |||
$(package)_qt_libs=corelib network widgets gui plugins testlib | |||
$(package)_patches=mac-qmake.conf configure-xcoderun.patch mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch | |||
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch | |||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) | |||
$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028 | |||
$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d | |||
$(package)_qttools_file_name=qttools-$($(package)_suffix) | |||
$(package)_qttools_sha256_hash=e0f845de28c31230dfa428f0190ccb3b91d1fc02481b1f064698ae4ef8376aa1 | |||
$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f | |||
$(package)_extra_sources = $($(package)_qttranslations_file_name) | |||
$(package)_extra_sources += $($(package)_qttools_file_name) | |||
define $(package)_set_vars | |||
$(package)_config_opts_release = -release | |||
$(package)_config_opts_debug = -debug | |||
$(package)_config_opts_debug = -debug | |||
$(package)_config_opts += -bindir $(build_prefix)/bin | |||
$(package)_config_opts += -c++11 | |||
$(package)_config_opts += -c++std c++11 | |||
$(package)_config_opts += -confirm-license | |||
$(package)_config_opts += -dbus-runtime | |||
$(package)_config_opts += -hostprefix $(build_prefix) | |||
@@ -46,7 +46,6 @@ $(package)_config_opts += -no-linuxfb | |||
$(package)_config_opts += -no-libudev | |||
$(package)_config_opts += -no-mitshm | |||
$(package)_config_opts += -no-mtdev | |||
$(package)_config_opts += -no-nis | |||
$(package)_config_opts += -no-pulseaudio | |||
$(package)_config_opts += -no-openvg | |||
$(package)_config_opts += -no-reduce-relocations | |||
@@ -134,7 +133,6 @@ define $(package)_preprocess_cmds | |||
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\ | |||
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ | |||
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ | |||
patch -p1 < $($(package)_patch_dir)/configure-xcoderun.patch && \ | |||
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \ | |||
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \ | |||
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \ |
@@ -1,25 +0,0 @@ | |||
--- old/qtbase/configure | |||
+++ new/qtbase/configure | |||
@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then | |||
exit 2 | |||
fi | |||
- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then | |||
+ if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then | |||
echo >&2 | |||
echo " Xcode not set up properly. You may need to confirm the license" >&2 | |||
echo " agreement by running /usr/bin/xcodebuild without arguments." >&2 | |||
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf | |||
index 0cc8cd6..5df99d1 100644 | |||
--- old/qtbase/mkspecs/features/mac/default_pre.prf | |||
+++ new/qtbase/mkspecs/features/mac/default_pre.prf | |||
@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { | |||
error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") | |||
# Make sure Xcode is set up properly | |||
- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \ | |||
+ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ | |||
error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") | |||
} | |||
@@ -1,6 +1,6 @@ | |||
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000 | |||
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000 | |||
@@ -74,8 +74,6 @@ | |||
--- 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 | |||
@@ -9,18 +9,18 @@ | |||
CONFIG += qpa/genericunixfontdatabase | |||
@@ -87,7 +85,8 @@ | |||
@@ -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$$OUT_PWD/xcb-static -lxcb-static | |||
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 2015-03-17 02:07:04.641929383 +0000 | |||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000 | |||
--- 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 | |||
@@ -31,8 +31,8 @@ | |||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB | |||
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB | |||
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400 | |||
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400 | |||
--- 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 |
@@ -1,6 +1,6 @@ | |||
--- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000 | |||
+++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000 | |||
@@ -244,7 +244,7 @@ | |||
--- 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 |
@@ -1,6 +1,6 @@ | |||
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:40:20.956781548 -0400 | |||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:29:32.052772416 -0400 | |||
@@ -69,7 +69,7 @@ | |||
--- 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> | |||
@@ -9,8 +9,8 @@ | |||
# include <comdef.h> | |||
#endif | |||
@@ -762,7 +762,7 @@ | |||
HWND_MESSAGE, NULL, (HINSTANCE)GetModuleHandle(0), NULL); | |||
@@ -814,7 +814,7 @@ | |||
HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL); | |||
} | |||
-#ifndef Q_OS_WINCE | |||
@@ -18,16 +18,16 @@ | |||
// 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). | |||
@@ -781,7 +781,7 @@ | |||
return QStringLiteral("IDispatch error #") + QString::number(wCode); | |||
return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16); | |||
@@ -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. | |||
@@ -846,12 +846,12 @@ | |||
@@ -901,12 +901,12 @@ | |||
default: | |||
break; | |||
} |
@@ -1,7 +1,7 @@ | |||
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 2015-06-29 22:04:40.000000000 +0200 | |||
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h 2015-11-01 12:55:59.751234846 +0100 | |||
@@ -124,10 +124,18 @@ | |||
--- 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 **); | |||
@@ -21,9 +21,9 @@ diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/ | |||
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 2015-06-29 22:04:40.000000000 +0200 | |||
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp 2015-11-01 13:41:09.503149772 +0100 | |||
@@ -1008,7 +1008,11 @@ | |||
--- 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; | |||
} |