qt5: bump version to 5.5.0
PATCH v2 1/3 qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1].
0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
[1] https://codereview.qt-project.org/#/c/107548/
on i.MX6/linaro with OpenGL backend
Signed-off-by Julien Corjon <[email protected]>
---
v1 -> v2 :
- Rewrite commit message (suggested by Thomas)
- Fix comment on uclibc version in patch 0008-... (suggested by Thomas)
package/qt5/qt5.mk | 4 +- ...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ---- package/qt5/qt5base/0004-xcb-egl-fixes.patch | 9 +- .../0005-no-gold-linker-for-host-build.patch | 40 ++- ...nfigure-fix-gold-linker-support-detection.patch | 36 --- .../0007-configure-add-psql_config-option.patch | 61 ----- .../0008-forkd-disable-eventfd-for-uclibc.patch | 19 ++ package/qt5/qt5base/qt5base.hash | 8 +- .../0001-Fix-build-with-no-c-11.patch | 267 --------------------- ...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ---- package/qt5/qt5connectivity/qt5connectivity.hash | 8 +- package/qt5/qt5declarative/qt5declarative.hash | 8 +- package/qt5/qt5enginio/qt5enginio.hash | 8 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +- package/qt5/qt5imageformats/qt5imageformats.hash | 8 +- package/qt5/qt5multimedia/qt5multimedia.hash | 8 +- package/qt5/qt5quick1/qt5quick1.hash | 8 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +- package/qt5/qt5script/qt5script.hash | 8 +- package/qt5/qt5sensors/qt5sensors.hash | 8 +- package/qt5/qt5serialport/qt5serialport.hash | 8 +- package/qt5/qt5svg/qt5svg.hash | 8 +- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +- package/qt5/qt5webkit/qt5webkit.hash | 8 +- package/qt5/qt5websockets/qt5websockets.hash | 8 +- package/qt5/qt5x11extras/qt5x11extras.hash | 8 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +- 27 files changed, 125 insertions(+), 549 deletions(-) delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch create mode 100644 package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
package/qt5/qt5.mk +2 -2
@@ -1,5 +1,5 @@ -QT5_VERSION_MAJOR = 5.4 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION_MAJOR = 5.5 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch deleted +0 -48
48 lines not on this page · raw message
package/qt5/qt5base/0004-xcb-egl-fixes.patch +5 -4
@@ -49,15 +49,16 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> ---- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400 -@@ -49,8 +49,8 @@ +--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp ++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +@@ -41,8 +41,8 @@ - #include <QtPlatformSupport/private/qdevicediscovery_p.h> + #include <QtGui/private/qguiapplication_p.h> -#include "qeglplatformcursor_p.h" #include "qeglplatformintegration_p.h" +#include "qeglplatformcursor_p.h" + #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE
package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +27 -13
@@ -1,27 +1,41 @@ -Use the gold linker only for target builds +From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Tue, 19 May 2015 21:30:21 +0200 +Subject: [PATCH] Disable gold linker/new dtags support for host builds -Availability of the gold linker is only tested with the -cross-compiler, not the host compiler, so Qt shouldn't assume it's -available when doing host builds. +There is no test for gold linker and new dtags support for the host build +(only for the target compiler/build) which leads to trouble in some cross +compiling environments (see [1] for details). -This fixes build failures occuring when cross-compiling Qt5 with a -gold capable cross-compiler, on a host that has a too old compiler to -support gold. +So disable gold linker/new dtags support unconditionally for host builds. -Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. +[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html -Signed-off-by: Thomas Petazzoni <[email protected]> +Task-number: QTBUG-46125 +Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 +Reviewed-by: Oswald Buddenhagen <[email protected]> +--- + mkspecs/features/default_post.prf | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) -Index: b/mkspecs/features/default_post.prf -=================================================================== +diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf +index 8e68b95..bcaddc8 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf -@@ -62,7 +62,7 @@ +@@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD +-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++# disable special linker flags for host builds (no proper test for host support yet) ++!host_build { ++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +2.1.0 +
package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Sun, 15 Feb 2015 22:58:07 +0100 -Subject: [PATCH] configure: fix gold linker support detection - -Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 - -While the -fuse-ld=gold flag is related to linking, it is an argument to the -compiler driver to tell it what linker to execute, NOT an option to tell the -linker to behave differently. - -So it shouldn't get prefixed with -Wl when passed though the compiler driver. - -Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 043d9fc..987d7f0 100755 ---- a/configure -+++ b/configure -@@ -3263,7 +3263,7 @@ fi - - # auto-detect -fuse-ld=gold support - if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then -- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then -+ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then - CFG_USE_GOLD_LINKER=yes - else - if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then --- -2.1.3 -
package/qt5/qt5base/0007-configure-add-psql_config-option.patch deleted +0 -61
61 lines not on this page · raw message
package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch new file +19 -0
@@ -0,0 +1,19 @@ +Disable eventfd in forkd for uClibc <= 0.9.33 toolchains + +Signed-off-by: Julien Corjon <[email protected]> + +Index: qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +=================================================================== +--- qt5base-5.5.0.orig/src/3rdparty/forkfd/forkfd.c ++++ qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +@@ -48,6 +48,10 @@ + # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) + # define HAVE_PIPE2 1 + # endif ++# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33))) ++# undef HAVE_EVENTFD ++# undef HAVE_PIPE2 ++# endif + #endif + + #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
package/qt5/qt5base/qt5base.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 qtbase-opensource-src-5.4.1.tar.xz -sha1 134ec03371722cc31e2041a82c255cec708ca848 qtbase-opensource-src-5.4.1.tar.xz -md5 9507825e558c980fed602de1f16ec7ae qtbase-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 893f0691739c00d13ff85bf8d3fd14e1c7a62fbbbcffa44b0491da4d5e570965 qtbase-opensource-src-5.5.0.tar.xz +sha1 3d6734bc6d00e1017c1db40d68309997bdf7bf6f qtbase-opensource-src-5.5.0.tar.xz +md5 252613b5a180c94d7196d10467a4f08b qtbase-opensource-src-5.5.0.tar.xz
package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch deleted +0 -267
267 lines not on this page · raw message
package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch deleted +0 -46
46 lines not on this page · raw message
package/qt5/qt5connectivity/qt5connectivity.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 82c4ffb590f6716672da271ad41c51499b888b46140f40b06367b9eace7b2360 qtconnectivity-opensource-src-5.4.1.tar.xz -sha1 b49f34507f2ebebd400391a48244828d4ff89fa3 qtconnectivity-opensource-src-5.4.1.tar.xz -md5 056c7eba6a396bbd82d265feca1fe47b qtconnectivity-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f1cfdd934e11dc114039c84a6a6b83870b56b2966715f1cb266f25bce1524302 qtconnectivity-opensource-src-5.5.0.tar.xz +sha1 b393471529502028b0d5318088a27e48e944bc90 qtconnectivity-opensource-src-5.5.0.tar.xz +md5 31b005585b2be1c8aca9ea585a90f2b0 qtconnectivity-opensource-src-5.5.0.tar.xz
package/qt5/qt5declarative/qt5declarative.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 qtdeclarative-opensource-src-5.4.1.tar.xz -sha1 fb345784035caafef2d848bb29ad6bfce8ec2f8f qtdeclarative-opensource-src-5.4.1.tar.xz -md5 86dfe5c41e14a142c72fdaa6a64f933c qtdeclarative-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 858a12c5647764da8f81edec4ed444af77888cf931b739c10168064ae96f6773 qtdeclarative-opensource-src-5.5.0.tar.xz +sha1 f41766db6f6bc8b9cefff05543891c271436043e qtdeclarative-opensource-src-5.5.0.tar.xz +md5 1452c92f8c660dc7d23d9e17d89f8716 qtdeclarative-opensource-src-5.5.0.tar.xz
package/qt5/qt5enginio/qt5enginio.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 aedb131c29180c7dbc41f888d6a078378a2dd3337766461734cc1b8f07e9577a qtenginio-opensource-src-5.4.1.tar.xz -sha1 35da0343762a6aa7ded2c62aa4b36e77152a9240 qtenginio-opensource-src-5.4.1.tar.xz -md5 c80b967b159c513350fcfca223f435d4 qtenginio-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f61c4b2a26550bcb5e81cfcde55b1e521ee021226679dc9f60ab6c55f21f1520 qtenginio-opensource-src-5.5.0.tar.xz +sha1 14b961bea8cf2f2d4510283d6120038dbf90d29d qtenginio-opensource-src-5.5.0.tar.xz +md5 917e3105fe125068942f39e775f621ad qtenginio-opensource-src-5.5.0.tar.xz
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c qtgraphicaleffects-opensource-src-5.4.1.tar.xz -sha1 9d0637176c9ce0006917dc52e6d20c975f0fb9a8 qtgraphicaleffects-opensource-src-5.4.1.tar.xz -md5 02bec01c2af9a7d08582fbffbfa4976a qtgraphicaleffects-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f143514e7414797f264fea6348635e1db3e15d13e326af4a6b355fecf0a147ee qtgraphicaleffects-opensource-src-5.5.0.tar.xz +sha1 1e9ca2b5d1fdfe6a73dfd646868c5351989ecccc qtgraphicaleffects-opensource-src-5.5.0.tar.xz +md5 2fb95cecb2ab0542cb0b5847c65600c3 qtgraphicaleffects-opensource-src-5.5.0.tar.xz
package/qt5/qt5imageformats/qt5imageformats.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f qtimageformats-opensource-src-5.4.1.tar.xz -sha1 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba qtimageformats-opensource-src-5.4.1.tar.xz -md5 1436680e00ea3e211fd0abdb7c18014a qtimageformats-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 6479d1d2ac5b7dd85566799e13a173e525cbccd5c8bd43e7db1bdaf772af8955 qtimageformats-opensource-src-5.5.0.tar.xz +sha1 cffd35f9742f13a0c5afc04eab27b7b47338e800 qtimageformats-opensource-src-5.5.0.tar.xz +md5 72cbebfda5253dece90fa90ded64e953 qtimageformats-opensource-src-5.5.0.tar.xz
package/qt5/qt5multimedia/qt5multimedia.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e qtmultimedia-opensource-src-5.4.1.tar.xz -sha1 5e9f06cccc86608ab185fc31a338b7b215342288 qtmultimedia-opensource-src-5.4.1.tar.xz -md5 7412a5c62da71b44b9f29e29fdc6af4d qtmultimedia-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a8bf1bd59bad74bba2906e6a86faa1cf008c8dba5f5a9cdea72eb0ce5f85355b qtmultimedia-opensource-src-5.5.0.tar.xz +sha1 3438c16f498e40eaa68cd518b76ddd81c02a5471 qtmultimedia-opensource-src-5.5.0.tar.xz +md5 2759807c5d1842ee69e516aacd5e756a qtmultimedia-opensource-src-5.5.0.tar.xz
package/qt5/qt5quick1/qt5quick1.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d qtquick1-opensource-src-5.4.1.tar.xz -sha1 f89cccdeac4c31157ac8b97fa96d426b5bb18630 qtquick1-opensource-src-5.4.1.tar.xz -md5 16d711d20238e3220fc4030dab608f0b qtquick1-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 db563b33e1670bc8a254d53c0a8e29ba501b903fafcd3b7e3d2ab845db0dfa2c qtquick1-opensource-src-5.5.0.tar.xz +sha1 27d67436cd902bb8b89b5808e4cc4a34fd61ac75 qtquick1-opensource-src-5.5.0.tar.xz +md5 8cd53fd1100e7f7cdf5b14f7c227e7b9 qtquick1-opensource-src-5.5.0.tar.xz
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 qtquickcontrols-opensource-src-5.4.1.tar.xz -sha1 696ddb887bba366cb8132e53a94d571ac94666b8 qtquickcontrols-opensource-src-5.4.1.tar.xz -md5 2950c8df9da1e3d418a1e209d24f503a qtquickcontrols-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 df616aa6b390797f92f33115510961d1a53a55c349a18ae21f74b4aff478c2ea qtquickcontrols-opensource-src-5.5.0.tar.xz +sha1 9b12048acb3555f7e98bd6c1333437fb04cf60d6 qtquickcontrols-opensource-src-5.5.0.tar.xz +md5 24b59d5928092f02e0cba969d9548350 qtquickcontrols-opensource-src-5.5.0.tar.xz
package/qt5/qt5script/qt5script.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf qtscript-opensource-src-5.4.1.tar.xz -sha1 1b9ede97f3120c95c2dce322b6140eeb20416044 qtscript-opensource-src-5.4.1.tar.xz -md5 70165fd13fa0ba5b1f577f849f0c4f12 qtscript-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 343932ea8b2ecb16c3d9b49db55a7975f2f22534055608de4b06b1e38d867e8b qtscript-opensource-src-5.5.0.tar.xz +sha1 ed5cf73c8217a249535442c49a8a0e5c43f6e648 qtscript-opensource-src-5.5.0.tar.xz +md5 1e9766d2651d6a81221525462378336d qtscript-opensource-src-5.5.0.tar.xz
package/qt5/qt5sensors/qt5sensors.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 qtsensors-opensource-src-5.4.1.tar.xz -sha1 b02811264b6d6fd790d4f3b68f42d6162e73fc4f qtsensors-opensource-src-5.4.1.tar.xz -md5 0787b72a67d1e38a3a47b54b84a6dc42 qtsensors-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 8d5a989df94b28dac872f3b28437982ecc6434b38b44da75f1d4bf81915fd14b qtsensors-opensource-src-5.5.0.tar.xz +sha1 bd4b2fb7685f80ef1661ced90ff665b4b27216aa qtsensors-opensource-src-5.5.0.tar.xz +md5 68ea0a61147a4934ca0fbd04fae10ed6 qtsensors-opensource-src-5.5.0.tar.xz
package/qt5/qt5serialport/qt5serialport.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff qtserialport-opensource-src-5.4.1.tar.xz -sha1 c87b381d6a0b6445c7fab54ef2807a555bfbcb47 qtserialport-opensource-src-5.4.1.tar.xz -md5 2333d25916a74260ce39b8a77c7c4288 qtserialport-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a60e2d2113c1c3895b71c901921f83b81e9b3c59e3620cf94bd8647730efa866 qtserialport-opensource-src-5.5.0.tar.xz +sha1 371da46f2f2ad652a22b0f04e4b48f088976d3ce qtserialport-opensource-src-5.5.0.tar.xz +md5 8a76f051ed28a9c925d32f5864d33e78 qtserialport-opensource-src-5.5.0.tar.xz
package/qt5/qt5svg/qt5svg.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c qtsvg-opensource-src-5.4.1.tar.xz -sha1 f5bcaa91bd20ba7cdf27006a5553a6f182b62994 qtsvg-opensource-src-5.4.1.tar.xz -md5 b4a1e4f5dae26a7500f4f61a550f67eb qtsvg-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 00efdeec66d34dabeddf17c510c0d607179991566a030d461968a16d6322e19f qtsvg-opensource-src-5.5.0.tar.xz +sha1 9238a1aedd126f84a73014c12b6391267238da0a qtsvg-opensource-src-5.5.0.tar.xz +md5 08234e3c3696f1a75df30201ca16d4bc qtsvg-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit-examples/qt5webkit-examples.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a qtwebkit-examples-opensource-src-5.4.1.tar.xz -sha1 7a150502661a3af7dde5c546cdd4a335068a0298 qtwebkit-examples-opensource-src-5.4.1.tar.xz -md5 783bfd27e79769f3ceeb206a4921400b qtwebkit-examples-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d25564fb56e8e06ad782390c7a7cf2c80f52c1dac5a8cac6ad5382711cd4bd12 qtwebkit-examples-opensource-src-5.5.0.tar.xz +sha1 706464b813e9910fefd4af83e479a8247fd50a68 qtwebkit-examples-opensource-src-5.5.0.tar.xz +md5 5005737b4b29a76c70d2d08e5b105a66 qtwebkit-examples-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit/qt5webkit.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf qtwebkit-opensource-src-5.4.1.tar.xz -sha1 6cfebb74d334e77e26ecbe7d6609578eb46ab276 qtwebkit-opensource-src-5.4.1.tar.xz -md5 186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec qtwebkit-opensource-src-5.5.0.tar.xz +sha1 8489ffa9253ab429b75f65117e435624dd78f769 qtwebkit-opensource-src-5.5.0.tar.xz +md5 5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz
package/qt5/qt5websockets/qt5websockets.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 qtwebsockets-opensource-src-5.4.1.tar.xz -sha1 3fb9be047b67673f40d272faab5ba0c8055e7717 qtwebsockets-opensource-src-5.4.1.tar.xz -md5 308e1e9126e6fab8b06616db9810973e qtwebsockets-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 1ad465b1b2d1e6dddbdc403af9f69d93b1c408f6903c28ccaa52058df7ee8ae8 qtwebsockets-opensource-src-5.5.0.tar.xz +sha1 215f4e8d8170933d68e9395d966ecf6213fc0a74 qtwebsockets-opensource-src-5.5.0.tar.xz +md5 aa7b160a4b97fafe71d5546c20715b8f qtwebsockets-opensource-src-5.5.0.tar.xz
package/qt5/qt5x11extras/qt5x11extras.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e qtx11extras-opensource-src-5.4.1.tar.xz -sha1 7a75f936df70ac551cfc7b08914365cbb25b122d qtx11extras-opensource-src-5.4.1.tar.xz -md5 87d555e0c7eccaa462a9bba85fb2d4de qtx11extras-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 bcb3cec5c9f0b551f0e2de30824c8be08620fbbe466ad4846beb2ad636d0b979 qtx11extras-opensource-src-5.5.0.tar.xz +sha1 2eb25a96cc061b364d5fc30125a5ca9904857e89 qtx11extras-opensource-src-5.5.0.tar.xz +md5 9bee6d5c127ba8cc878ac7c2664d99f9 qtx11extras-opensource-src-5.5.0.tar.xz
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 qtxmlpatterns-opensource-src-5.4.1.tar.xz -sha1 b25c2ec875fa1cbe0de20fd39bdd444c703540b4 qtxmlpatterns-opensource-src-5.4.1.tar.xz -md5 ec2970e9e9c38f88be74f18101937c28 qtxmlpatterns-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 672882c670c13c5caec199173cdabffd38474d06979d261bdc6e19738e0cef53 qtxmlpatterns-opensource-src-5.5.0.tar.xz +sha1 d961f998980264f19916f70c8585da8479a84724 qtxmlpatterns-opensource-src-5.5.0.tar.xz +md5 138ab73b2376fcfca92a4bb6ab47e4a4 qtxmlpatterns-opensource-src-5.5.0.tar.xz
Signature · 1 line
2.1.0
PATCH v2 2/3 qt5base: reorder patches
Signed-off-by Julien Corjon <[email protected]>
---
.../qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
.../qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 0
...nker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} | 0
...entfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (100%)
rename package/qt5/qt5base/{0005-no-gold-linker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} (100%)
rename package/qt5/qt5base/{0008-forkd-disable-eventfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} (100%)package/qt5/qt5base/0002-mkspecs-files.patch renamed from package/qt5/qt5base/0003-mkspecs-files.patch +0 -0
package/qt5/qt5base/0003-xcb-egl-fixes.patch renamed from package/qt5/qt5base/0004-xcb-egl-fixes.patch +0 -0
package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch renamed from package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +0 -0
package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch renamed from package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch +0 -0
Signature · 1 line
2.1.0
PATCH v2 3/3 qt5quick1, qt5script, qt5webkit: tag as legacy compatibility
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v1 -> v2 :
- Rename "deprecated" with "legacy compatibility" (except in help messages) (Suggested by Thomas and confirmed by Arnout)
- Remove "(deprecated)" from package name
(Suggested by Thomas and confirmed by Arnout)
package/qt5/Config.in | 9 +++++---- package/qt5/qt5quick1/Config.in | 4 ++++ package/qt5/qt5script/Config.in | 4 ++++ package/qt5/qt5webkit-examples/Config.in | 4 ++++ package/qt5/qt5webkit/Config.in | 4 ++++ 5 files changed, 21 insertions(+), 4 deletions(-)
package/qt5/Config.in +5 -4
@@ -36,15 +36,16 @@ source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5multimedia/Config.in" -source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" -source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" -source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" +comment "legacy compatibility" +source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5webkit-examples/Config.in" endif
package/qt5/qt5quick1/Config.in +4 -0
@@ -15,6 +15,10 @@ config BR2_PACKAGE_QT5QUICK1 This package corresponds to the qt5quick1 module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt Quick module in new + design. + http://qt.io comment "qt5quick1 needs a toolchain w/ dynamic library"
package/qt5/qt5script/Config.in +4 -0
@@ -8,4 +8,8 @@ config BR2_PACKAGE_QT5SCRIPT This package corresponds to the qt5script module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt QML module in new + design. + http://qt.io
package/qt5/qt5webkit-examples/Config.in +4 -0
@@ -7,4 +7,8 @@ config BR2_PACKAGE_QT5WEBKIT_EXAMPLES This package contains examples for the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
package/qt5/qt5webkit/Config.in +4 -0
@@ -17,4 +17,8 @@ config BR2_PACKAGE_QT5WEBKIT This package corresponds to the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
Signature · 1 line
2.1.0
PATCH v3 1/5 qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1].
0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
[1] https://codereview.qt-project.org/#/c/107548/
on i.MX6/linaro with OpenGL backend
Signed-off-by Julien Corjon <[email protected]>
---
v2 -> v3 :
- Re-include modification of qt5base.mk lost in rebase...
v1 -> v2 :
- Rewrite commit message (suggested by Thomas)
- Fix comment on uclibc version in patch 0008-... (suggested by Thomas)
package/qt5/qt5.mk | 4 +- ...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ---- package/qt5/qt5base/0004-xcb-egl-fixes.patch | 9 +- .../0005-no-gold-linker-for-host-build.patch | 40 ++- ...nfigure-fix-gold-linker-support-detection.patch | 36 --- .../0007-configure-add-psql_config-option.patch | 61 ----- .../0008-forkd-disable-eventfd-for-uclibc.patch | 19 ++ package/qt5/qt5base/qt5base.hash | 8 +- package/qt5/qt5base/qt5base.mk | 8 +- .../0001-Fix-build-with-no-c-11.patch | 267 --------------------- ...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ---- package/qt5/qt5connectivity/qt5connectivity.hash | 8 +- package/qt5/qt5declarative/qt5declarative.hash | 8 +- package/qt5/qt5enginio/qt5enginio.hash | 8 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +- package/qt5/qt5imageformats/qt5imageformats.hash | 8 +- package/qt5/qt5multimedia/qt5multimedia.hash | 8 +- package/qt5/qt5quick1/qt5quick1.hash | 8 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +- package/qt5/qt5script/qt5script.hash | 8 +- package/qt5/qt5sensors/qt5sensors.hash | 8 +- package/qt5/qt5serialport/qt5serialport.hash | 8 +- package/qt5/qt5svg/qt5svg.hash | 8 +- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +- package/qt5/qt5webkit/qt5webkit.hash | 8 +- package/qt5/qt5websockets/qt5websockets.hash | 8 +- package/qt5/qt5x11extras/qt5x11extras.hash | 8 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +- 28 files changed, 126 insertions(+), 556 deletions(-) delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch create mode 100644 package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
package/qt5/qt5.mk +2 -2
@@ -1,5 +1,5 @@ -QT5_VERSION_MAJOR = 5.4 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION_MAJOR = 5.5 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch deleted +0 -48
48 lines not on this page · raw message
package/qt5/qt5base/0004-xcb-egl-fixes.patch +5 -4
@@ -49,15 +49,16 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> ---- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400 -@@ -49,8 +49,8 @@ +--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp ++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +@@ -41,8 +41,8 @@ - #include <QtPlatformSupport/private/qdevicediscovery_p.h> + #include <QtGui/private/qguiapplication_p.h> -#include "qeglplatformcursor_p.h" #include "qeglplatformintegration_p.h" +#include "qeglplatformcursor_p.h" + #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE
package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +27 -13
@@ -1,27 +1,41 @@ -Use the gold linker only for target builds +From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Tue, 19 May 2015 21:30:21 +0200 +Subject: [PATCH] Disable gold linker/new dtags support for host builds -Availability of the gold linker is only tested with the -cross-compiler, not the host compiler, so Qt shouldn't assume it's -available when doing host builds. +There is no test for gold linker and new dtags support for the host build +(only for the target compiler/build) which leads to trouble in some cross +compiling environments (see [1] for details). -This fixes build failures occuring when cross-compiling Qt5 with a -gold capable cross-compiler, on a host that has a too old compiler to -support gold. +So disable gold linker/new dtags support unconditionally for host builds. -Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. +[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html -Signed-off-by: Thomas Petazzoni <[email protected]> +Task-number: QTBUG-46125 +Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 +Reviewed-by: Oswald Buddenhagen <[email protected]> +--- + mkspecs/features/default_post.prf | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) -Index: b/mkspecs/features/default_post.prf -=================================================================== +diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf +index 8e68b95..bcaddc8 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf -@@ -62,7 +62,7 @@ +@@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD +-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++# disable special linker flags for host builds (no proper test for host support yet) ++!host_build { ++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +2.1.0 +
package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Sun, 15 Feb 2015 22:58:07 +0100 -Subject: [PATCH] configure: fix gold linker support detection - -Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 - -While the -fuse-ld=gold flag is related to linking, it is an argument to the -compiler driver to tell it what linker to execute, NOT an option to tell the -linker to behave differently. - -So it shouldn't get prefixed with -Wl when passed though the compiler driver. - -Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 043d9fc..987d7f0 100755 ---- a/configure -+++ b/configure -@@ -3263,7 +3263,7 @@ fi - - # auto-detect -fuse-ld=gold support - if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then -- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then -+ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then - CFG_USE_GOLD_LINKER=yes - else - if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then --- -2.1.3 -
package/qt5/qt5base/0007-configure-add-psql_config-option.patch deleted +0 -61
61 lines not on this page · raw message
package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch new file +19 -0
@@ -0,0 +1,19 @@ +Disable eventfd in forkd for uClibc <= 0.9.33 toolchains + +Signed-off-by: Julien Corjon <[email protected]> + +Index: qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +=================================================================== +--- qt5base-5.5.0.orig/src/3rdparty/forkfd/forkfd.c ++++ qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +@@ -48,6 +48,10 @@ + # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) + # define HAVE_PIPE2 1 + # endif ++# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33))) ++# undef HAVE_EVENTFD ++# undef HAVE_PIPE2 ++# endif + #endif + + #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
package/qt5/qt5base/qt5base.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 qtbase-opensource-src-5.4.1.tar.xz -sha1 134ec03371722cc31e2041a82c255cec708ca848 qtbase-opensource-src-5.4.1.tar.xz -md5 9507825e558c980fed602de1f16ec7ae qtbase-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 893f0691739c00d13ff85bf8d3fd14e1c7a62fbbbcffa44b0491da4d5e570965 qtbase-opensource-src-5.5.0.tar.xz +sha1 3d6734bc6d00e1017c1db40d68309997bdf7bf6f qtbase-opensource-src-5.5.0.tar.xz +md5 252613b5a180c94d7196d10467a4f08b qtbase-opensource-src-5.5.0.tar.xz
package/qt5/qt5base/qt5base.mk +1 -7
@@ -117,12 +117,6 @@ QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp -endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp endif else QT5BASE_CONFIGURE_OPTS += -no-eglfs
@@ -161,6 +155,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
@@ -189,7 +184,6 @@ define QT5BASE_CONFIGURE_CMDS -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef
package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch deleted +0 -267
267 lines not on this page · raw message
package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch deleted +0 -46
46 lines not on this page · raw message
package/qt5/qt5connectivity/qt5connectivity.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 82c4ffb590f6716672da271ad41c51499b888b46140f40b06367b9eace7b2360 qtconnectivity-opensource-src-5.4.1.tar.xz -sha1 b49f34507f2ebebd400391a48244828d4ff89fa3 qtconnectivity-opensource-src-5.4.1.tar.xz -md5 056c7eba6a396bbd82d265feca1fe47b qtconnectivity-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f1cfdd934e11dc114039c84a6a6b83870b56b2966715f1cb266f25bce1524302 qtconnectivity-opensource-src-5.5.0.tar.xz +sha1 b393471529502028b0d5318088a27e48e944bc90 qtconnectivity-opensource-src-5.5.0.tar.xz +md5 31b005585b2be1c8aca9ea585a90f2b0 qtconnectivity-opensource-src-5.5.0.tar.xz
package/qt5/qt5declarative/qt5declarative.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 qtdeclarative-opensource-src-5.4.1.tar.xz -sha1 fb345784035caafef2d848bb29ad6bfce8ec2f8f qtdeclarative-opensource-src-5.4.1.tar.xz -md5 86dfe5c41e14a142c72fdaa6a64f933c qtdeclarative-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 858a12c5647764da8f81edec4ed444af77888cf931b739c10168064ae96f6773 qtdeclarative-opensource-src-5.5.0.tar.xz +sha1 f41766db6f6bc8b9cefff05543891c271436043e qtdeclarative-opensource-src-5.5.0.tar.xz +md5 1452c92f8c660dc7d23d9e17d89f8716 qtdeclarative-opensource-src-5.5.0.tar.xz
package/qt5/qt5enginio/qt5enginio.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 aedb131c29180c7dbc41f888d6a078378a2dd3337766461734cc1b8f07e9577a qtenginio-opensource-src-5.4.1.tar.xz -sha1 35da0343762a6aa7ded2c62aa4b36e77152a9240 qtenginio-opensource-src-5.4.1.tar.xz -md5 c80b967b159c513350fcfca223f435d4 qtenginio-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f61c4b2a26550bcb5e81cfcde55b1e521ee021226679dc9f60ab6c55f21f1520 qtenginio-opensource-src-5.5.0.tar.xz +sha1 14b961bea8cf2f2d4510283d6120038dbf90d29d qtenginio-opensource-src-5.5.0.tar.xz +md5 917e3105fe125068942f39e775f621ad qtenginio-opensource-src-5.5.0.tar.xz
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c qtgraphicaleffects-opensource-src-5.4.1.tar.xz -sha1 9d0637176c9ce0006917dc52e6d20c975f0fb9a8 qtgraphicaleffects-opensource-src-5.4.1.tar.xz -md5 02bec01c2af9a7d08582fbffbfa4976a qtgraphicaleffects-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f143514e7414797f264fea6348635e1db3e15d13e326af4a6b355fecf0a147ee qtgraphicaleffects-opensource-src-5.5.0.tar.xz +sha1 1e9ca2b5d1fdfe6a73dfd646868c5351989ecccc qtgraphicaleffects-opensource-src-5.5.0.tar.xz +md5 2fb95cecb2ab0542cb0b5847c65600c3 qtgraphicaleffects-opensource-src-5.5.0.tar.xz
package/qt5/qt5imageformats/qt5imageformats.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f qtimageformats-opensource-src-5.4.1.tar.xz -sha1 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba qtimageformats-opensource-src-5.4.1.tar.xz -md5 1436680e00ea3e211fd0abdb7c18014a qtimageformats-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 6479d1d2ac5b7dd85566799e13a173e525cbccd5c8bd43e7db1bdaf772af8955 qtimageformats-opensource-src-5.5.0.tar.xz +sha1 cffd35f9742f13a0c5afc04eab27b7b47338e800 qtimageformats-opensource-src-5.5.0.tar.xz +md5 72cbebfda5253dece90fa90ded64e953 qtimageformats-opensource-src-5.5.0.tar.xz
package/qt5/qt5multimedia/qt5multimedia.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e qtmultimedia-opensource-src-5.4.1.tar.xz -sha1 5e9f06cccc86608ab185fc31a338b7b215342288 qtmultimedia-opensource-src-5.4.1.tar.xz -md5 7412a5c62da71b44b9f29e29fdc6af4d qtmultimedia-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a8bf1bd59bad74bba2906e6a86faa1cf008c8dba5f5a9cdea72eb0ce5f85355b qtmultimedia-opensource-src-5.5.0.tar.xz +sha1 3438c16f498e40eaa68cd518b76ddd81c02a5471 qtmultimedia-opensource-src-5.5.0.tar.xz +md5 2759807c5d1842ee69e516aacd5e756a qtmultimedia-opensource-src-5.5.0.tar.xz
package/qt5/qt5quick1/qt5quick1.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d qtquick1-opensource-src-5.4.1.tar.xz -sha1 f89cccdeac4c31157ac8b97fa96d426b5bb18630 qtquick1-opensource-src-5.4.1.tar.xz -md5 16d711d20238e3220fc4030dab608f0b qtquick1-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 db563b33e1670bc8a254d53c0a8e29ba501b903fafcd3b7e3d2ab845db0dfa2c qtquick1-opensource-src-5.5.0.tar.xz +sha1 27d67436cd902bb8b89b5808e4cc4a34fd61ac75 qtquick1-opensource-src-5.5.0.tar.xz +md5 8cd53fd1100e7f7cdf5b14f7c227e7b9 qtquick1-opensource-src-5.5.0.tar.xz
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 qtquickcontrols-opensource-src-5.4.1.tar.xz -sha1 696ddb887bba366cb8132e53a94d571ac94666b8 qtquickcontrols-opensource-src-5.4.1.tar.xz -md5 2950c8df9da1e3d418a1e209d24f503a qtquickcontrols-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 df616aa6b390797f92f33115510961d1a53a55c349a18ae21f74b4aff478c2ea qtquickcontrols-opensource-src-5.5.0.tar.xz +sha1 9b12048acb3555f7e98bd6c1333437fb04cf60d6 qtquickcontrols-opensource-src-5.5.0.tar.xz +md5 24b59d5928092f02e0cba969d9548350 qtquickcontrols-opensource-src-5.5.0.tar.xz
package/qt5/qt5script/qt5script.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf qtscript-opensource-src-5.4.1.tar.xz -sha1 1b9ede97f3120c95c2dce322b6140eeb20416044 qtscript-opensource-src-5.4.1.tar.xz -md5 70165fd13fa0ba5b1f577f849f0c4f12 qtscript-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 343932ea8b2ecb16c3d9b49db55a7975f2f22534055608de4b06b1e38d867e8b qtscript-opensource-src-5.5.0.tar.xz +sha1 ed5cf73c8217a249535442c49a8a0e5c43f6e648 qtscript-opensource-src-5.5.0.tar.xz +md5 1e9766d2651d6a81221525462378336d qtscript-opensource-src-5.5.0.tar.xz
package/qt5/qt5sensors/qt5sensors.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 qtsensors-opensource-src-5.4.1.tar.xz -sha1 b02811264b6d6fd790d4f3b68f42d6162e73fc4f qtsensors-opensource-src-5.4.1.tar.xz -md5 0787b72a67d1e38a3a47b54b84a6dc42 qtsensors-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 8d5a989df94b28dac872f3b28437982ecc6434b38b44da75f1d4bf81915fd14b qtsensors-opensource-src-5.5.0.tar.xz +sha1 bd4b2fb7685f80ef1661ced90ff665b4b27216aa qtsensors-opensource-src-5.5.0.tar.xz +md5 68ea0a61147a4934ca0fbd04fae10ed6 qtsensors-opensource-src-5.5.0.tar.xz
package/qt5/qt5serialport/qt5serialport.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff qtserialport-opensource-src-5.4.1.tar.xz -sha1 c87b381d6a0b6445c7fab54ef2807a555bfbcb47 qtserialport-opensource-src-5.4.1.tar.xz -md5 2333d25916a74260ce39b8a77c7c4288 qtserialport-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a60e2d2113c1c3895b71c901921f83b81e9b3c59e3620cf94bd8647730efa866 qtserialport-opensource-src-5.5.0.tar.xz +sha1 371da46f2f2ad652a22b0f04e4b48f088976d3ce qtserialport-opensource-src-5.5.0.tar.xz +md5 8a76f051ed28a9c925d32f5864d33e78 qtserialport-opensource-src-5.5.0.tar.xz
package/qt5/qt5svg/qt5svg.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c qtsvg-opensource-src-5.4.1.tar.xz -sha1 f5bcaa91bd20ba7cdf27006a5553a6f182b62994 qtsvg-opensource-src-5.4.1.tar.xz -md5 b4a1e4f5dae26a7500f4f61a550f67eb qtsvg-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 00efdeec66d34dabeddf17c510c0d607179991566a030d461968a16d6322e19f qtsvg-opensource-src-5.5.0.tar.xz +sha1 9238a1aedd126f84a73014c12b6391267238da0a qtsvg-opensource-src-5.5.0.tar.xz +md5 08234e3c3696f1a75df30201ca16d4bc qtsvg-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit-examples/qt5webkit-examples.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a qtwebkit-examples-opensource-src-5.4.1.tar.xz -sha1 7a150502661a3af7dde5c546cdd4a335068a0298 qtwebkit-examples-opensource-src-5.4.1.tar.xz -md5 783bfd27e79769f3ceeb206a4921400b qtwebkit-examples-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d25564fb56e8e06ad782390c7a7cf2c80f52c1dac5a8cac6ad5382711cd4bd12 qtwebkit-examples-opensource-src-5.5.0.tar.xz +sha1 706464b813e9910fefd4af83e479a8247fd50a68 qtwebkit-examples-opensource-src-5.5.0.tar.xz +md5 5005737b4b29a76c70d2d08e5b105a66 qtwebkit-examples-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit/qt5webkit.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf qtwebkit-opensource-src-5.4.1.tar.xz -sha1 6cfebb74d334e77e26ecbe7d6609578eb46ab276 qtwebkit-opensource-src-5.4.1.tar.xz -md5 186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec qtwebkit-opensource-src-5.5.0.tar.xz +sha1 8489ffa9253ab429b75f65117e435624dd78f769 qtwebkit-opensource-src-5.5.0.tar.xz +md5 5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz
package/qt5/qt5websockets/qt5websockets.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 qtwebsockets-opensource-src-5.4.1.tar.xz -sha1 3fb9be047b67673f40d272faab5ba0c8055e7717 qtwebsockets-opensource-src-5.4.1.tar.xz -md5 308e1e9126e6fab8b06616db9810973e qtwebsockets-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 1ad465b1b2d1e6dddbdc403af9f69d93b1c408f6903c28ccaa52058df7ee8ae8 qtwebsockets-opensource-src-5.5.0.tar.xz +sha1 215f4e8d8170933d68e9395d966ecf6213fc0a74 qtwebsockets-opensource-src-5.5.0.tar.xz +md5 aa7b160a4b97fafe71d5546c20715b8f qtwebsockets-opensource-src-5.5.0.tar.xz
package/qt5/qt5x11extras/qt5x11extras.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e qtx11extras-opensource-src-5.4.1.tar.xz -sha1 7a75f936df70ac551cfc7b08914365cbb25b122d qtx11extras-opensource-src-5.4.1.tar.xz -md5 87d555e0c7eccaa462a9bba85fb2d4de qtx11extras-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 bcb3cec5c9f0b551f0e2de30824c8be08620fbbe466ad4846beb2ad636d0b979 qtx11extras-opensource-src-5.5.0.tar.xz +sha1 2eb25a96cc061b364d5fc30125a5ca9904857e89 qtx11extras-opensource-src-5.5.0.tar.xz +md5 9bee6d5c127ba8cc878ac7c2664d99f9 qtx11extras-opensource-src-5.5.0.tar.xz
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 qtxmlpatterns-opensource-src-5.4.1.tar.xz -sha1 b25c2ec875fa1cbe0de20fd39bdd444c703540b4 qtxmlpatterns-opensource-src-5.4.1.tar.xz -md5 ec2970e9e9c38f88be74f18101937c28 qtxmlpatterns-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 672882c670c13c5caec199173cdabffd38474d06979d261bdc6e19738e0cef53 qtxmlpatterns-opensource-src-5.5.0.tar.xz +sha1 d961f998980264f19916f70c8585da8479a84724 qtxmlpatterns-opensource-src-5.5.0.tar.xz +md5 138ab73b2376fcfca92a4bb6ab47e4a4 qtxmlpatterns-opensource-src-5.5.0.tar.xz
Signature · 1 line
2.1.0
PATCH v3 2/5 qt5base: reorder patches
Signed-off-by Julien Corjon <[email protected]>
---
.../qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
.../qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 0
...nker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} | 0
...entfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (100%)
rename package/qt5/qt5base/{0005-no-gold-linker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} (100%)
rename package/qt5/qt5base/{0008-forkd-disable-eventfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} (100%)package/qt5/qt5base/0002-mkspecs-files.patch renamed from package/qt5/qt5base/0003-mkspecs-files.patch +0 -0
package/qt5/qt5base/0003-xcb-egl-fixes.patch renamed from package/qt5/qt5base/0004-xcb-egl-fixes.patch +0 -0
package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch renamed from package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +0 -0
package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch renamed from package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch +0 -0
Signature · 1 line
2.1.0
PATCH v3 3/5 qt5quick1, qt5script, qt5webkit: tag as legacy compatibility
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
--- package/qt5/Config.in | 9 +++++---- package/qt5/qt5quick1/Config.in | 4 ++++ package/qt5/qt5script/Config.in | 4 ++++ package/qt5/qt5webkit-examples/Config.in | 4 ++++ package/qt5/qt5webkit/Config.in | 4 ++++ 5 files changed, 21 insertions(+), 4 deletions(-)
package/qt5/Config.in +5 -4
@@ -36,15 +36,16 @@ source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5multimedia/Config.in" -source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" -source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" -source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" +comment "legacy compatibility" +source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5webkit-examples/Config.in" endif
package/qt5/qt5quick1/Config.in +4 -0
@@ -15,6 +15,10 @@ config BR2_PACKAGE_QT5QUICK1 This package corresponds to the qt5quick1 module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt Quick module in new + design. + http://qt.io comment "qt5quick1 needs a toolchain w/ dynamic library"
package/qt5/qt5script/Config.in +4 -0
@@ -8,4 +8,8 @@ config BR2_PACKAGE_QT5SCRIPT This package corresponds to the qt5script module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt QML module in new + design. + http://qt.io
package/qt5/qt5webkit-examples/Config.in +4 -0
@@ -7,4 +7,8 @@ config BR2_PACKAGE_QT5WEBKIT_EXAMPLES This package contains examples for the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
package/qt5/qt5webkit/Config.in +4 -0
@@ -17,4 +17,8 @@ config BR2_PACKAGE_QT5WEBKIT This package corresponds to the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
Signature · 1 line
2.1.0
PATCH v3 4/5 qt5webengine: new package
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
--- package/qt5/Config.in | 1 + .../qt5webengine/0001-allow_all_linux_gxx.patch | 16 +++++ .../0002-switch_float_abi_for_arm_to_hard.patch | 39 ++++++++++++ package/qt5/qt5webengine/Config.in | 19 ++++++ package/qt5/qt5webengine/qt5webengine.hash | 4 ++ package/qt5/qt5webengine/qt5webengine.mk | 69 ++++++++++++++++++++++ 6 files changed, 148 insertions(+) create mode 100644 package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch create mode 100644 package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch create mode 100644 package/qt5/qt5webengine/Config.in create mode 100644 package/qt5/qt5webengine/qt5webengine.hash create mode 100644 package/qt5/qt5webengine/qt5webengine.mk
package/qt5/Config.in +1 -0
@@ -40,6 +40,7 @@ source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch new file +16 -0
@@ -0,0 +1,16 @@ +Index: qt5webengine-5.5.0/tools/qmake/mkspecs/features/functions.prf +=================================================================== +--- qt5webengine-5.5.0.orig/tools/qmake/mkspecs/features/functions.prf ++++ qt5webengine-5.5.0/tools/qmake/mkspecs/features/functions.prf +@@ -12,9 +12,9 @@ defineTest(isPlatformSupported) { + return(false) + } + +- linux-g++*:!isGCCVersionSupported(): return(false) ++ linux*g++*:!isGCCVersionSupported(): return(false) + !isPythonVersionSupported(): return(false) +- linux-g++*|win32-msvc2013|macx-clang: return(true) ++ linux*g++*|win32-msvc2013|macx-clang: return(true) + boot2qt: return(true) + + skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch new file +39 -0
@@ -0,0 +1,39 @@ +commit 779d02564f64654487db059f71c7e8257a851397 +Author: sbc <[email protected]> +Date: Sun May 17 16:52:45 2015 -0700 + + Switch default float-abi for ARM linux from softfp to hard + + All the ARM linux builders already specify this, and + armhf is the now the default for both Ubuntu and Debian. + + Followup cleanup cl for the bots: + https://codereview.chromium.org/1141643004/ + + BUG=308256 + + Review URL: https://codereview.chromium.org/1140503004 + + Cr-Original-Commit-Position: refs/heads/master@{#330316} + Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src + Cr-Mirrored-Commit: ff8ec298fd273181647ec4d94c032343382dbe57 + +diff --git a/common.gypi b/common.gypi +index cd9f5b7..2f5ea2d 100644 +--- a/common.gypi ++++ b/common.gypi +@@ -2311,9 +2311,12 @@ + }, { + 'arm_fpu%': 'vfpv3-d16', + }], ++ ['OS=="android"', { ++ 'arm_float_abi%': 'softfp', ++ }, { ++ 'arm_float_abi%': 'hard', ++ }], + ], +- # Change the default to hard once the armhf transition is complete. +- 'arm_float_abi%': 'softfp', + 'arm_thumb%': 1, + }], +
package/qt5/qt5webengine/Config.in new file +19 -0
@@ -0,0 +1,19 @@ +config BR2_PACKAGE_QT5WEBENGINE + bool "qt5webengine" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_DBUS + select BR2_PACKAGE_QT5BASE_ICU + select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webengine module. + + http://qt.io
package/qt5/qt5webengine/qt5webengine.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebengine-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d703e60838744283f9a3419bdd8708f2e01d3ed81f18aaadd713342033cbd65a qtwebengine-opensource-src-5.5.0.tar.xz +sha1 e080d91b707af6ad096e356189488ffd65115553 qtwebengine-opensource-src-5.5.0.tar.xz +md5 1405a87ce84ba58478f98e89ec1e737e qtwebengine-opensource-src-5.5.0.tar.xz
package/qt5/qt5webengine/qt5webengine.mk new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v3 4/5 qt5webengine: new package
Dear Julien Corjon,
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch
Quoted 6 lines · Julien Corjon
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch new file +0
-0@@ -0,0 +1,16 @@
This patch lacks a description + Signed-off-by. Also, don't forget to submit it upstream.
Quoted 31 lines
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch new file +16
-0+Index: qt5webengine-5.5.0/tools/qmake/mkspecs/features/functions.prf +=================================================================== +--- qt5webengine-5.5.0.orig/tools/qmake/mkspecs/features/functions.prf ++++ qt5webengine-5.5.0/tools/qmake/mkspecs/features/functions.prf +@@ -12,9 +12,9 @@ defineTest(isPlatformSupported) { + return(false) + } + +- linux-g++*:!isGCCVersionSupported(): return(false) ++ linux*g++*:!isGCCVersionSupported(): return(false) + !isPythonVersionSupported(): return(false) +- linux-g++*|win32-msvc2013|macx-clang: return(true) ++ linux*g++*|win32-msvc2013|macx-clang: return(true) + boot2qt: return(true) + + skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.")package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch new file +9
-0@@ -0,0 +1,39 @@ +commit 779d02564f64654487db059f71c7e8257a851397 +Author: sbc <[email protected]> +Date: Sun May 17 16:52:45 2015 -0700 + + Switch default float-abi for ARM linux from softfp to hard + + All the ARM linux builders already specify this, and + armhf is the now the default for both Ubuntu and Debian. +
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch line 19
Quoted 10 lines
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch new file +10
-0+ Followup cleanup cl for the bots: + https://codereview.chromium.org/1141643004/ + + BUG=308256 + + Review URL: https://codereview.chromium.org/1140503004 + + Cr-Original-Commit-Position: refs/heads/master@{#330316} + Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src + Cr-Mirrored-Commit: ff8ec298fd273181647ec4d94c032343382dbe57
Please add your Signed-off-by here as well, so that we know who integrated it in Buildroot.
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
package/qt5/qt5webengine/Config.in line 8
Quoted 13 lines
new file mode 100644
index 0000000..39c087apackage/qt5/qt5webengine/Config.in new file +8
-0@@ -0,0 +1,19 @@ +config BR2_PACKAGE_QT5WEBENGINE + bool "qt5webengine" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_DBUS + select BR2_PACKAGE_QT5BASE_ICU + select BR2_PACKAGE_QT5WEBCHANNEL
So you need qt5webchannel, so this patch should come *after* qt5webchannel is added as a package in your series.
Quoted 42 lines
package/qt5/qt5webengine/Config.in new file +11
-0+ select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webengine module. + + http://qt.iopackage/qt5/qt5webengine/qt5webengine.hash new file +4
-0@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebengine-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d703e60838744283f9a3419bdd8708f2e01d3ed81f18aaadd713342033cbd65a qtwebengine-opensource-src-5.5.0.tar.xz +sha1 e080d91b707af6ad096e356189488ffd65115553 qtwebengine-opensource-src-5.5.0.tar.xz +md5 1405a87ce84ba58478f98e89ec1e737e qtwebengine-opensource-src-5.5.0.tar.xzpackage/qt5/qt5webengine/qt5webengine.mk new file +15
-0@@ -0,0 +1,69 @@ +################################################################################ +# +# qt5webengine +# +################################################################################ + +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_SOURCE = qtwebengine-opensource-src-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_DEPENDENCIES = qt5base qt5declarative qt5webchannel libcap openssl host-gperf +QT5WEBENGINE_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5WEBENGINE_LICENSE = LGPLv2.1 with exception or LGPLv3 or GPLv2 +# Source files contain references to LGPL_EXCEPTION.txt but it is not included
package/qt5/qt5webengine/qt5webengine.mk line 25
Quoted 10 lines
package/qt5/qt5webengine/qt5webengine.mk new file +10
-0+# in the archive. +QT5WEBENGINE_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 +else +QT5WEBENGINE_LICENSE = Commercial license +QT5WEBENGINE_REDISTRIBUTE = NO +endif + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5WEBENGINE_DEPENDENCIES += qt5declarative +endif
You already have qt5declarative in the list of mandatory dependencies above. So you really need to decide whether it's an optional dependency or not.
Quoted 24 lines
package/qt5/qt5webengine/qt5webengine.mk new file +24
-0+ +define QT5WEBENGINE_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5WEBENGINE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WEBENGINE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5WEBENGINE_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWebEngine $(TARGET_DIR)/usr/qml/ +endef +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5WEBENGINE_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webengine* $(TARGET_DIR)/usr/lib/qt/examples/ +endef
package/qt5/qt5webengine/qt5webengine.mk line 59
Quoted 10 lines
package/qt5/qt5webengine/qt5webengine.mk new file +10
-0+endif + +ifneq ($(BR2_STATIC_LIBS),y) +define QT5WEBENGINE_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qtwebengine $(TARGET_DIR)/usr/lib/qt/plugins/ + cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/ + cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/ + cp -dpf $(STAGING_DIR)/usr/qtwebengine_resources.pak $(TARGET_DIR)/usr/ + # cp -dpf $(STAGING_DIR)/usr/icudtl.dat $(TARGET_DIR)/usr/
Line commented. Why?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v3 4/5 qt5webengine: new package
Dear Thomas,
It's look like I forget to send the cover letter for this series... I submited the qt webengine in hurry since you had the hackathon on the week-end and did not want you to review the v2 of qt5.5.0 integration.
In the missing cover letter I explained that qtwebengine was an work in progress and should not be considered as a commit request.
Instead of split qtwebengine in an other series I keep this one in qt5.5.0 bump series as it depend on it. Not sure it was a good idea...
Le 19/07/2015 15:02, Thomas Petazzoni a ?crit :
Quoted 4 lines
Dear Julien Corjon,
On Fri, 10 Jul 2015 16:20:21 +0200, Julien Corjon wrote:
Quoted 10 lines
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch
Quoted 6 lines
package/qt5/qt5webengine/0001-allow_all_linux_gxx.patch new file +0
-0@@ -0,0 +1,16 @@This patch lacks a description + Signed-off-by. Also, don't forget to submit it upstream.
Ok, I will add a description and a Signed off in a v4. Also I'm not sure to submit it upstream since Yocto community tagged the (almost) same patch as 'Inappropriate [OE specific]'[1].
In the source file we can read : 'Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation' [2] but Qt community intend to support embedded linux and embedded Android [3].
...
Quoted 20 lines
Quoted 20 lines
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch new file +14
-0@@ -0,0 +1,39 @@ +commit 779d02564f64654487db059f71c7e8257a851397 +Author: sbc <[email protected]> +Date: Sun May 17 16:52:45 2015 -0700 + + Switch default float-abi for ARM linux from softfp to hard + + All the ARM linux builders already specify this, and + armhf is the now the default for both Ubuntu and Debian. + + Followup cleanup cl for the bots: + https://codereview.chromium.org/1141643004/ + + BUG=308256 +
Quoted 9 lines
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch line 19
Quoted 5 lines
package/qt5/qt5webengine/0002-switch_float_abi_for_arm_to_hard.patch new file +5
-0+ Review URL: https://codereview.chromium.org/1140503004 + + Cr-Original-Commit-Position: refs/heads/master@{#330316} + Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src + Cr-Mirrored-Commit: ff8ec298fd273181647ec4d94c032343382dbe57Please add your Signed-off-by here as well, so that we know who integrated it in Buildroot.
To be done in a v4 version. I realize afterwards that this patch will not apply 'as is' since it is from chromium project and the file does not have the same path in qt5webengine sources.
Quoted 19 lines
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
package/qt5/qt5webengine/Config.in line 8
Quoted 13 lines
new file mode 100644
index 0000000..39c087apackage/qt5/qt5webengine/Config.in new file +8
-0@@ -0,0 +1,19 @@ +config BR2_PACKAGE_QT5WEBENGINE + bool "qt5webengine" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_DBUS + select BR2_PACKAGE_QT5BASE_ICU + select BR2_PACKAGE_QT5WEBCHANNELSo you need qt5webchannel, so this patch should come *after* qt5webchannel is added as a package in your series.
I messed-up with git (I had mixed rebase/amend on several branches) and did not find a way to force webchannel before webengine in patches order.
Quoted 48 lines
Quoted 48 lines
package/qt5/qt5webengine/Config.in new file +11
-0+ select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webengine module. + + http://qt.iopackage/qt5/qt5webengine/qt5webengine.hash new file +4
-0@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebengine-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d703e60838744283f9a3419bdd8708f2e01d3ed81f18aaadd713342033cbd65a qtwebengine-opensource-src-5.5.0.tar.xz +sha1 e080d91b707af6ad096e356189488ffd65115553 qtwebengine-opensource-src-5.5.0.tar.xz +md5 1405a87ce84ba58478f98e89ec1e737e qtwebengine-opensource-src-5.5.0.tar.xzpackage/qt5/qt5webengine/qt5webengine.mk new file +21
-0@@ -0,0 +1,69 @@ +################################################################################ +# +# qt5webengine +# +################################################################################ + +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE) +QT5WEBENGINE_SOURCE = qtwebengine-opensource-src-$(QT5WEBENGINE_VERSION).tar.xz +QT5WEBENGINE_DEPENDENCIES = qt5base qt5declarative qt5webchannel libcap openssl host-gperf +QT5WEBENGINE_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5WEBENGINE_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. +QT5WEBENGINE_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 +else +QT5WEBENGINE_LICENSE = Commercial license +QT5WEBENGINE_REDISTRIBUTE = NO +endif
Quoted 9 lines
package/qt5/qt5webengine/qt5webengine.mk line 25
Quoted 4 lines
package/qt5/qt5webengine/qt5webengine.mk new file +4
-0+ +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5WEBENGINE_DEPENDENCIES += qt5declarative +endifYou already have qt5declarative in the list of mandatory dependencies above. So you really need to decide whether it's an optional dependency or not.
I'm not sure yet.
Quoted 28 lines
Quoted 28 lines
package/qt5/qt5webengine/qt5webengine.mk new file +28
-0+ +define QT5WEBENGINE_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5WEBENGINE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WEBENGINE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) +define QT5WEBENGINE_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtWebEngine $(TARGET_DIR)/usr/qml/ +endef +endif + +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT5WEBENGINE_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webengine* $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + +ifneq ($(BR2_STATIC_LIBS),y) +define QT5WEBENGINE_INSTALL_TARGET_LIBS
Quoted 8 lines
package/qt5/qt5webengine/qt5webengine.mk line 59
Quoted 6 lines
package/qt5/qt5webengine/qt5webengine.mk new file +6
-0+ cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qtwebengine $(TARGET_DIR)/usr/lib/qt/plugins/ + cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/ + cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/ + cp -dpf $(STAGING_DIR)/usr/qtwebengine_resources.pak $(TARGET_DIR)/usr/ + # cp -dpf $(STAGING_DIR)/usr/icudtl.dat $(TARGET_DIR)/usr/Line commented. Why?
Install on staging try to copy icudtl.dat but this file is not built. Since i don't know why, i keeped this line as comment for futher investigation.
Quoted 3 lines
Thomas
[1]
https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
[2]
https://github.com/qtproject/qtwebengine/blob/dev/tools/qmake/mkspecs/features/functions.prf
[3] https://wiki.qt.io/QtWebEngine
Regards
Julien Corjon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: corjon_j.vcf
Type: text/x-vcard
Size: 428 bytes
Desc: corjon_j.vcf
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150720/f9f94307/attachment.vcf>
PATCH v3 4/5 qt5webengine: new package
Julien,
Quoted 9 lines · Julien CORJON
It's look like I forget to send the cover letter for this series... I submited the qt webengine in hurry since you had the hackathon on the week-end and did not want you to review the v2 of qt5.5.0 integration.
In the missing cover letter I explained that qtwebengine was an work in progress and should not be considered as a commit request.
Instead of split qtwebengine in an other series I keep this one in qt5.5.0 bump series as it depend on it. Not sure it was a good idea...
Ok, then maybe your next version should only contain the Qt 5.5 bump, and then you can send the qt5webengine patch separately once you consider it ready.
Quoted 6 lines
Quoted 3 lines
So you need qt5webchannel, so this patch should come *after* qt5webchannel is added as a package in your series.
I messed-up with git (I had mixed rebase/amend on several branches) and did not find a way to force webchannel before webengine in patches order.
Just use 'git rebase -i'. It allows you to re-order your commits at any time.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v3 4/5 qt5webengine: new package
Julien, Thomas, All,
Quoted 23 lines · Thomas Petazzoni
Julien,
Quoted 9 lines · Julien CORJON
It's look like I forget to send the cover letter for this series... I submited the qt webengine in hurry since you had the hackathon on the week-end and did not want you to review the v2 of qt5.5.0 integration.
In the missing cover letter I explained that qtwebengine was an work in progress and should not be considered as a commit request.
Instead of split qtwebengine in an other series I keep this one in qt5.5.0 bump series as it depend on it. Not sure it was a good idea...
Ok, then maybe your next version should only contain the Qt 5.5 bump, and then you can send the qt5webengine patch separately once you consider it ready.
Quoted 4 lines
Quoted 3 lines
So you need qt5webchannel, so this patch should come *after* qt5webchannel is added as a package in your series.
Quoted 5 lines
Quoted 2 lines
I messed-up with git (I had mixed rebase/amend on several branches) and did not find a way to force webchannel before webengine in patches order.
Just use 'git rebase -i'. It allows you to re-order your commits at any time.
Any update on this package? I'm asking since webkit is declared as deprecated/legacy without an alternative. Let me know if I can be of any help.
Regards,
Gary
PATCH v3 4/5 qt5webengine: new package
Gary,
Quoted 3 lines · Gary Bisson
Any update on this package? I'm asking since webkit is declared as deprecated/legacy without an alternative. Let me know if I can be of any help.
Right now, there is no longer any qt5webengine patch pending in patchwork, so we're waiting for someone to resend an updated version of the patch.
If you have some time, and Julien Corjon agrees, maybe you can adopt his patch?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v3 4/5 qt5webengine: new package
Gary,
Le 23/12/2015 10:49, Thomas Petazzoni a ?crit :
Quoted 7 lines
Gary,
Quoted 3 lines · Gary Bisson
Any update on this package? I'm asking since webkit is declared as deprecated/legacy without an alternative. Let me know if I can be of any help.
I did not work on this qt module since my previous post. And QtWebkit will be removed in Qt 5.6.0 released package (but sources will be still available [1])
Quoted 7 lines
Right now, there is no longer any qt5webengine patch pending in patchwork, so we're waiting for someone to resend an updated version of the patch.
If you have some time, and Julien Corjon agrees, maybe you can adopt his patch?
Sure, you can adopt my patch and make every modifications needed to make it work :-)
With the release of Qt 5.6.0-beta I have start a branch to take a look on status of pending Qt patch and evaluate the integration effort of the 'new/not integrated yet' modules in Buildroot (canvas3D, location, QuickControl2, Wayland, WebEngine, WebView).
Regards,
Julien
Quoted 5 lines
Thanks,
Thomas
PATCH v3 4/5 qt5webengine: new package
Julien, Thomas, All,
Thanks for the quick replies.
Quoted 20 lines · Julien CORJON
Gary,
Le 23/12/2015 10:49, Thomas Petazzoni a ?crit :
Quoted 7 lines
Gary,
Quoted 3 lines · Gary Bisson
Any update on this package? I'm asking since webkit is declared as deprecated/legacy without an alternative. Let me know if I can be of any help.
I did not work on this qt module since my previous post. And QtWebkit will be removed in Qt 5.6.0 released package (but sources will be still available [1])
Quoted 5 lines
Right now, there is no longer any qt5webengine patch pending in patchwork, so we're waiting for someone to resend an updated version of the patch.
Quoted 5 lines
Quoted 2 lines
If you have some time, and Julien Corjon agrees, maybe you can adopt his patch?
Sure, you can adopt my patch and make every modifications needed to make it work :-)
Ok I'll look at it when I have time. I definitely would like to see the package for next release. Not sure I'll be able to submit anything before next year though.
Regarding the current patch, I'm not sure about the armhf patch, does it default to armhf all the time (except when OS=android) even if the toolchain doesn't support it?
Also dependencies need some work since this package implicitly depend on OpenGL, so the select of BR2_PACKAGE_QT5DECLARATIVE_QUICK can fail currently.
Quoted 4 lines
With the release of Qt 5.6.0-beta I have start a branch to take a look on status of pending Qt patch and evaluate the integration effort of the 'new/not integrated yet' modules in Buildroot (canvas3D, location, QuickControl2, Wayland, WebEngine, WebView).
I don't feel brave enough to look at all those items, that's for sure. I'll let you know once I've spent some time on webengine.
Regards,
Gary
PATCH v3 4/5 qt5webengine: new package
Gary,
Le 23/12/2015 15:21, Gary Bisson a ?crit :
Quoted 28 lines
Julien, Thomas, All,
Thanks for the quick replies.
Quoted 23 lines · Julien CORJON
Gary,
Le 23/12/2015 10:49, Thomas Petazzoni a ?crit :
Quoted 7 lines
Gary,
Quoted 3 lines · Gary Bisson
Any update on this package? I'm asking since webkit is declared as deprecated/legacy without an alternative. Let me know if I can be of any help.
I did not work on this qt module since my previous post. And QtWebkit will be removed in Qt 5.6.0 released package (but sources will be still available [1])
Quoted 7 lines
Right now, there is no longer any qt5webengine patch pending in patchwork, so we're waiting for someone to resend an updated version of the patch.
If you have some time, and Julien Corjon agrees, maybe you can adopt his patch?
Quoted 6 lines
Quoted 2 lines
Sure, you can adopt my patch and make every modifications needed to make it work :-)
Ok I'll look at it when I have time. I definitely would like to see the package for next release. Not sure I'll be able to submit anything before next year though.
Chromium is not an easy one. I give up because I didn't had enough time and skill...
Quoted 4 lines
Regarding the current patch, I'm not sure about the armhf patch, does it default to armhf all the time (except when OS=android) even if the toolchain doesn't support it?
It default to armhf for arm7 even if the toolchain doesn't support it. It had some issue to compile with the linaro toolchain so i took this patch from chromium.
Quoted 3 lines
Also dependencies need some work since this package implicitly depend on OpenGL, so the select of
BR2_PACKAGE_QT5DECLARATIVE_QUICKcan fail currently.
Indeed
Quoted 12 lines
Quoted 5 lines
With the release of Qt 5.6.0-beta I have start a branch to take a look on status of pending Qt patch and evaluate the integration effort of the 'new/not integrated yet' modules in Buildroot (canvas3D, location, QuickControl2, Wayland, WebEngine, WebView).
I don't feel brave enough to look at all those items, that's for sure. I'll let you know once I've spent some time on webengine.
Regards,
Gary
PATCH v3 5/5 qt/qt5webchannel: new package
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
--- package/qt5/Config.in | 1 + package/qt5/qt5webchannel/Config.in | 11 +++++ package/qt5/qt5webchannel/qt5webchannel.hash | 4 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 61 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 package/qt5/qt5webchannel/Config.in create mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash create mode 100644 package/qt5/qt5webchannel/qt5webchannel.mk
package/qt5/Config.in +1 -0
@@ -40,6 +40,7 @@ source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webengine/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in"
package/qt5/qt5webchannel/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5WEBCHANNEL + bool "qt5webchannel" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5WEBSOCKETS + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webchannel module. + + http://qt.io
package/qt5/qt5webchannel/qt5webchannel.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebchannel-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 94f88604ff0b29a30f1a1b13601d4bce9af5c0a96c43869705aee1596aeb2d8d qtwebchannel-opensource-src-5.5.0.tar.xz +sha1 7c45ecb9c4226207f184b5cf25d1a18d650075da qtwebchannel-opensource-src-5.5.0.tar.xz +md5 c20146286108477cdab60c67d2d87dc7 qtwebchannel-opensource-src-5.5.0.tar.xz
package/qt5/qt5webchannel/qt5webchannel.mk new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.1.0
v4 cover qt5 bump to 5.5.0
In reply to Julien CorjonThis series aim to bump Qt to the 5.5.0 version.
QtWebkit, QtScript & QtQuick modules as been tagged as deprecated by Qt [1] but these modules are still released in Qt-5.5.0 so they are tagged as 'legacy compatibility' in menuconfig.
Qt5WebChannel is a rebase of my previous patch[2] on top of Qt-5.5.0
[1] https://wiki.qt.io/New_Features_in_Qt_5.5#Deprecated_Functionality
[2] http://permalink.gmane.org/gmane.comp.lib.uclibc.buildroot/118411
Julien Corjon (4):
qt5: bump version to 5.5.0
qt/qt5base: reorder patches
qt/qt5quick1, qt/qt5script, qt/qt5webkit: tag as legacy compatibility qt/qt5webchannel: new package
package/qt5/Config.in | 10 +-
package/qt5/qt5.mk | 4 +-
...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ----
...kspecs-files.patch => 0002-mkspecs-files.patch} | 0
...cb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 9 +-
.../0004-no-gold-linker-for-host-build.patch | 41 ++++
.../0005-forkd-disable-eventfd-for-uclibc.patch | 19 ++
.../0005-no-gold-linker-for-host-build.patch | 27 ---
...nfigure-fix-gold-linker-support-detection.patch | 36 ---
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++
.../0007-configure-add-psql_config-option.patch | 61 -----
package/qt5/qt5base/qt5base.hash | 8 +-
package/qt5/qt5base/qt5base.mk | 8 +-
.../0001-Fix-build-with-no-c-11.patch | 267 ---------------------
...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ----
package/qt5/qt5connectivity/qt5connectivity.hash | 8 +-
package/qt5/qt5declarative/qt5declarative.hash | 8 +-
package/qt5/qt5enginio/qt5enginio.hash | 8 +-
.../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +-
package/qt5/qt5imageformats/qt5imageformats.hash | 8 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 8 +-
package/qt5/qt5quick1/Config.in | 4 +
package/qt5/qt5quick1/qt5quick1.hash | 8 +-
package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +-
package/qt5/qt5script/Config.in | 4 +
package/qt5/qt5script/qt5script.hash | 8 +-
package/qt5/qt5sensors/qt5sensors.hash | 8 +-
package/qt5/qt5serialport/qt5serialport.hash | 8 +-
package/qt5/qt5svg/qt5svg.hash | 8 +-
package/qt5/qt5webchannel/Config.in | 11 +
package/qt5/qt5webchannel/qt5webchannel.hash | 4 +
package/qt5/qt5webchannel/qt5webchannel.mk | 61 +++++
package/qt5/qt5webkit-examples/Config.in | 4 +
.../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +-
package/qt5/qt5webkit/Config.in | 4 +
package/qt5/qt5webkit/qt5webkit.hash | 8 +-
package/qt5/qt5websockets/qt5websockets.hash | 8 +-
package/qt5/qt5x11extras/qt5x11extras.hash | 8 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +-
39 files changed, 285 insertions(+), 572 deletions(-)
delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (88%)
create mode 100644 package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch
create mode 100644 package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch
delete mode 100644 package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch
delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch
create mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch
delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch
delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
create mode 100644 package/qt5/qt5webchannel/Config.in
create mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
create mode 100644 package/qt5/qt5webchannel/qt5webchannel.mkSignature · 1 line
2.1.0
PATCH v4 1/4 qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1]. We still need specifics include path for rpi eglfs support.
0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
[1] https://codereview.qt-project.org/#/c/107548/
Passed test :
- Full compilation on ARM/uClibc
- Partialy compiled and tested on i.MX6/linaro with OpenGL backend
- Partialy compiled but not executed for Raspberry Pi (rpi-userland)
Signed-off-by Julien Corjon <[email protected]>
---
v3 -> v4 :
- Fix rpi-userland header inclusion (detected by Thomas and fix with the help of Yann)
- Remove Tested-by tags (suggested by Thomas)
v2 -> v3 :
- Re-include modification of qt5base.mk lost in rebase...
v1 -> v2 :
- Rewrite commit message (suggested by Thomas)
- Fix comment on uclibc version in patch 0008-... (suggested by Thomas)
package/qt5/qt5.mk | 4 +- ...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ---- package/qt5/qt5base/0004-xcb-egl-fixes.patch | 9 +- .../0005-no-gold-linker-for-host-build.patch | 40 ++- ...nfigure-fix-gold-linker-support-detection.patch | 36 --- .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++ .../0007-configure-add-psql_config-option.patch | 61 ----- .../0008-forkd-disable-eventfd-for-uclibc.patch | 19 ++ package/qt5/qt5base/qt5base.hash | 8 +- package/qt5/qt5base/qt5base.mk | 8 +- .../0001-Fix-build-with-no-c-11.patch | 267 --------------------- ...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ---- package/qt5/qt5connectivity/qt5connectivity.hash | 8 +- package/qt5/qt5declarative/qt5declarative.hash | 8 +- package/qt5/qt5enginio/qt5enginio.hash | 8 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +- package/qt5/qt5imageformats/qt5imageformats.hash | 8 +- package/qt5/qt5multimedia/qt5multimedia.hash | 8 +- package/qt5/qt5quick1/qt5quick1.hash | 8 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +- package/qt5/qt5script/qt5script.hash | 8 +- package/qt5/qt5sensors/qt5sensors.hash | 8 +- package/qt5/qt5serialport/qt5serialport.hash | 8 +- package/qt5/qt5svg/qt5svg.hash | 8 +- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +- package/qt5/qt5webkit/qt5webkit.hash | 8 +- package/qt5/qt5websockets/qt5websockets.hash | 8 +- package/qt5/qt5x11extras/qt5x11extras.hash | 8 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +- 29 files changed, 173 insertions(+), 554 deletions(-) delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch create mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch create mode 100644 package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
package/qt5/qt5.mk +2 -2
@@ -1,5 +1,5 @@ -QT5_VERSION_MAJOR = 5.4 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION_MAJOR = 5.5 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch deleted +0 -48
48 lines not on this page · raw message
package/qt5/qt5base/0004-xcb-egl-fixes.patch +5 -4
@@ -49,15 +49,16 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> ---- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400 -@@ -49,8 +49,8 @@ +--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp ++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +@@ -41,8 +41,8 @@ - #include <QtPlatformSupport/private/qdevicediscovery_p.h> + #include <QtGui/private/qguiapplication_p.h> -#include "qeglplatformcursor_p.h" #include "qeglplatformintegration_p.h" +#include "qeglplatformcursor_p.h" + #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE
package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +27 -13
@@ -1,27 +1,41 @@ -Use the gold linker only for target builds +From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Tue, 19 May 2015 21:30:21 +0200 +Subject: [PATCH] Disable gold linker/new dtags support for host builds -Availability of the gold linker is only tested with the -cross-compiler, not the host compiler, so Qt shouldn't assume it's -available when doing host builds. +There is no test for gold linker and new dtags support for the host build +(only for the target compiler/build) which leads to trouble in some cross +compiling environments (see [1] for details). -This fixes build failures occuring when cross-compiling Qt5 with a -gold capable cross-compiler, on a host that has a too old compiler to -support gold. +So disable gold linker/new dtags support unconditionally for host builds. -Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. +[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html -Signed-off-by: Thomas Petazzoni <[email protected]> +Task-number: QTBUG-46125 +Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 +Reviewed-by: Oswald Buddenhagen <[email protected]> +--- + mkspecs/features/default_post.prf | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) -Index: b/mkspecs/features/default_post.prf -=================================================================== +diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf +index 8e68b95..bcaddc8 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf -@@ -62,7 +62,7 @@ +@@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD +-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++# disable special linker flags for host builds (no proper test for host support yet) ++!host_build { ++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +2.1.0 +
package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Sun, 15 Feb 2015 22:58:07 +0100 -Subject: [PATCH] configure: fix gold linker support detection - -Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 - -While the -fuse-ld=gold flag is related to linking, it is an argument to the -compiler driver to tell it what linker to execute, NOT an option to tell the -linker to behave differently. - -So it shouldn't get prefixed with -Wl when passed though the compiler driver. - -Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 043d9fc..987d7f0 100755 ---- a/configure -+++ b/configure -@@ -3263,7 +3263,7 @@ fi - - # auto-detect -fuse-ld=gold support - if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then -- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then -+ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then - CFG_USE_GOLD_LINKER=yes - else - if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then --- -2.1.3 -
package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch new file +45 -0
45 lines not on this page · raw message
package/qt5/qt5base/0007-configure-add-psql_config-option.patch deleted +0 -61
61 lines not on this page · raw message
package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch new file +19 -0
@@ -0,0 +1,19 @@ +Disable eventfd in forkd for uClibc <= 0.9.33 toolchains + +Signed-off-by: Julien Corjon <[email protected]> + +Index: qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +=================================================================== +--- qt5base-5.5.0.orig/src/3rdparty/forkfd/forkfd.c ++++ qt5base-5.5.0/src/3rdparty/forkfd/forkfd.c +@@ -48,6 +48,10 @@ + # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) + # define HAVE_PIPE2 1 + # endif ++# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33))) ++# undef HAVE_EVENTFD ++# undef HAVE_PIPE2 ++# endif + #endif + + #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
package/qt5/qt5base/qt5base.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 qtbase-opensource-src-5.4.1.tar.xz -sha1 134ec03371722cc31e2041a82c255cec708ca848 qtbase-opensource-src-5.4.1.tar.xz -md5 9507825e558c980fed602de1f16ec7ae qtbase-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 893f0691739c00d13ff85bf8d3fd14e1c7a62fbbbcffa44b0491da4d5e570965 qtbase-opensource-src-5.5.0.tar.xz +sha1 3d6734bc6d00e1017c1db40d68309997bdf7bf6f qtbase-opensource-src-5.5.0.tar.xz +md5 252613b5a180c94d7196d10467a4f08b qtbase-opensource-src-5.5.0.tar.xz
package/qt5/qt5base/qt5base.mk +3 -5
@@ -123,12 +123,10 @@ QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux endif else QT5BASE_CONFIGURE_OPTS += -no-eglfs
@@ -167,6 +165,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
@@ -202,7 +201,6 @@ define QT5BASE_CONFIGURE_CMDS -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef
package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch deleted +0 -267
267 lines not on this page · raw message
package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch deleted +0 -46
46 lines not on this page · raw message
package/qt5/qt5connectivity/qt5connectivity.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 82c4ffb590f6716672da271ad41c51499b888b46140f40b06367b9eace7b2360 qtconnectivity-opensource-src-5.4.1.tar.xz -sha1 b49f34507f2ebebd400391a48244828d4ff89fa3 qtconnectivity-opensource-src-5.4.1.tar.xz -md5 056c7eba6a396bbd82d265feca1fe47b qtconnectivity-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f1cfdd934e11dc114039c84a6a6b83870b56b2966715f1cb266f25bce1524302 qtconnectivity-opensource-src-5.5.0.tar.xz +sha1 b393471529502028b0d5318088a27e48e944bc90 qtconnectivity-opensource-src-5.5.0.tar.xz +md5 31b005585b2be1c8aca9ea585a90f2b0 qtconnectivity-opensource-src-5.5.0.tar.xz
package/qt5/qt5declarative/qt5declarative.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 qtdeclarative-opensource-src-5.4.1.tar.xz -sha1 fb345784035caafef2d848bb29ad6bfce8ec2f8f qtdeclarative-opensource-src-5.4.1.tar.xz -md5 86dfe5c41e14a142c72fdaa6a64f933c qtdeclarative-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 858a12c5647764da8f81edec4ed444af77888cf931b739c10168064ae96f6773 qtdeclarative-opensource-src-5.5.0.tar.xz +sha1 f41766db6f6bc8b9cefff05543891c271436043e qtdeclarative-opensource-src-5.5.0.tar.xz +md5 1452c92f8c660dc7d23d9e17d89f8716 qtdeclarative-opensource-src-5.5.0.tar.xz
package/qt5/qt5enginio/qt5enginio.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 aedb131c29180c7dbc41f888d6a078378a2dd3337766461734cc1b8f07e9577a qtenginio-opensource-src-5.4.1.tar.xz -sha1 35da0343762a6aa7ded2c62aa4b36e77152a9240 qtenginio-opensource-src-5.4.1.tar.xz -md5 c80b967b159c513350fcfca223f435d4 qtenginio-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f61c4b2a26550bcb5e81cfcde55b1e521ee021226679dc9f60ab6c55f21f1520 qtenginio-opensource-src-5.5.0.tar.xz +sha1 14b961bea8cf2f2d4510283d6120038dbf90d29d qtenginio-opensource-src-5.5.0.tar.xz +md5 917e3105fe125068942f39e775f621ad qtenginio-opensource-src-5.5.0.tar.xz
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c qtgraphicaleffects-opensource-src-5.4.1.tar.xz -sha1 9d0637176c9ce0006917dc52e6d20c975f0fb9a8 qtgraphicaleffects-opensource-src-5.4.1.tar.xz -md5 02bec01c2af9a7d08582fbffbfa4976a qtgraphicaleffects-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f143514e7414797f264fea6348635e1db3e15d13e326af4a6b355fecf0a147ee qtgraphicaleffects-opensource-src-5.5.0.tar.xz +sha1 1e9ca2b5d1fdfe6a73dfd646868c5351989ecccc qtgraphicaleffects-opensource-src-5.5.0.tar.xz +md5 2fb95cecb2ab0542cb0b5847c65600c3 qtgraphicaleffects-opensource-src-5.5.0.tar.xz
package/qt5/qt5imageformats/qt5imageformats.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f qtimageformats-opensource-src-5.4.1.tar.xz -sha1 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba qtimageformats-opensource-src-5.4.1.tar.xz -md5 1436680e00ea3e211fd0abdb7c18014a qtimageformats-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 6479d1d2ac5b7dd85566799e13a173e525cbccd5c8bd43e7db1bdaf772af8955 qtimageformats-opensource-src-5.5.0.tar.xz +sha1 cffd35f9742f13a0c5afc04eab27b7b47338e800 qtimageformats-opensource-src-5.5.0.tar.xz +md5 72cbebfda5253dece90fa90ded64e953 qtimageformats-opensource-src-5.5.0.tar.xz
package/qt5/qt5multimedia/qt5multimedia.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e qtmultimedia-opensource-src-5.4.1.tar.xz -sha1 5e9f06cccc86608ab185fc31a338b7b215342288 qtmultimedia-opensource-src-5.4.1.tar.xz -md5 7412a5c62da71b44b9f29e29fdc6af4d qtmultimedia-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a8bf1bd59bad74bba2906e6a86faa1cf008c8dba5f5a9cdea72eb0ce5f85355b qtmultimedia-opensource-src-5.5.0.tar.xz +sha1 3438c16f498e40eaa68cd518b76ddd81c02a5471 qtmultimedia-opensource-src-5.5.0.tar.xz +md5 2759807c5d1842ee69e516aacd5e756a qtmultimedia-opensource-src-5.5.0.tar.xz
package/qt5/qt5quick1/qt5quick1.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d qtquick1-opensource-src-5.4.1.tar.xz -sha1 f89cccdeac4c31157ac8b97fa96d426b5bb18630 qtquick1-opensource-src-5.4.1.tar.xz -md5 16d711d20238e3220fc4030dab608f0b qtquick1-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 db563b33e1670bc8a254d53c0a8e29ba501b903fafcd3b7e3d2ab845db0dfa2c qtquick1-opensource-src-5.5.0.tar.xz +sha1 27d67436cd902bb8b89b5808e4cc4a34fd61ac75 qtquick1-opensource-src-5.5.0.tar.xz +md5 8cd53fd1100e7f7cdf5b14f7c227e7b9 qtquick1-opensource-src-5.5.0.tar.xz
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 qtquickcontrols-opensource-src-5.4.1.tar.xz -sha1 696ddb887bba366cb8132e53a94d571ac94666b8 qtquickcontrols-opensource-src-5.4.1.tar.xz -md5 2950c8df9da1e3d418a1e209d24f503a qtquickcontrols-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 df616aa6b390797f92f33115510961d1a53a55c349a18ae21f74b4aff478c2ea qtquickcontrols-opensource-src-5.5.0.tar.xz +sha1 9b12048acb3555f7e98bd6c1333437fb04cf60d6 qtquickcontrols-opensource-src-5.5.0.tar.xz +md5 24b59d5928092f02e0cba969d9548350 qtquickcontrols-opensource-src-5.5.0.tar.xz
package/qt5/qt5script/qt5script.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf qtscript-opensource-src-5.4.1.tar.xz -sha1 1b9ede97f3120c95c2dce322b6140eeb20416044 qtscript-opensource-src-5.4.1.tar.xz -md5 70165fd13fa0ba5b1f577f849f0c4f12 qtscript-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 343932ea8b2ecb16c3d9b49db55a7975f2f22534055608de4b06b1e38d867e8b qtscript-opensource-src-5.5.0.tar.xz +sha1 ed5cf73c8217a249535442c49a8a0e5c43f6e648 qtscript-opensource-src-5.5.0.tar.xz +md5 1e9766d2651d6a81221525462378336d qtscript-opensource-src-5.5.0.tar.xz
package/qt5/qt5sensors/qt5sensors.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 qtsensors-opensource-src-5.4.1.tar.xz -sha1 b02811264b6d6fd790d4f3b68f42d6162e73fc4f qtsensors-opensource-src-5.4.1.tar.xz -md5 0787b72a67d1e38a3a47b54b84a6dc42 qtsensors-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 8d5a989df94b28dac872f3b28437982ecc6434b38b44da75f1d4bf81915fd14b qtsensors-opensource-src-5.5.0.tar.xz +sha1 bd4b2fb7685f80ef1661ced90ff665b4b27216aa qtsensors-opensource-src-5.5.0.tar.xz +md5 68ea0a61147a4934ca0fbd04fae10ed6 qtsensors-opensource-src-5.5.0.tar.xz
package/qt5/qt5serialport/qt5serialport.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff qtserialport-opensource-src-5.4.1.tar.xz -sha1 c87b381d6a0b6445c7fab54ef2807a555bfbcb47 qtserialport-opensource-src-5.4.1.tar.xz -md5 2333d25916a74260ce39b8a77c7c4288 qtserialport-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a60e2d2113c1c3895b71c901921f83b81e9b3c59e3620cf94bd8647730efa866 qtserialport-opensource-src-5.5.0.tar.xz +sha1 371da46f2f2ad652a22b0f04e4b48f088976d3ce qtserialport-opensource-src-5.5.0.tar.xz +md5 8a76f051ed28a9c925d32f5864d33e78 qtserialport-opensource-src-5.5.0.tar.xz
package/qt5/qt5svg/qt5svg.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c qtsvg-opensource-src-5.4.1.tar.xz -sha1 f5bcaa91bd20ba7cdf27006a5553a6f182b62994 qtsvg-opensource-src-5.4.1.tar.xz -md5 b4a1e4f5dae26a7500f4f61a550f67eb qtsvg-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 00efdeec66d34dabeddf17c510c0d607179991566a030d461968a16d6322e19f qtsvg-opensource-src-5.5.0.tar.xz +sha1 9238a1aedd126f84a73014c12b6391267238da0a qtsvg-opensource-src-5.5.0.tar.xz +md5 08234e3c3696f1a75df30201ca16d4bc qtsvg-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit-examples/qt5webkit-examples.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a qtwebkit-examples-opensource-src-5.4.1.tar.xz -sha1 7a150502661a3af7dde5c546cdd4a335068a0298 qtwebkit-examples-opensource-src-5.4.1.tar.xz -md5 783bfd27e79769f3ceeb206a4921400b qtwebkit-examples-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d25564fb56e8e06ad782390c7a7cf2c80f52c1dac5a8cac6ad5382711cd4bd12 qtwebkit-examples-opensource-src-5.5.0.tar.xz +sha1 706464b813e9910fefd4af83e479a8247fd50a68 qtwebkit-examples-opensource-src-5.5.0.tar.xz +md5 5005737b4b29a76c70d2d08e5b105a66 qtwebkit-examples-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit/qt5webkit.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf qtwebkit-opensource-src-5.4.1.tar.xz -sha1 6cfebb74d334e77e26ecbe7d6609578eb46ab276 qtwebkit-opensource-src-5.4.1.tar.xz -md5 186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec qtwebkit-opensource-src-5.5.0.tar.xz +sha1 8489ffa9253ab429b75f65117e435624dd78f769 qtwebkit-opensource-src-5.5.0.tar.xz +md5 5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz
package/qt5/qt5websockets/qt5websockets.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 qtwebsockets-opensource-src-5.4.1.tar.xz -sha1 3fb9be047b67673f40d272faab5ba0c8055e7717 qtwebsockets-opensource-src-5.4.1.tar.xz -md5 308e1e9126e6fab8b06616db9810973e qtwebsockets-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 1ad465b1b2d1e6dddbdc403af9f69d93b1c408f6903c28ccaa52058df7ee8ae8 qtwebsockets-opensource-src-5.5.0.tar.xz +sha1 215f4e8d8170933d68e9395d966ecf6213fc0a74 qtwebsockets-opensource-src-5.5.0.tar.xz +md5 aa7b160a4b97fafe71d5546c20715b8f qtwebsockets-opensource-src-5.5.0.tar.xz
package/qt5/qt5x11extras/qt5x11extras.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e qtx11extras-opensource-src-5.4.1.tar.xz -sha1 7a75f936df70ac551cfc7b08914365cbb25b122d qtx11extras-opensource-src-5.4.1.tar.xz -md5 87d555e0c7eccaa462a9bba85fb2d4de qtx11extras-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 bcb3cec5c9f0b551f0e2de30824c8be08620fbbe466ad4846beb2ad636d0b979 qtx11extras-opensource-src-5.5.0.tar.xz +sha1 2eb25a96cc061b364d5fc30125a5ca9904857e89 qtx11extras-opensource-src-5.5.0.tar.xz +md5 9bee6d5c127ba8cc878ac7c2664d99f9 qtx11extras-opensource-src-5.5.0.tar.xz
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 qtxmlpatterns-opensource-src-5.4.1.tar.xz -sha1 b25c2ec875fa1cbe0de20fd39bdd444c703540b4 qtxmlpatterns-opensource-src-5.4.1.tar.xz -md5 ec2970e9e9c38f88be74f18101937c28 qtxmlpatterns-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 672882c670c13c5caec199173cdabffd38474d06979d261bdc6e19738e0cef53 qtxmlpatterns-opensource-src-5.5.0.tar.xz +sha1 d961f998980264f19916f70c8585da8479a84724 qtxmlpatterns-opensource-src-5.5.0.tar.xz +md5 138ab73b2376fcfca92a4bb6ab47e4a4 qtxmlpatterns-opensource-src-5.5.0.tar.xz
Signature · 1 line
2.1.0
PATCH v4 1/4 qt5: bump version to 5.5.0
Dear Julien Corjon,
package/qt5/qt5base/qt5base.mk QT5BASE_CONFIGURE_OPTS += -eglfs · line 125
Quoted 6 lines · Julien Corjon
package/qt5/qt5base/qt5base.mk +0
-0@@ -123,12 +123,10 @@ QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND
So here we use this QT5BASE_EXTRA_CFLAGS mechanism.
package/qt5/qt5base/qt5base.mk QT5BASE_CONFIGURE_OPTS += -eglfs · line 129
Quoted 8 lines
package/qt5/qt5base/qt5base.mk +2
-4-QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads +QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
And here we pass -I directly to the configure script.
I'm wondering if there isn't some room for factorization here. Maybe the -DENABLE_MX6_WORKAROUND could be passed as a configure option as well:
$ ./configure --help
-D <string> ........ Add an explicit define to the preprocessor. -I <string> ........ Add an explicit include path.
-L <string> ........ Add an explicit library path.
Or we could pass the -I for the RaspberryPi stuff in QT5BASE_EXTRA_CFLAGS.
But oh well, we probably need to get this some autobuilder testing, and see what happens.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v4 2/4 qt/qt5base: reorder patches
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v3 -> v4
- Ammend commit log with qt/qt5base
v2 -> v3
- Nothing
v1 -> v2
- Nothing
.../qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
.../qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 0
...nker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} | 0
...entfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (100%)
rename package/qt5/qt5base/{0005-no-gold-linker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} (100%)
rename package/qt5/qt5base/{0008-forkd-disable-eventfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} (100%)package/qt5/qt5base/0002-mkspecs-files.patch renamed from package/qt5/qt5base/0003-mkspecs-files.patch +0 -0
package/qt5/qt5base/0003-xcb-egl-fixes.patch renamed from package/qt5/qt5base/0004-xcb-egl-fixes.patch +0 -0
package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch renamed from package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +0 -0
package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch renamed from package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch +0 -0
Signature · 1 line
2.1.0
PATCH v4 3/4 qt/qt5quick1, qt/qt5script, qt/qt5webkit: tag as legacy compatibility
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v3 -> v4
- Ammend commit log with qt/qt5*
v2 -> v3
- Nothing
v1 -> v2 :
- Rename "deprecated" with "legacy compatibility" (except in help messages) (Suggested by Thomas and confirmed by Arnout)
- Remove "(deprecated)" from package name
(Suggested by Thomas and confirmed by Arnout)
package/qt5/Config.in | 9 +++++---- package/qt5/qt5quick1/Config.in | 4 ++++ package/qt5/qt5script/Config.in | 4 ++++ package/qt5/qt5webkit-examples/Config.in | 4 ++++ package/qt5/qt5webkit/Config.in | 4 ++++ 5 files changed, 21 insertions(+), 4 deletions(-)
package/qt5/Config.in +5 -4
@@ -36,15 +36,16 @@ source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5multimedia/Config.in" -source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" -source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" -source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" +comment "legacy compatibility" +source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5webkit-examples/Config.in" endif
package/qt5/qt5quick1/Config.in +4 -0
@@ -15,6 +15,10 @@ config BR2_PACKAGE_QT5QUICK1 This package corresponds to the qt5quick1 module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt Quick module in new + design. + http://qt.io comment "qt5quick1 needs a toolchain w/ dynamic library"
package/qt5/qt5script/Config.in +4 -0
@@ -8,4 +8,8 @@ config BR2_PACKAGE_QT5SCRIPT This package corresponds to the qt5script module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt QML module in new + design. + http://qt.io
package/qt5/qt5webkit-examples/Config.in +4 -0
@@ -7,4 +7,8 @@ config BR2_PACKAGE_QT5WEBKIT_EXAMPLES This package contains examples for the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
package/qt5/qt5webkit/Config.in +4 -0
@@ -17,4 +17,8 @@ config BR2_PACKAGE_QT5WEBKIT This package corresponds to the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
Signature · 1 line
2.1.0
PATCH v4 4/4 qt/qt5webchannel: new package
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v3 -> v4
- Nothing
v2 -> v3
- Adding this patch
v1 -> v2
- No qt5webchannel
package/qt5/Config.in | 1 + package/qt5/qt5webchannel/Config.in | 11 +++++ package/qt5/qt5webchannel/qt5webchannel.hash | 4 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 61 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 package/qt5/qt5webchannel/Config.in create mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash create mode 100644 package/qt5/qt5webchannel/qt5webchannel.mk
package/qt5/Config.in +1 -0
@@ -40,6 +40,7 @@ source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5webchannel/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5WEBCHANNEL + bool "qt5webchannel" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5WEBSOCKETS + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webchannel module. + + http://qt.io
package/qt5/qt5webchannel/qt5webchannel.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebchannel-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 94f88604ff0b29a30f1a1b13601d4bce9af5c0a96c43869705aee1596aeb2d8d qtwebchannel-opensource-src-5.5.0.tar.xz +sha1 7c45ecb9c4226207f184b5cf25d1a18d650075da qtwebchannel-opensource-src-5.5.0.tar.xz +md5 c20146286108477cdab60c67d2d87dc7 qtwebchannel-opensource-src-5.5.0.tar.xz
package/qt5/qt5webchannel/qt5webchannel.mk new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.1.0
v5 cover qt5 bump to 5.5.0
In reply to Julien CorjonThis series aim to bump Qt to the 5.5.0 version.
QtWebkit, QtScript & QtQuick modules as been tagged as deprecated by Qt [1] but these modules are still released in Qt-5.5.0 so they are tagged as 'legacy compatibility' in menuconfig.
Qt5WebChannel is a rebase of my previous patch[2] on top of Qt-5.5.0
[1] https://wiki.qt.io/New_Features_in_Qt_5.5#Deprecated_Functionality
[2] http://permalink.gmane.org/gmane.comp.lib.uclibc.buildroot/118411
Julien Corjon (4):
qt5: bump version to 5.5.0
qt/qt5base: reorder patches
qt/qt5quick1, qt/qt5script, qt/qt5webkit: tag as legacy compatibility qt/qt5webchannel: new package
package/qt5/Config.in | 10 +-
package/qt5/qt5.mk | 4 +-
...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ----
...kspecs-files.patch => 0002-mkspecs-files.patch} | 0
...cb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 9 +-
.../0004-no-gold-linker-for-host-build.patch | 41 ++++
.../0005-forkd-disable-eventfd-for-uclibc.patch | 32 +++
.../0005-no-gold-linker-for-host-build.patch | 27 ---
...nfigure-fix-gold-linker-support-detection.patch | 36 ---
.../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++
.../0007-configure-add-psql_config-option.patch | 61 -----
package/qt5/qt5base/qt5base.hash | 8 +-
package/qt5/qt5base/qt5base.mk | 8 +-
.../0001-Fix-build-with-no-c-11.patch | 267 ---------------------
...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ----
package/qt5/qt5connectivity/qt5connectivity.hash | 8 +-
package/qt5/qt5declarative/qt5declarative.hash | 8 +-
package/qt5/qt5enginio/qt5enginio.hash | 8 +-
.../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +-
package/qt5/qt5imageformats/qt5imageformats.hash | 8 +-
package/qt5/qt5multimedia/qt5multimedia.hash | 8 +-
package/qt5/qt5quick1/Config.in | 4 +
package/qt5/qt5quick1/qt5quick1.hash | 8 +-
package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +-
package/qt5/qt5script/Config.in | 4 +
package/qt5/qt5script/qt5script.hash | 8 +-
package/qt5/qt5sensors/qt5sensors.hash | 8 +-
package/qt5/qt5serialport/qt5serialport.hash | 8 +-
package/qt5/qt5svg/qt5svg.hash | 8 +-
package/qt5/qt5webchannel/Config.in | 11 +
package/qt5/qt5webchannel/qt5webchannel.hash | 4 +
package/qt5/qt5webchannel/qt5webchannel.mk | 61 +++++
package/qt5/qt5webkit-examples/Config.in | 4 +
.../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +-
package/qt5/qt5webkit/Config.in | 4 +
package/qt5/qt5webkit/qt5webkit.hash | 8 +-
package/qt5/qt5websockets/qt5websockets.hash | 8 +-
package/qt5/qt5x11extras/qt5x11extras.hash | 8 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +-
39 files changed, 296 insertions(+), 574 deletions(-)
delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (88%)
create mode 100644 package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch
create mode 100644 package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch
delete mode 100644 package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch
delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch
create mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch
delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch
delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch
delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
create mode 100644 package/qt5/qt5webchannel/Config.in
create mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash
create mode 100644 package/qt5/qt5webchannel/qt5webchannel.mkSignature · 1 line
2.1.0
PATCH v5 1/4 qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1]. We still need specifics include path for rpi eglfs support.
0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
[1] https://codereview.qt-project.org/#/c/107548/
Passed test :
- Full compilation on ARM/uClibc
- Partialy compiled and tested on i.MX6/linaro with OpenGL backend
- Partialy compiled but not executed for Raspberry Pi (rpi-userland)
Signed-off-by Julien Corjon <[email protected]>
---
v4 -> v5 :
- Remove un-needed QT5BASE_CONFIGURE_OPTS += -I... (reported by Thomas)
- Add upstream status for 0006-eglfs-rasp-pi-header-inclusion.patch
- Add upstream status for 0008-forkd-disable-eventfd-for-uclibc.patch
v3 -> v4 :
- Fix rpi-userland header inclusion (detected by Thomas and fix with the help of Yann)
- Remove Tested-by tags (suggested by Thomas)
v2 -> v3 :
- Re-include modification of qt5base.mk lost in rebase...
v1 -> v2 :
- Rewrite commit message (suggested by Thomas)
- Fix comment on uclibc version in patch 0008-... (suggested by Thomas)
package/qt5/qt5.mk | 4 +- ...ing-Check-if-uClibc-has-backtrace-support.patch | 48 ---- package/qt5/qt5base/0004-xcb-egl-fixes.patch | 9 +- .../0005-no-gold-linker-for-host-build.patch | 40 ++- ...nfigure-fix-gold-linker-support-detection.patch | 36 --- .../0006-eglfs-rasp-pi-header-inclusion.patch | 45 ++++ .../0007-configure-add-psql_config-option.patch | 61 ----- .../0008-forkd-disable-eventfd-for-uclibc.patch | 32 +++ package/qt5/qt5base/qt5base.hash | 8 +- package/qt5/qt5base/qt5base.mk | 8 +- .../0001-Fix-build-with-no-c-11.patch | 267 --------------------- ...z_data_p.h-Add-missing-include-byteswap.h.patch | 46 ---- package/qt5/qt5connectivity/qt5connectivity.hash | 8 +- package/qt5/qt5declarative/qt5declarative.hash | 8 +- package/qt5/qt5enginio/qt5enginio.hash | 8 +- .../qt5graphicaleffects/qt5graphicaleffects.hash | 8 +- package/qt5/qt5imageformats/qt5imageformats.hash | 8 +- package/qt5/qt5multimedia/qt5multimedia.hash | 8 +- package/qt5/qt5quick1/qt5quick1.hash | 8 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 8 +- package/qt5/qt5script/qt5script.hash | 8 +- package/qt5/qt5sensors/qt5sensors.hash | 8 +- package/qt5/qt5serialport/qt5serialport.hash | 8 +- package/qt5/qt5svg/qt5svg.hash | 8 +- .../qt5/qt5webkit-examples/qt5webkit-examples.hash | 8 +- package/qt5/qt5webkit/qt5webkit.hash | 8 +- package/qt5/qt5websockets/qt5websockets.hash | 8 +- package/qt5/qt5x11extras/qt5x11extras.hash | 8 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 8 +- 29 files changed, 184 insertions(+), 556 deletions(-) delete mode 100644 package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch delete mode 100644 package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch create mode 100644 package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch delete mode 100644 package/qt5/qt5base/0007-configure-add-psql_config-option.patch create mode 100644 package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch delete mode 100644 package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch delete mode 100644 package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch
package/qt5/qt5.mk +2 -2
@@ -1,5 +1,5 @@ -QT5_VERSION_MAJOR = 5.4 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION_MAJOR = 5.5 +QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5base/0002-logging-Check-if-uClibc-has-backtrace-support.patch deleted +0 -48
48 lines not on this page · raw message
package/qt5/qt5base/0004-xcb-egl-fixes.patch +5 -4
@@ -49,15 +49,16 @@ diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/pl #include <qpa/qplatformcursor.h> #include <qpa/qplatformscreen.h> ---- a/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 16:53:50.038277168 -0400 -+++ b/src/platformsupport/eglconvenience/qeglplatformcursor.cpp 2014-08-07 17:00:36.806286766 -0400 -@@ -49,8 +49,8 @@ +--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp ++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp +@@ -41,8 +41,8 @@ - #include <QtPlatformSupport/private/qdevicediscovery_p.h> + #include <QtGui/private/qguiapplication_p.h> -#include "qeglplatformcursor_p.h" #include "qeglplatformintegration_p.h" +#include "qeglplatformcursor_p.h" + #include "qeglplatformscreen_p.h" QT_BEGIN_NAMESPACE
package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +27 -13
@@ -1,27 +1,41 @@ -Use the gold linker only for target builds +From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <[email protected]> +Date: Tue, 19 May 2015 21:30:21 +0200 +Subject: [PATCH] Disable gold linker/new dtags support for host builds -Availability of the gold linker is only tested with the -cross-compiler, not the host compiler, so Qt shouldn't assume it's -available when doing host builds. +There is no test for gold linker and new dtags support for the host build +(only for the target compiler/build) which leads to trouble in some cross +compiling environments (see [1] for details). -This fixes build failures occuring when cross-compiling Qt5 with a -gold capable cross-compiler, on a host that has a too old compiler to -support gold. +So disable gold linker/new dtags support unconditionally for host builds. -Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. +[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html -Signed-off-by: Thomas Petazzoni <[email protected]> +Task-number: QTBUG-46125 +Change-Id: Ic62828704dcce461487d63860705158cce3e4af8 +Reviewed-by: Oswald Buddenhagen <[email protected]> +--- + mkspecs/features/default_post.prf | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) -Index: b/mkspecs/features/default_post.prf -=================================================================== +diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf +index 8e68b95..bcaddc8 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf -@@ -62,7 +62,7 @@ +@@ -62,8 +62,11 @@ debug { QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE } -use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD -+!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD +-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++# disable special linker flags for host builds (no proper test for host support yet) ++!host_build { ++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS ++} dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB +-- +2.1.0 +
package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard <[email protected]> -Date: Sun, 15 Feb 2015 22:58:07 +0100 -Subject: [PATCH] configure: fix gold linker support detection - -Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 - -While the -fuse-ld=gold flag is related to linking, it is an argument to the -compiler driver to tell it what linker to execute, NOT an option to tell the -linker to behave differently. - -So it shouldn't get prefixed with -Wl when passed though the compiler driver. - -Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 043d9fc..987d7f0 100755 ---- a/configure -+++ b/configure -@@ -3263,7 +3263,7 @@ fi - - # auto-detect -fuse-ld=gold support - if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then -- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then -+ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then - CFG_USE_GOLD_LINKER=yes - else - if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then --- -2.1.3 -
package/qt5/qt5base/0006-eglfs-rasp-pi-header-inclusion.patch new file +45 -0
45 lines not on this page · raw message
package/qt5/qt5base/0007-configure-add-psql_config-option.patch deleted +0 -61
61 lines not on this page · raw message
package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 62ef0d97cfa2ed0142fc69c6e6395a570bea9215 Mon Sep 17 00:00:00 2001 +From: Julien Corjon <[email protected]> +Date: Tue, 21 Jul 2015 11:59:57 +0200 +Subject: [PATCH] forkd - disable eventfd for uClibc <= 0.9.33 + +eventfd is not implemented in uClibc <= 0.9.33 + +Upstream-Status : https://bugreports.qt.io/browse/QTBUG-47337 + +Signed-off-by: Julien Corjon <[email protected]> +--- + src/3rdparty/forkfd/forkfd.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c +index 8d08f40..fa47cdf 100644 +--- a/src/3rdparty/forkfd/forkfd.c ++++ b/src/3rdparty/forkfd/forkfd.c +@@ -48,6 +48,10 @@ + # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__) + # define HAVE_PIPE2 1 + # endif ++# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33))) ++# undef HAVE_EVENTFD ++# undef HAVE_PIPE2 ++# endif + #endif + + #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500 +-- +2.1.0 +
package/qt5/qt5base/qt5base.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 qtbase-opensource-src-5.4.1.tar.xz -sha1 134ec03371722cc31e2041a82c255cec708ca848 qtbase-opensource-src-5.4.1.tar.xz -md5 9507825e558c980fed602de1f16ec7ae qtbase-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtbase-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 893f0691739c00d13ff85bf8d3fd14e1c7a62fbbbcffa44b0491da4d5e570965 qtbase-opensource-src-5.5.0.tar.xz +sha1 3d6734bc6d00e1017c1db40d68309997bdf7bf6f qtbase-opensource-src-5.5.0.tar.xz +md5 252613b5a180c94d7196d10467a4f08b qtbase-opensource-src-5.5.0.tar.xz
package/qt5/qt5base/qt5base.mk +1 -7
@@ -123,12 +123,6 @@ QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp -endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ - $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp endif else QT5BASE_CONFIGURE_OPTS += -no-eglfs
@@ -167,6 +161,7 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
@@ -202,7 +197,6 @@ define QT5BASE_CONFIGURE_CMDS -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \ $(QT5BASE_CONFIGURE_OPTS) \ ) endef
package/qt5/qt5connectivity/0001-Fix-build-with-no-c-11.patch deleted +0 -267
267 lines not on this page · raw message
package/qt5/qt5connectivity/0002-bluez_data_p.h-Add-missing-include-byteswap.h.patch deleted +0 -46
46 lines not on this page · raw message
package/qt5/qt5connectivity/qt5connectivity.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 82c4ffb590f6716672da271ad41c51499b888b46140f40b06367b9eace7b2360 qtconnectivity-opensource-src-5.4.1.tar.xz -sha1 b49f34507f2ebebd400391a48244828d4ff89fa3 qtconnectivity-opensource-src-5.4.1.tar.xz -md5 056c7eba6a396bbd82d265feca1fe47b qtconnectivity-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtconnectivity-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f1cfdd934e11dc114039c84a6a6b83870b56b2966715f1cb266f25bce1524302 qtconnectivity-opensource-src-5.5.0.tar.xz +sha1 b393471529502028b0d5318088a27e48e944bc90 qtconnectivity-opensource-src-5.5.0.tar.xz +md5 31b005585b2be1c8aca9ea585a90f2b0 qtconnectivity-opensource-src-5.5.0.tar.xz
package/qt5/qt5declarative/qt5declarative.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 qtdeclarative-opensource-src-5.4.1.tar.xz -sha1 fb345784035caafef2d848bb29ad6bfce8ec2f8f qtdeclarative-opensource-src-5.4.1.tar.xz -md5 86dfe5c41e14a142c72fdaa6a64f933c qtdeclarative-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtdeclarative-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 858a12c5647764da8f81edec4ed444af77888cf931b739c10168064ae96f6773 qtdeclarative-opensource-src-5.5.0.tar.xz +sha1 f41766db6f6bc8b9cefff05543891c271436043e qtdeclarative-opensource-src-5.5.0.tar.xz +md5 1452c92f8c660dc7d23d9e17d89f8716 qtdeclarative-opensource-src-5.5.0.tar.xz
package/qt5/qt5enginio/qt5enginio.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 aedb131c29180c7dbc41f888d6a078378a2dd3337766461734cc1b8f07e9577a qtenginio-opensource-src-5.4.1.tar.xz -sha1 35da0343762a6aa7ded2c62aa4b36e77152a9240 qtenginio-opensource-src-5.4.1.tar.xz -md5 c80b967b159c513350fcfca223f435d4 qtenginio-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtenginio-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f61c4b2a26550bcb5e81cfcde55b1e521ee021226679dc9f60ab6c55f21f1520 qtenginio-opensource-src-5.5.0.tar.xz +sha1 14b961bea8cf2f2d4510283d6120038dbf90d29d qtenginio-opensource-src-5.5.0.tar.xz +md5 917e3105fe125068942f39e775f621ad qtenginio-opensource-src-5.5.0.tar.xz
package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c qtgraphicaleffects-opensource-src-5.4.1.tar.xz -sha1 9d0637176c9ce0006917dc52e6d20c975f0fb9a8 qtgraphicaleffects-opensource-src-5.4.1.tar.xz -md5 02bec01c2af9a7d08582fbffbfa4976a qtgraphicaleffects-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtgraphicaleffects-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 f143514e7414797f264fea6348635e1db3e15d13e326af4a6b355fecf0a147ee qtgraphicaleffects-opensource-src-5.5.0.tar.xz +sha1 1e9ca2b5d1fdfe6a73dfd646868c5351989ecccc qtgraphicaleffects-opensource-src-5.5.0.tar.xz +md5 2fb95cecb2ab0542cb0b5847c65600c3 qtgraphicaleffects-opensource-src-5.5.0.tar.xz
package/qt5/qt5imageformats/qt5imageformats.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f qtimageformats-opensource-src-5.4.1.tar.xz -sha1 6fb124e2f8c644c97b56d023fcd90cf70dd5b1ba qtimageformats-opensource-src-5.4.1.tar.xz -md5 1436680e00ea3e211fd0abdb7c18014a qtimageformats-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtimageformats-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 6479d1d2ac5b7dd85566799e13a173e525cbccd5c8bd43e7db1bdaf772af8955 qtimageformats-opensource-src-5.5.0.tar.xz +sha1 cffd35f9742f13a0c5afc04eab27b7b47338e800 qtimageformats-opensource-src-5.5.0.tar.xz +md5 72cbebfda5253dece90fa90ded64e953 qtimageformats-opensource-src-5.5.0.tar.xz
package/qt5/qt5multimedia/qt5multimedia.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e qtmultimedia-opensource-src-5.4.1.tar.xz -sha1 5e9f06cccc86608ab185fc31a338b7b215342288 qtmultimedia-opensource-src-5.4.1.tar.xz -md5 7412a5c62da71b44b9f29e29fdc6af4d qtmultimedia-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtmultimedia-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a8bf1bd59bad74bba2906e6a86faa1cf008c8dba5f5a9cdea72eb0ce5f85355b qtmultimedia-opensource-src-5.5.0.tar.xz +sha1 3438c16f498e40eaa68cd518b76ddd81c02a5471 qtmultimedia-opensource-src-5.5.0.tar.xz +md5 2759807c5d1842ee69e516aacd5e756a qtmultimedia-opensource-src-5.5.0.tar.xz
package/qt5/qt5quick1/qt5quick1.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d qtquick1-opensource-src-5.4.1.tar.xz -sha1 f89cccdeac4c31157ac8b97fa96d426b5bb18630 qtquick1-opensource-src-5.4.1.tar.xz -md5 16d711d20238e3220fc4030dab608f0b qtquick1-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquick1-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 db563b33e1670bc8a254d53c0a8e29ba501b903fafcd3b7e3d2ab845db0dfa2c qtquick1-opensource-src-5.5.0.tar.xz +sha1 27d67436cd902bb8b89b5808e4cc4a34fd61ac75 qtquick1-opensource-src-5.5.0.tar.xz +md5 8cd53fd1100e7f7cdf5b14f7c227e7b9 qtquick1-opensource-src-5.5.0.tar.xz
package/qt5/qt5quickcontrols/qt5quickcontrols.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 qtquickcontrols-opensource-src-5.4.1.tar.xz -sha1 696ddb887bba366cb8132e53a94d571ac94666b8 qtquickcontrols-opensource-src-5.4.1.tar.xz -md5 2950c8df9da1e3d418a1e209d24f503a qtquickcontrols-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtquickcontrols-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 df616aa6b390797f92f33115510961d1a53a55c349a18ae21f74b4aff478c2ea qtquickcontrols-opensource-src-5.5.0.tar.xz +sha1 9b12048acb3555f7e98bd6c1333437fb04cf60d6 qtquickcontrols-opensource-src-5.5.0.tar.xz +md5 24b59d5928092f02e0cba969d9548350 qtquickcontrols-opensource-src-5.5.0.tar.xz
package/qt5/qt5script/qt5script.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf qtscript-opensource-src-5.4.1.tar.xz -sha1 1b9ede97f3120c95c2dce322b6140eeb20416044 qtscript-opensource-src-5.4.1.tar.xz -md5 70165fd13fa0ba5b1f577f849f0c4f12 qtscript-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtscript-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 343932ea8b2ecb16c3d9b49db55a7975f2f22534055608de4b06b1e38d867e8b qtscript-opensource-src-5.5.0.tar.xz +sha1 ed5cf73c8217a249535442c49a8a0e5c43f6e648 qtscript-opensource-src-5.5.0.tar.xz +md5 1e9766d2651d6a81221525462378336d qtscript-opensource-src-5.5.0.tar.xz
package/qt5/qt5sensors/qt5sensors.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 qtsensors-opensource-src-5.4.1.tar.xz -sha1 b02811264b6d6fd790d4f3b68f42d6162e73fc4f qtsensors-opensource-src-5.4.1.tar.xz -md5 0787b72a67d1e38a3a47b54b84a6dc42 qtsensors-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsensors-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 8d5a989df94b28dac872f3b28437982ecc6434b38b44da75f1d4bf81915fd14b qtsensors-opensource-src-5.5.0.tar.xz +sha1 bd4b2fb7685f80ef1661ced90ff665b4b27216aa qtsensors-opensource-src-5.5.0.tar.xz +md5 68ea0a61147a4934ca0fbd04fae10ed6 qtsensors-opensource-src-5.5.0.tar.xz
package/qt5/qt5serialport/qt5serialport.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff qtserialport-opensource-src-5.4.1.tar.xz -sha1 c87b381d6a0b6445c7fab54ef2807a555bfbcb47 qtserialport-opensource-src-5.4.1.tar.xz -md5 2333d25916a74260ce39b8a77c7c4288 qtserialport-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtserialport-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 a60e2d2113c1c3895b71c901921f83b81e9b3c59e3620cf94bd8647730efa866 qtserialport-opensource-src-5.5.0.tar.xz +sha1 371da46f2f2ad652a22b0f04e4b48f088976d3ce qtserialport-opensource-src-5.5.0.tar.xz +md5 8a76f051ed28a9c925d32f5864d33e78 qtserialport-opensource-src-5.5.0.tar.xz
package/qt5/qt5svg/qt5svg.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c qtsvg-opensource-src-5.4.1.tar.xz -sha1 f5bcaa91bd20ba7cdf27006a5553a6f182b62994 qtsvg-opensource-src-5.4.1.tar.xz -md5 b4a1e4f5dae26a7500f4f61a550f67eb qtsvg-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtsvg-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 00efdeec66d34dabeddf17c510c0d607179991566a030d461968a16d6322e19f qtsvg-opensource-src-5.5.0.tar.xz +sha1 9238a1aedd126f84a73014c12b6391267238da0a qtsvg-opensource-src-5.5.0.tar.xz +md5 08234e3c3696f1a75df30201ca16d4bc qtsvg-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit-examples/qt5webkit-examples.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a qtwebkit-examples-opensource-src-5.4.1.tar.xz -sha1 7a150502661a3af7dde5c546cdd4a335068a0298 qtwebkit-examples-opensource-src-5.4.1.tar.xz -md5 783bfd27e79769f3ceeb206a4921400b qtwebkit-examples-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-examples-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 d25564fb56e8e06ad782390c7a7cf2c80f52c1dac5a8cac6ad5382711cd4bd12 qtwebkit-examples-opensource-src-5.5.0.tar.xz +sha1 706464b813e9910fefd4af83e479a8247fd50a68 qtwebkit-examples-opensource-src-5.5.0.tar.xz +md5 5005737b4b29a76c70d2d08e5b105a66 qtwebkit-examples-opensource-src-5.5.0.tar.xz
package/qt5/qt5webkit/qt5webkit.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf qtwebkit-opensource-src-5.4.1.tar.xz -sha1 6cfebb74d334e77e26ecbe7d6609578eb46ab276 qtwebkit-opensource-src-5.4.1.tar.xz -md5 186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebkit-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec qtwebkit-opensource-src-5.5.0.tar.xz +sha1 8489ffa9253ab429b75f65117e435624dd78f769 qtwebkit-opensource-src-5.5.0.tar.xz +md5 5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz
package/qt5/qt5websockets/qt5websockets.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 qtwebsockets-opensource-src-5.4.1.tar.xz -sha1 3fb9be047b67673f40d272faab5ba0c8055e7717 qtwebsockets-opensource-src-5.4.1.tar.xz -md5 308e1e9126e6fab8b06616db9810973e qtwebsockets-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebsockets-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 1ad465b1b2d1e6dddbdc403af9f69d93b1c408f6903c28ccaa52058df7ee8ae8 qtwebsockets-opensource-src-5.5.0.tar.xz +sha1 215f4e8d8170933d68e9395d966ecf6213fc0a74 qtwebsockets-opensource-src-5.5.0.tar.xz +md5 aa7b160a4b97fafe71d5546c20715b8f qtwebsockets-opensource-src-5.5.0.tar.xz
package/qt5/qt5x11extras/qt5x11extras.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e qtx11extras-opensource-src-5.4.1.tar.xz -sha1 7a75f936df70ac551cfc7b08914365cbb25b122d qtx11extras-opensource-src-5.4.1.tar.xz -md5 87d555e0c7eccaa462a9bba85fb2d4de qtx11extras-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtx11extras-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 bcb3cec5c9f0b551f0e2de30824c8be08620fbbe466ad4846beb2ad636d0b979 qtx11extras-opensource-src-5.5.0.tar.xz +sha1 2eb25a96cc061b364d5fc30125a5ca9904857e89 qtx11extras-opensource-src-5.5.0.tar.xz +md5 9bee6d5c127ba8cc878ac7c2664d99f9 qtx11extras-opensource-src-5.5.0.tar.xz
package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +4 -4
@@ -1,4 +1,4 @@ -# Hashes from: http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz.mirrorlist -sha256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 qtxmlpatterns-opensource-src-5.4.1.tar.xz -sha1 b25c2ec875fa1cbe0de20fd39bdd444c703540b4 qtxmlpatterns-opensource-src-5.4.1.tar.xz -md5 ec2970e9e9c38f88be74f18101937c28 qtxmlpatterns-opensource-src-5.4.1.tar.xz +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtxmlpatterns-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 672882c670c13c5caec199173cdabffd38474d06979d261bdc6e19738e0cef53 qtxmlpatterns-opensource-src-5.5.0.tar.xz +sha1 d961f998980264f19916f70c8585da8479a84724 qtxmlpatterns-opensource-src-5.5.0.tar.xz +md5 138ab73b2376fcfca92a4bb6ab47e4a4 qtxmlpatterns-opensource-src-5.5.0.tar.xz
Signature · 1 line
2.1.0
PATCH v5 2/4 qt/qt5base: reorder patches
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v4 -> v5
- Nothing
v3 -> v4
- Ammend commit log with qt/qt5base
v2 -> v3
- Nothing
v1 -> v2
- Nothing
.../qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} | 0
.../qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} | 0
...nker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} | 0
...entfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename package/qt5/qt5base/{0003-mkspecs-files.patch => 0002-mkspecs-files.patch} (100%)
rename package/qt5/qt5base/{0004-xcb-egl-fixes.patch => 0003-xcb-egl-fixes.patch} (100%)
rename package/qt5/qt5base/{0005-no-gold-linker-for-host-build.patch => 0004-no-gold-linker-for-host-build.patch} (100%)
rename package/qt5/qt5base/{0008-forkd-disable-eventfd-for-uclibc.patch => 0005-forkd-disable-eventfd-for-uclibc.patch} (100%)package/qt5/qt5base/0002-mkspecs-files.patch renamed from package/qt5/qt5base/0003-mkspecs-files.patch +0 -0
package/qt5/qt5base/0003-xcb-egl-fixes.patch renamed from package/qt5/qt5base/0004-xcb-egl-fixes.patch +0 -0
package/qt5/qt5base/0004-no-gold-linker-for-host-build.patch renamed from package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch +0 -0
package/qt5/qt5base/0005-forkd-disable-eventfd-for-uclibc.patch renamed from package/qt5/qt5base/0008-forkd-disable-eventfd-for-uclibc.patch +0 -0
Signature · 1 line
2.1.0
PATCH v5 3/4 qt/qt5quick1, qt/qt5script, qt/qt5webkit: tag as legacy compatibility
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v4 -> v5
- Nothing
v3 -> v4
- Ammend commit log with qt/qt5*
v2 -> v3
- Nothing
v1 -> v2 :
- Rename "deprecated" with "legacy compatibility" (except in help messages) (Suggested by Thomas and confirmed by Arnout)
- Remove "(deprecated)" from package name
(Suggested by Thomas and confirmed by Arnout)
package/qt5/Config.in | 9 +++++---- package/qt5/qt5quick1/Config.in | 4 ++++ package/qt5/qt5script/Config.in | 4 ++++ package/qt5/qt5webkit-examples/Config.in | 4 ++++ package/qt5/qt5webkit/Config.in | 4 ++++ 5 files changed, 21 insertions(+), 4 deletions(-)
package/qt5/Config.in +5 -4
@@ -36,15 +36,16 @@ source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5multimedia/Config.in" -source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" -source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" -source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5webkit-examples/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" +comment "legacy compatibility" +source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5webkit-examples/Config.in" endif
package/qt5/qt5quick1/Config.in +4 -0
@@ -15,6 +15,10 @@ config BR2_PACKAGE_QT5QUICK1 This package corresponds to the qt5quick1 module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt Quick module in new + design. + http://qt.io comment "qt5quick1 needs a toolchain w/ dynamic library"
package/qt5/qt5script/Config.in +4 -0
@@ -8,4 +8,8 @@ config BR2_PACKAGE_QT5SCRIPT This package corresponds to the qt5script module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt QML module in new + design. + http://qt.io
package/qt5/qt5webkit-examples/Config.in +4 -0
@@ -7,4 +7,8 @@ config BR2_PACKAGE_QT5WEBKIT_EXAMPLES This package contains examples for the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
package/qt5/qt5webkit/Config.in +4 -0
@@ -17,4 +17,8 @@ config BR2_PACKAGE_QT5WEBKIT This package corresponds to the qt5webkit module. + This package has been tagged as deprecated since version + 5.5.0 and should be replaced by Qt WebEngine module in + new design. + http://qt.io
Signature · 1 line
2.1.0
PATCH v5 4/4 qt/qt5webchannel: new package
In reply to Julien CorjonSigned-off-by Julien Corjon <[email protected]>
---
v4 -> v5
- Nothing
v3 -> v4
- Nothing
v2 -> v3
- Adding this patch
v1 -> v2
- No qt5webchannel
package/qt5/Config.in | 1 + package/qt5/qt5webchannel/Config.in | 11 +++++ package/qt5/qt5webchannel/qt5webchannel.hash | 4 ++ package/qt5/qt5webchannel/qt5webchannel.mk | 61 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 package/qt5/qt5webchannel/Config.in create mode 100644 package/qt5/qt5webchannel/qt5webchannel.hash create mode 100644 package/qt5/qt5webchannel/qt5webchannel.mk
package/qt5/Config.in +1 -0
@@ -40,6 +40,7 @@ source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5webchannel/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5WEBCHANNEL + bool "qt5webchannel" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5WEBSOCKETS + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webchannel module. + + http://qt.io
package/qt5/qt5webchannel/qt5webchannel.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.5/5.5.0/submodules/qtwebchannel-opensource-src-5.5.0.tar.xz.mirrorlist +sha256 94f88604ff0b29a30f1a1b13601d4bce9af5c0a96c43869705aee1596aeb2d8d qtwebchannel-opensource-src-5.5.0.tar.xz +sha1 7c45ecb9c4226207f184b5cf25d1a18d650075da qtwebchannel-opensource-src-5.5.0.tar.xz +md5 c20146286108477cdab60c67d2d87dc7 qtwebchannel-opensource-src-5.5.0.tar.xz
package/qt5/qt5webchannel/qt5webchannel.mk new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.1.0
Thomas Petazzoni
Appliedv5 cover qt5 bump to 5.5.0
In reply to Julien CorjonJulien,
Quoted 4 lines · Julien Corjon
Julien Corjon (4):
qt5: bump version to 5.5.0
qt/qt5base: reorder patches
qt/qt5quick1, qt/qt5script, qt/qt5webkit: tag as legacy compatibility
I've applied these three patches, thanks!
Quoted 1 line
qt/qt5webchannel: new package
However, while this one looked good, it doesn't build for me. With the following defconfig:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2015.05-496-g85945aa.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5WEBCHANNEL=y
# BR2_TARGET_ROOTFS_TAR is not set
I get:
/home/thomas/projets/buildroot/output/host/usr/bin/arm-linux-g++ -c -pipe [...] -I/home/thomas/projets/buildroot/output/host/usr/mkspecs/devices/linux-buildroot-g++ -o .obj/moc_qmetaobjectpublisher_p.o .moc/moc_qmetaobjectpublisher_p.cpp qmetaobjectpublisher.cpp:44:20: fatal error: QJSValue: No such file or directory
#include <QJSValue>
^compilation terminated.
Makefile:408: recipe for target '.obj/qmetaobjectpublisher.o' failed
make[4]: *** [.obj/qmetaobjectpublisher.o] Error 1
make[4]: *** Waiting for unfinished jobs....
Makefile:42: recipe for target 'sub-webchannel-make_first' failed
make[3]: *** [sub-webchannel-make_first] Error 2
Makefile:44: recipe for target 'sub-src-make_first' failed
make[2]: *** [sub-src-make_first] Error 2package/pkg-generic.mk:156: recipe for target '/home/thomas/projets/buildroot/output/build/qt5webchannel-5.5.0/.stamp_built' failed
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/3 qt5: bump version to 5.5.0
In reply to Julien CorjonDear Julien Corjon,
Quoted 9 lines · Julien Corjon
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCESis no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1].0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
Quoted 7 lines
[1] https://codereview.qt-project.org/#/c/107548/
on i.MX6/linaro with OpenGL backend
Signed-off-by Julien Corjon <[email protected]>
I was about to apply this, but unfortunately, it breaks the build with rpi-userland as the egl provider:
/home/test/outputs/qt5/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/interface/vcos/vcos_types.h:38:33: fatal error: vcos_platform_types.h: No such file or directory
#include "vcos_platform_types.h"
I checked, and without your patches, the build works fine. The defconfig I'm testing is:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2015.05-496-g85945aa.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_EGLFS=y
BR2_PACKAGE_QT5BASE_JPEG=y
BR2_PACKAGE_QT5BASE_PNG=y
BR2_PACKAGE_QT5DECLARATIVE=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5QUICK1=y
BR2_PACKAGE_QT5SENSORS=y
BR2_PACKAGE_QT5SERIALPORT=y
BR2_PACKAGE_QT5SVG=y
BR2_PACKAGE_QJSON=y
BR2_PACKAGE_QUAZIP=y
BR2_PACKAGE_RPI_USERLAND=y
Maybe Bernd or Yann can help with this Raspberry Pi specific issue?
It's clearly a header path missing. It's probably caused by the refactoring of how the platform-specific EGL stuff is handled in Qt5.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/3 qt5: bump version to 5.5.0
Dear Thomas,
Le 19/07/2015 23:22, Thomas Petazzoni a ?crit :
Quoted 18 lines
Dear Julien Corjon,
Quoted 15 lines · Julien Corjon
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCESis no longer useful since eglfs does not depend on the device makespecs anymore. Instead, backends are autodetected by configure [1].0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt 3rd party forkd for uClibc toolchains.
Remove patches commited in Qt mainline and update pending one
[1] https://codereview.qt-project.org/#/c/107548/
on i.MX6/linaro with OpenGL backend
Quoted 8 lines
Quoted 1 line
Signed-off-by Julien Corjon <[email protected]>I was about to apply this, but unfortunately, it breaks the build with rpi-userland as the egl provider:
/home/test/outputs/qt5/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/interface/vcos/vcos_types.h:38:33: fatal error:vcos_platform_types.h: No such file or directory
#include "vcos_platform_types.h"
This topic looks reccurent with rpi-userland on buildroot (for example [1])
This is because somes headers are in interface/vcos/pthread/ instead of interface/vcos
This proble is solved in qt with linux-rasp-pi-g++ device qmake configuration[2] but buildroot use a specific device to ease the toolchain integration.
I'm not sure how to handle this issue. Should I make a specific hook for rasp-pi (and maybe rasp-pi2) or should i try to replace buildroot specific device with real ones?
Quoted 28 lines
I checked, and without your patches, the build works fine. The defconfig I'm testing is:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2015.05-496-g85945aa.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
#BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUGis not set
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_EGLFS=y
BR2_PACKAGE_QT5BASE_JPEG=y
BR2_PACKAGE_QT5BASE_PNG=y
BR2_PACKAGE_QT5DECLARATIVE=y
BR2_PACKAGE_QT5MULTIMEDIA=y
BR2_PACKAGE_QT5QUICK1=y
BR2_PACKAGE_QT5SENSORS=y
BR2_PACKAGE_QT5SERIALPORT=y
BR2_PACKAGE_QT5SVG=y
BR2_PACKAGE_QJSON=y
BR2_PACKAGE_QUAZIP=y
BR2_PACKAGE_RPI_USERLAND=y
Quoted 1 line
Maybe Bernd or Yann can help with this Raspberry Pi specific issue?
Bernd, Yann, any advice?
Quoted 6 lines
It's clearly a header path missing. It's probably caused by the refactoring of how the platform-specific EGL stuff is handled in Qt5.
Thomas
Regards,
Julien
[1] http://lists.busybox.net/pipermail/buildroot/2013-March/068101.html
[2]
http://code.qt.io/cgit/qt/qtbase.git/tree/mkspecs/devices/linux-rasp-pi-g++/qmake.conf