Skip to content

Commit ab67dd7

Browse files
theunitheuni
committed
depends: bump to qt 5.5
1 parent 5189fe3 commit ab67dd7

File tree

6 files changed

+103
-118
lines changed

6 files changed

+103
-118
lines changed

‎depends/packages/qt.mk

Lines changed: 44 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
PACKAGE=qt
2-
$(package)_version=5.2.1
3-
$(package)_download_path=http://download.qt-project.org/official_releases/qt/5.2/$($(package)_version)/single
4-
$(package)_file_name=$(package)-everywhere-opensource-src-$($(package)_version).tar.gz
5-
$(package)_sha256_hash=84e924181d4ad6db00239d87250cc89868484a14841f77fb85ab1f1dbdcd7da1
2+
$(package)_version=5.5.0
3+
$(package)_download_path=http://download.qt.io/official_releases/qt/5.5/$($(package)_version)/submodules
4+
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
5+
$(package)_file_name=qtbase-$($(package)_suffix)
6+
$(package)_sha256_hash=7e82b1318f88e56a2a9376e069aa608d4fd96b48cb0e1b880ae658b0a1af0561
67
$(package)_dependencies=openssl
78
$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
89
$(package)_build_subdir=qtbase
910
$(package)_qt_libs=corelib network widgets gui plugins testlib
10-
$(package)_patches=mac-qmake.conf fix-xcb-include-order.patch qt5-tablet-osx.patch qt5-yosemite.patch
11+
$(package)_patches=mac-qmake.conf fix-xcb-include-order.patch mingw-uuidof.patch
12+
13+
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
14+
$(package)_qttranslations_sha256_hash=c4bd6db6e426965c6f8824c54e81f68bbd61e2bae1bcadc328c6e81c45902a0d
15+
16+
$(package)_qttools_file_name=qttools-$($(package)_suffix)
17+
$(package)_qttools_sha256_hash=d9e06bd19ecc86afba5e95d45a906d1bc1ad579aa70001e36143c1aaf695bdd6
18+
19+
$(package)_extra_sources = $($(package)_qttranslations_file_name)
20+
$(package)_extra_sources += $($(package)_qttools_file_name)
1121

1222
define $(package)_set_vars
1323
$(package)_config_opts_release = -release
@@ -22,16 +32,11 @@ $(package)_config_opts += -no-gif
2232
$(package)_config_opts += -no-freetype
2333
$(package)_config_opts += -no-nis
2434
$(package)_config_opts += -no-pch
25-
$(package)_config_opts += -no-feature-style-plastique
2635
$(package)_config_opts += -no-qml-debug
2736
$(package)_config_opts += -nomake examples
2837
$(package)_config_opts += -nomake tests
29-
$(package)_config_opts += -no-feature-style-cde
30-
$(package)_config_opts += -no-feature-style-s60
31-
$(package)_config_opts += -no-feature-style-motif
3238
$(package)_config_opts += -no-feature-style-windowsmobile
3339
$(package)_config_opts += -no-feature-style-windowsce
34-
$(package)_config_opts += -no-feature-style-cleanlooks
3540
$(package)_config_opts += -no-sql-db2
3641
$(package)_config_opts += -no-sql-ibase
3742
$(package)_config_opts += -no-sql-oci
@@ -41,26 +46,8 @@ $(package)_config_opts += -no-sql-odbc
4146
$(package)_config_opts += -no-sql-psql
4247
$(package)_config_opts += -no-sql-sqlite
4348
$(package)_config_opts += -no-sql-sqlite2
44-
$(package)_config_opts += -skip qtsvg
45-
$(package)_config_opts += -skip qtwebkit
46-
$(package)_config_opts += -skip qtwebkit-examples
47-
$(package)_config_opts += -skip qtserialport
48-
$(package)_config_opts += -skip qtdeclarative
49-
$(package)_config_opts += -skip qtmultimedia
50-
$(package)_config_opts += -skip qtimageformats
51-
$(package)_config_opts += -skip qtx11extras
52-
$(package)_config_opts += -skip qtlocation
53-
$(package)_config_opts += -skip qtsensors
54-
$(package)_config_opts += -skip qtquick1
55-
$(package)_config_opts += -skip qtquickcontrols
56-
$(package)_config_opts += -skip qtactiveqt
57-
$(package)_config_opts += -skip qtconnectivity
58-
$(package)_config_opts += -skip qtmacextras
59-
$(package)_config_opts += -skip qtwinextras
60-
$(package)_config_opts += -skip qtxmlpatterns
61-
$(package)_config_opts += -skip qtscript
62-
$(package)_config_opts += -skip qtdoc
6349
$(package)_config_opts += -prefix $(host_prefix)
50+
$(package)_config_opts += -hostprefix $(build_prefix)
6451
$(package)_config_opts += -bindir $(build_prefix)/bin
6552
$(package)_config_opts += -no-c++11
6653
$(package)_config_opts += -openssl-linked
@@ -76,6 +63,7 @@ $(package)_config_opts += -qt-pcre
7663
ifneq ($(build_os),darwin)
7764
$(package)_config_opts_darwin = -xplatform macx-clang-linux
7865
$(package)_config_opts_darwin += -device-option MAC_SDK_PATH=$(OSX_SDK)
66+
$(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSION)
7967
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
8068
$(package)_config_opts_darwin += -device-option MAC_MIN_VERSION=$(OSX_MIN_VERSION)
8169
$(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
@@ -99,19 +87,41 @@ $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option
9987
$(package)_build_env = QT_RCC_TEST=1
10088
endef
10189

90+
define $(package)_fetch_cmds
91+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
92+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttranslations_file_name),$($(package)_qttranslations_file_name),$($(package)_qttranslations_sha256_hash)) && \
93+
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash))
94+
endef
95+
96+
define $(package)_extract_cmds
97+
mkdir -p $($(package)_extract_dir) && \
98+
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
99+
echo "$($(package)_qttranslations_sha256_hash) $($(package)_source_dir)/$($(package)_qttranslations_file_name)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
100+
echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
101+
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
102+
mkdir qtbase && \
103+
tar --strip-components=1 -xf $($(package)_source) -C qtbase && \
104+
mkdir qttranslations && \
105+
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttranslations_file_name) -C qttranslations && \
106+
mkdir qttools && \
107+
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
108+
endef
109+
102110
define $(package)_preprocess_cmds
103111
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
104112
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
105-
sed -i.old "/XIproto.h/d" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
113+
sed -i.old "s/PIDLIST_ABSOLUTE/ITEMIDLIST */" qtbase/src/plugins/platforms/windows/qwindowscontext.h &&\
114+
sed -i.old "s/PIDLIST_ABSOLUTE/ITEMIDLIST */" qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp &&\
115+
sed -i.old "s/PCIDLIST_ABSOLUTE/const ITEMIDLIST */" qtbase/src/plugins/platforms/windows/qwindowscontext.h &&\
116+
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
106117
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
107118
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
108119
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
109120
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
110121
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
111122
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
112123
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
113-
patch -p1 < $($(package)_patch_dir)/qt5-tablet-osx.patch && \
114-
patch -d qtbase -p1 < $($(package)_patch_dir)/qt5-yosemite.patch && \
124+
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
115125
echo "QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
116126
echo "QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
117127
echo "QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
@@ -124,7 +134,6 @@ define $(package)_config_cmds
124134
export PKG_CONFIG_SYSROOT_DIR=/ && \
125135
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
126136
export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \
127-
export CPATH=$(host_prefix)/include && \
128137
./configure $($(package)_config_opts) && \
129138
$(MAKE) sub-src-clean && \
130139
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
@@ -133,7 +142,6 @@ define $(package)_config_cmds
133142
endef
134143
135144
define $(package)_build_cmds
136-
export CPATH=$(host_prefix)/include && \
137145
$(MAKE) -C src $(addprefix sub-,$($(package)_qt_libs)) && \
138146
$(MAKE) -C ../qttools/src/linguist/lrelease && \
139147
$(MAKE) -C ../qttranslations
@@ -149,6 +157,6 @@ define $(package)_stage_cmds
149157
endef
150158
151159
define $(package)_postprocess_cmds
152-
rm -rf mkspecs/ lib/cmake/ && \
153-
rm lib/libQt5Bootstrap.a lib/lib*.la lib/*.prl plugins/*/*.prl
160+
rm -rf native/mkspecs/ native/lib/ lib/cmake/ && \
161+
rm -f lib/lib*.la lib/*.prl plugins/*/*.prl
154162
endef

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-03-17 02:06:42.705930685 +0000
2-
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-03-17 02:08:41.281926351 +0000
3-
@@ -103,7 +103,6 @@
1+
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
2+
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
3+
@@ -94,8 +94,6 @@
44

55
DEFINES += $$QMAKE_DEFINES_XCB
66
LIBS += $$QMAKE_LIBS_XCB
77
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
8+
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
89

910
CONFIG += qpa/genericunixfontdatabase
1011

11-
@@ -118,7 +117,8 @@
12+
@@ -104,7 +102,8 @@
1213
contains(QT_CONFIG, xcb-qt) {
1314
DEFINES += XCB_USE_RENDER
1415
XCB_DIR = ../../../3rdparty/xcb
@@ -17,15 +18,16 @@
1718
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
1819
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
1920
} else {
20-
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr
21+
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms
2122
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000
2223
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000
23-
@@ -8,7 +8,7 @@
24+
@@ -8,7 +8,8 @@
2425

2526
XCB_DIR = ../../../../3rdparty/xcb
2627

2728
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
28-
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
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
2931

30-
# ignore compiler warnings in 3rdparty code
31-
QMAKE_CFLAGS_STATIC_LIB+=-w
32+
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
33+
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
MAKEFILE_GENERATOR = UNIX
22
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname
3+
DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG
34
QMAKE_INCREMENTAL_STYLE = sublib
45
include(../common/macx.conf)
56
include(../common/gcc-base-mac.conf)
@@ -10,8 +11,10 @@ QMAKE_XCODE_VERSION=4.3
1011
QMAKE_XCODE_DEVELOPER_PATH=/Developer
1112
QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION}
1213
QMAKE_MAC_SDK=macosx
13-
QMAKE_MAC_SDK.macosx.path = $$QMAKE_MAC_SDK_PATH
14+
QMAKE_MAC_SDK.macosx.path = $${MAC_SDK_PATH}
1415
QMAKE_MAC_SDK.macosx.platform_name = macosx
16+
QMAKE_MAC_SDK.macosx.version = $${MAC_SDK_VERSION}
17+
QMAKE_MAC_SDK.macosx.platform_path = /phony
1518
QMAKE_CFLAGS += -target $${MAC_TARGET}
1619
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
1720
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS

‎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 2015-06-20 17:40:20.956781548 -0400
2+
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:29:32.052772416 -0400
3+
@@ -69,7 +69,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+
@@ -762,7 +762,7 @@
13+
HWND_MESSAGE, NULL, (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+
@@ -781,7 +781,7 @@
22+
return QStringLiteral("IDispatch error #") + QString::number(wCode);
23+
return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16);
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+
@@ -846,12 +846,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/qt5-tablet-osx.patch

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

‎depends/patches/qt/qt5-yosemite.patch

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

0 commit comments

Comments
 (0)