diff options
| author | Fatih Aşıcı <fatih.asici@gmail.com> | 2015-01-22 14:37:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-02 21:47:39 +0100 |
| commit | 9fff65cf1a1278702b5c9a5fb63e0cec583ab593 (patch) | |
| tree | a3ac993acea88bb39da85e8bf861e44c2a24ce4e /package/qt5/qt5websockets | |
| parent | 59a962af7a8ef15b97724c421b8658a030e308ac (diff) | |
| download | buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.gz buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.zip | |
qt5: bump to version 5.4.0
qt5base:
- Add patches to fix uClibc build.
qt5connectivity:
- Add patches to fix build with -no-c++11
qt5declarative:
- Remove the line that installs accessible plugin. The functionality
is moved into the qtquick library.
qt5webkit:
- Remove egl patch. This should be fixed with CONFIG += egl option.
qt5websockets:
- Remove upstreamed patch.
Changelogs: https://qt-project.org/wiki/Change-files-in-Qt-5.4.0
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5websockets')
3 files changed, 8 insertions, 34 deletions
diff --git a/package/qt5/qt5websockets/qt5websockets-0001-Remove-dependency-on-unused-sql-module.patch b/package/qt5/qt5websockets/qt5websockets-0001-Remove-dependency-on-unused-sql-module.patch deleted file mode 100644 index 34a0649efd..0000000000 --- a/package/qt5/qt5websockets/qt5websockets-0001-Remove-dependency-on-unused-sql-module.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c6b4e9f6609b91e56301bde39be48fc65fcfb916 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> -Date: Tue, 20 May 2014 16:15:43 +0300 -Subject: [PATCH] Remove dependency on unused sql module - -Sent-Upstream: https://codereview.qt-project.org/85844 -Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> -Change-Id: I102bcb81ec53d022480e81a3632b93d42bf33403 ---- - src/websockets/websockets.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro -index 99e84b6..5b5ff78 100644 ---- a/src/websockets/websockets.pro -+++ b/src/websockets/websockets.pro -@@ -1,7 +1,7 @@ - load(qt_build_config) - TARGET = QtWebSockets - --QT = core network core-private sql -+QT = core network core-private - - TEMPLATE = lib - --- -1.9.1 - diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 6402567a81..352be5079d 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,4 +1,4 @@ -# Hashes from: http://download.qt-project.org/official_releases/qt/5.3/5.3.2/submodules/qtwebsockets-opensource-src-5.3.2.tar.xz.mirrorlist -sha256 60533d413b0fa27b1e08642ae77bcaa76a845fa39ddc3d49af573a77e73a38c2 qtwebsockets-opensource-src-5.3.2.tar.xz -sha1 8c043ee895a4f7bb1f3e6e35c3e835e803f8385f qtwebsockets-opensource-src-5.3.2.tar.xz -md5 093ddc113952e47bd0e251986e03f1e4 qtwebsockets-opensource-src-5.3.2.tar.xz +# Hashes from: http://download.qt-project.org/official_releases/qt/5.4/5.4.0/submodules/qtwebsockets-opensource-src-5.4.0.tar.xz.mirrorlist +sha256 2acd274a4a983cdd2288678d9005429fded51b5277d0621c4a953fa4f4f4cbdf qtwebsockets-opensource-src-5.4.0.tar.xz +sha1 d0b7e62bbdd634de01d5321f94a4bdff8b228cf5 qtwebsockets-opensource-src-5.4.0.tar.xz +md5 0c406bca48296d0d99cc93b00f40aca7 qtwebsockets-opensource-src-5.4.0.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index e3c4cf3bb2..2b257e199c 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -11,8 +11,10 @@ QT5WEBSOCKETS_DEPENDENCIES = qt5base QT5WEBSOCKETS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBSOCKETS_LICENSE = LGPLv2.1 -QT5WEBSOCKETS_LICENSE_FILES = LICENSE +QT5WEBSOCKETS_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 +# Source files contain references to LGPL_EXCEPTION.txt but it is not included +# in the archive. +QT5WEBSOCKETS_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 else QT5WEBSOCKETS_LICENSE = Commercial license QT5WEBSOCKETS_REDISTRIBUTE = NO |
