Skip to content

Commit a4a743f

Browse files
overcookedpandaovercookedpanda
committed
re-add qt patches, update qt download link, update docs
1 parent a650369 commit a4a743f

File tree

7 files changed

+143
-27
lines changed

7 files changed

+143
-27
lines changed

‎depends/packages/qt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PACKAGE=qt
22
$(package)_version=5.7.1
3-
$(package)_download_path=https://www.placeh.io/depends-sources/
3+
$(package)_download_path=https://download.qt.io/new_archive/qt/5.7/$($(package)_version)/submodules
44
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
66
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410

‎depends/patches/qt/fix-xcb-include-order.patch

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
2+
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
3+
@@ -76,8 +76,6 @@
4+
5+
DEFINES += $$QMAKE_DEFINES_XCB
6+
LIBS += $$QMAKE_LIBS_XCB
7+
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
8+
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
9+
10+
CONFIG += qpa/genericunixfontdatabase
11+
12+
@@ -89,7 +87,8 @@
13+
contains(QT_CONFIG, xcb-qt) {
14+
DEFINES += XCB_USE_RENDER
15+
XCB_DIR = ../../../3rdparty/xcb
16+
- INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
17+
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
18+
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
19+
LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
20+
} else {
21+
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
22+
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
23+
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
24+
@@ -9,7 +9,8 @@
25+
26+
XCB_DIR = ../../../../3rdparty/xcb
27+
28+
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
29+
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
30+
+QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
31+
32+
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
33+
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
34+
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
35+
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
36+
@@ -6,6 +6,13 @@
37+
qxcbmain.cpp
38+
OTHER_FILES += xcb.json README
39+
40+
+contains(QT_CONFIG, xcb-qt) {
41+
+ DEFINES += XCB_USE_RENDER
42+
+ XCB_DIR = ../../../3rdparty/xcb
43+
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
44+
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
45+
+}
46+
+
47+
PLUGIN_TYPE = platforms
48+
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
49+
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -

‎depends/patches/qt/fix_qt_pkgconfig.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- old/qtbase/mkspecs/features/qt_module.prf
2+
+++ new/qtbase/mkspecs/features/qt_module.prf
3+
@@ -245,7 +245,7 @@
4+
load(qt_targets)
5+
6+
# this builds on top of qt_common
7+
-!internal_module:!lib_bundle:if(unix|mingw) {
8+
+unix|mingw {
9+
CONFIG += create_pc
10+
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
11+
host_build: \

‎depends/patches/qt/mac-qmake.conf.1

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎depends/patches/qt/mingw-uuidof.patch

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
2+
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
3+
@@ -77,7 +77,7 @@
4+
#include <stdlib.h>
5+
#include <stdio.h>
6+
#include <windowsx.h>
7+
-#ifndef Q_OS_WINCE
8+
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
9+
# include <comdef.h>
10+
#endif
11+
12+
@@ -814,7 +814,7 @@
13+
HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL);
14+
}
15+
16+
-#ifndef Q_OS_WINCE
17+
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
18+
// Re-engineered from the inline function _com_error::ErrorMessage().
19+
// We cannot use it directly since it uses swprintf_s(), which is not
20+
// present in the MSVCRT.DLL found on Windows XP (QTBUG-35617).
21+
@@ -833,7 +833,7 @@
22+
return QString::asprintf("IDispatch error #%u", uint(wCode));
23+
return QString::asprintf("Unknown error 0x0%x", uint(comError.Error()));
24+
}
25+
-#endif // !Q_OS_WINCE
26+
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
27+
28+
/*!
29+
\brief Common COM error strings.
30+
@@ -901,12 +901,12 @@
31+
default:
32+
break;
33+
}
34+
-#ifndef Q_OS_WINCE
35+
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
36+
_com_error error(hr);
37+
result += QByteArrayLiteral(" (");
38+
result += errorMessageFromComError(error);
39+
result += ')';
40+
-#endif // !Q_OS_WINCE
41+
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
42+
return result;
43+
}
44+

‎depends/patches/qt/pidlist_absolute.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
2+
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h
3+
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
4+
@@ -136,10 +136,18 @@
5+
inline void init();
6+
7+
typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **);
8+
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3)
9+
+ typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, ITEMIDLIST **);
10+
+#else
11+
typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, PIDLIST_ABSOLUTE *);
12+
+#endif
13+
typedef HRESULT (WINAPI *SHGetStockIconInfo)(int , int , _SHSTOCKICONINFO *);
14+
typedef HRESULT (WINAPI *SHGetImageList)(int, REFIID , void **);
15+
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3)
16+
+ typedef HRESULT (WINAPI *SHCreateItemFromIDList)(const ITEMIDLIST *, REFIID, void **);
17+
+#else
18+
typedef HRESULT (WINAPI *SHCreateItemFromIDList)(PCIDLIST_ABSOLUTE, REFIID, void **);
19+
+#endif
20+
21+
SHCreateItemFromParsingName sHCreateItemFromParsingName;
22+
SHGetKnownFolderIDList sHGetKnownFolderIDList;
23+
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
24+
--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
25+
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
26+
@@ -1016,7 +1016,11 @@
27+
qWarning() << __FUNCTION__ << ": Invalid CLSID: " << url.path();
28+
return Q_NULLPTR;
29+
}
30+
+#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3)
31+
+ ITEMIDLIST *idList;
32+
+#else
33+
PIDLIST_ABSOLUTE idList;
34+
+#endif
35+
HRESULT hr = QWindowsContext::shell32dll.sHGetKnownFolderIDList(uuid, 0, 0, &idList);
36+
if (FAILED(hr)) {
37+
qErrnoWarning("%s: SHGetKnownFolderIDList(%s)) failed", __FUNCTION__, qPrintable(url.toString()));

‎doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These are the dependencies currently used by Placeholder Core. You can find inst
2727
| Qt | [5.7.1](https://download.qt.io/official_releases/qt/) | 4.7+ | No | | |
2828
| XCB | | | | | [Yes](https://github.com/PlacehProject/Placeholders/blob/master/depends/packages/qt.mk#L94) (Linux only) |
2929
| xkbcommon | | | | | [Yes](https://github.com/PlacehProject/Placeholders/blob/master/depends/packages/qt.mk#L93) (Linux only) |
30-
| ZeroMQ | [4.1.5](https://github.com/zeromq/libzmq/releases) | | No | | |
30+
| ZeroMQ | [4.2.2](https://github.com/zeromq/libzmq/releases) | | No | | |
3131
| zlib | [1.2.11](http://zlib.net/) | | | | No |
3232
| aria2c | https://github.com/aria2/aria2 | | | | No |
3333
| mktorrent | https://github.com/Rudde/mktorrent | | | | No |

0 commit comments

Comments
 (0)