qt5: upgrade to latest revision in 5.5 branches
RFC PATCH 1/1 qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 7 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 14 +-- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 +- .../0003-Add-external-hostbindir-option.patch | 16 +-- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 8 +- ...mintegration-Undefine-CursorShape-from-X..patch | 4 +- ...ump-path-length-from-256-to-512-character.patch | 10 +- .../0007-QOpenGLPaintDevice-sub-area-support.patch | 4 +- recipes-qt/qt5/qtbase/0008-Always-build-uic.patch | 31 +++++ .../qt5/qtbase/0008-Fix-build-with-clang-3.7.patch | 72 ----------- ...-build-it-in-configure-but-allow-to-build.patch | 68 +++++++++++ ...external-hostbindir-option-for-native-sdk.patch | 134 +++++++++++++++++++++ recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | 31 ----- ...Invert-conditional-for-defining-QT_SOCKLE.patch | 36 ++++++ ...-build-it-in-configure-but-allow-to-build.patch | 68 ----------- ...external-hostbindir-option-for-native-sdk.patch | 134 --------------------- ...reserve-built-qmake-and-swap-with-native-.patch | 30 +++++ ...Invert-conditional-for-defining-QT_SOCKLE.patch | 36 ------ ...mscreen.cpp-reorder-headers-to-fix-build-.patch | 49 ++++++++ ...reserve-built-qmake-and-swap-with-native-.patch | 30 ----- ...mscreen.cpp-reorder-headers-to-fix-build-.patch | 49 -------- recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake | 1 - recipes-qt/qt5/qtbase_git.bb | 9 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- .../0001-qmltestexample-fix-link.patch | 4 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- ...ats.pro-Make-the-dependencies-determinist.patch | 4 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- ...1-Initial-porting-effort-to-GStreamer-1.0.patch | 4 +- recipes-qt/qt5/qtmultimedia_git.bb | 6 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 20 +-- ...t-help-fix-linking-of-dependent-libraries.patch | 4 +- .../0003-add-noqtwebkit-configuration.patch | 4 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 5 +- ...-qtwaylandscanner-tool-to-the-native-side.patch | 4 +- ...yland-include-server-buffer-only-when-bui.patch | 4 +- recipes-qt/qt5/qtwayland_git.bb | 7 +- recipes-qt/qt5/qtwebchannel_git.bb | 4 +- ...se.gypi-include-atomicops_internals_x86_g.patch | 8 +- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 8 +- ...ird_party-boringssl-Demand-for-newer-POSI.patch | 7 +- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 8 +- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 12 +- .../0004-Generate-usable-qmake_extras.gypi.patch | 12 +- recipes-qt/qt5/qtwebengine_git.bb | 4 +- ...amples-enable-building-examples-by-defaul.patch | 4 +- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 6 +- .../qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 6 +- ...ude-backtrace-API-for-non-glibc-libraries.patch | 6 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 69 files changed, 493 insertions(+), 558 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0008-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch create mode 100644 recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch create mode 100644 recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch create mode 100644 recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch create mode 100644 recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch delete mode 100644 recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake
recipes-qt/qt5/nativesdk-qtbase_git.bb +4 -5
@@ -28,18 +28,17 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0009-Always-build-uic.patch \ - file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ + file://0008-Always-build-uic.patch \ + file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0010-configure-preserve-built-qmake-and-swap-with-native-.patch \ " # CMake's toolchain configuration of nativesdk-qtbase
@@ -278,4 +277,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qt3d_git.bb +1 -1
@@ -14,4 +14,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/*/*/*.obj \ " -SRCREV = "a3b99941751598fb734b189333d5020666df2b2c" +SRCREV = "0bcb6600db2a74ee8c8b51207d3ba15e4973aa95"
recipes-qt/qt5/qtbase-native_git.bb +3 -4
@@ -22,13 +22,12 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0009-Always-build-uic.patch \ - file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ + file://0008-Always-build-uic.patch \ + file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ " CLEANBROKEN = "1"
@@ -116,4 +115,4 @@ do_install() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +7 -7
@@ -1,4 +1,4 @@ -From de9a457dacd9388e8ef145fce9cf4e1e1da6468b Mon Sep 17 00:00:00 2001 +From 566de5f3f4dc14bae25a1b77eb6859c820447a32 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/10] Add linux-oe-g++ platform
@@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 8a4c89e..dfbb111 100755 +index cea62fb..e1929e7 100755 --- a/configure +++ b/configure @@ -342,6 +342,16 @@ getQMakeConf()
@@ -120,7 +120,7 @@ index 8a4c89e..dfbb111 100755 fi'` eval "$cmd" done -@@ -3337,7 +3347,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3350,7 +3360,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi
@@ -129,7 +129,7 @@ index 8a4c89e..dfbb111 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3394,7 +3404,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3407,7 +3417,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi
@@ -138,7 +138,7 @@ index 8a4c89e..dfbb111 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3896,6 +3906,14 @@ setBootstrapVariable() +@@ -3909,6 +3919,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" }
@@ -153,7 +153,7 @@ index 8a4c89e..dfbb111 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3934,14 +3952,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3947,14 +3965,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -348,5 +348,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +3 -3
@@ -1,4 +1,4 @@ -From 7ca620bb9f03ddc8536ac3c45b485cc83603f1c8 Mon Sep 17 00:00:00 2001 +From 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 2912e68..f663c88 100644 +index 0cfcc4e..c3b5c2d 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -157,7 +157,10 @@ void QLibrarySettings::load()
@@ -35,5 +35,5 @@ index 2912e68..f663c88 100644 return new QSettings(qtconfig, QSettings::IniFormat); #ifdef QT_BUILD_QMAKE -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +8 -8
@@ -1,4 +1,4 @@ -From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 Mon Sep 17 00:00:00 2001 +From 90f3f8f59dd23f67e14c9988c2f4449a31762752 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 03/10] Add -external-hostbindir option
@@ -37,10 +37,10 @@ Conflicts: 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/configure b/configure -index dfbb111..548dd0d 100755 +index e1929e7..a757ce5 100755 --- a/configure +++ b/configure -@@ -806,6 +806,7 @@ QT_HOST_BINS= +@@ -809,6 +809,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index dfbb111..548dd0d 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do +@@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \
@@ -56,7 +56,7 @@ index dfbb111..548dd0d 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do +@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;;
@@ -66,7 +66,7 @@ index dfbb111..548dd0d 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2380,6 +2385,10 @@ Installation options: +@@ -2383,6 +2388,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX)
@@ -77,7 +77,7 @@ index dfbb111..548dd0d 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3097,6 +3106,11 @@ fi +@@ -3110,6 +3119,11 @@ fi # command line and environment validation #-------------------------------------------------------------------------------
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +4 -4
@@ -1,4 +1,4 @@ -From bae1b8fbd3fe94a99a02fb751302baa788e9f2ff Mon Sep 17 00:00:00 2001 +From d28d15f9489ab9bb09627014003ad1bde2a79e1f Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <[email protected]> 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 5861941..474827c 100644 +index 55f65b5..2412fdd 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,7 +80,7 @@ index 5861941..474827c 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 5412f37..5ab348a 100644 +index c89b6d2..23d4366 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -214,6 +214,11 @@ unix|mingw {
@@ -108,5 +108,5 @@ index 5412f37..5ab348a 100644 } -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +2 -2
@@ -1,4 +1,4 @@ -From 0b4d9044218df6e7fb700be6cfd21b4aaab24b18 Mon Sep 17 00:00:00 2001 +From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644 class QEGLPlatformWindow; -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +5 -5
@@ -1,7 +1,7 @@ -From fe6405c5a628c168e42138ac82ba70bb8c909d0b Mon Sep 17 00:00:00 2001 +From 37aec78ac44bad8754c3bd5b56836025e4eed50a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Tue, 25 Aug 2015 10:05:15 -0400 -Subject: [PATCH] configure: bump path length from 256 to 512 characters +Subject: [PATCH 06/10] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long.
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 22867a7..fe18487 100755 +index a757ce5..f0f42ab 100755 --- a/configure +++ b/configure -@@ -3851,10 +3851,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3863,10 +3863,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */
@@ -32,5 +32,5 @@ index 22867a7..fe18487 100755 static const short qt_configure_str_offsets[] = { -- -2.2.0 +2.5.3
recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch +2 -2
@@ -1,4 +1,4 @@ -From 7dfc673d6968ce890e5fad7fd8fd8a74c12b876b Mon Sep 17 00:00:00 2001 +From ca3b8fabcc38a9545e935a7c530565689fb85ff7 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH 07/10] QOpenGLPaintDevice sub-area support
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 } else { if (m_vao.isCreated()) { -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0008-Always-build-uic.patch new file +31 -0
@@ -0,0 +1,31 @@ +From d1feb6d0a80460e66872749d931cddc8ed22851d Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH 08/10] Always build uic + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa <[email protected]> +Signed-off-by: Martin Jansa <[email protected]> +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 61e5ce2..a4047aa 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + } + } + } +-SUBDIRS += src_plugins src_tools_qdoc ++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + +-- +2.5.3 +
recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch deleted +0 -72
72 lines not on this page · raw message
recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch new file +68 -0
68 lines not on this page · raw message
recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch new file +134 -0
134 lines not on this page · raw message
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From c6a58549ef110a31960fca80f6d3dcdcf4d9176a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 09/11] Always build uic - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa <[email protected]> -Signed-off-by: Martin Jansa <[email protected]> ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index b4d62aa..5e19215 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - } - } - } --SUBDIRS += src_plugins src_tools_qdoc -+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic - - nacl: SUBDIRS -= src_network src_testlib - --- -2.5.0 -
recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b0648c997d24855b2a6f56fc61e3159af815fb4d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 8 Jun 2015 13:59:25 -0700 +Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining + QT_SOCKLEN_T + +This helps to make sure that QT_SOCKLEN_T is defined to be 'int' +only when its glibc < 2 and not also for the libraries which may define +it as per standards but are not glibc, e.g. musl + +Signed-off-by: Khem Raj <[email protected]> +--- + mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h +index dd12003..8623651 100644 +--- a/mkspecs/linux-oe-g++/qplatformdefs.h ++++ b/mkspecs/linux-oe-g++/qplatformdefs.h +@@ -86,10 +86,10 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) +-#define QT_SOCKLEN_T socklen_t +-#else ++#if defined(__GLIBC__) && (__GLIBC__ < 2) + #define QT_SOCKLEN_T int ++#else ++#define QT_SOCKLEN_T socklen_t + #endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +-- +2.5.3 +
recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch deleted +0 -68
68 lines not on this page · raw message
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch deleted +0 -134
134 lines not on this page · raw message
recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 706d9a8b270d5eb803e93005cc90a1aa1553572a Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Mon, 11 Nov 2013 20:22:34 -0500 +Subject: [PATCH 10/10] configure: preserve built qmake and swap with native + one + +Let configure script build the real qmake, but right after it's built, swap +it with a native qmake for further internal use, preserving the real one. + +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index 04fd1ba..8914e9c 100755 +--- a/configure ++++ b/configure +@@ -4112,6 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Done." + fi + fi # Build qmake ++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" ++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" + + echo "Running configuration tests..." + +-- +2.5.3 +
recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From bae2c6afb951d1352845ca257fdc2389f3fe851e Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 8 Jun 2015 13:59:25 -0700 -Subject: [PATCH 10/10] linux-oe-g++: Invert conditional for defining - QT_SOCKLEN_T - -This helps to make sure that QT_SOCKLEN_T is defined to be 'int' -only when its glibc < 2 and not also for the libraries which may define -it as per standards but are not glibc, e.g. musl - -Signed-off-by: Khem Raj <[email protected]> ---- - mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -index dd12003..8623651 100644 ---- a/mkspecs/linux-oe-g++/qplatformdefs.h -+++ b/mkspecs/linux-oe-g++/qplatformdefs.h -@@ -86,10 +86,10 @@ - - #undef QT_SOCKLEN_T - --#if defined(__GLIBC__) && (__GLIBC__ >= 2) --#define QT_SOCKLEN_T socklen_t --#else -+#if defined(__GLIBC__) && (__GLIBC__ < 2) - #define QT_SOCKLEN_T int -+#else -+#define QT_SOCKLEN_T socklen_t - #endif - - #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.5.0 -
recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch new file +49 -0
49 lines not on this page · raw message
recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From cef1ac9fa399ad5c57480de26a1ef441414f125c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH 11/11] configure: preserve built qmake and swap with native - one - -Let configure script build the real qmake, but right after it's built, swap -it with a native qmake for further internal use, preserving the real one. - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index 1d2157f..bea14af 100755 ---- a/configure -+++ b/configure -@@ -4099,6 +4099,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Done." - fi - fi # Build qmake -+mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" -+mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" - - echo "Running configuration tests..." - --- -2.5.0 -
recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch deleted +0 -49
49 lines not on this page · raw message
recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake deleted +0 -1
@@ -1 +0,0 @@ -set( OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS} )
recipes-qt/qt5/qtbase_git.bb +4 -5
@@ -18,14 +18,13 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # specific for target qtbase SRC_URI += "\ - file://0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ - file://0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ - file://0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \ + file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ + file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ + file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \ " DEPENDS += "qtbase-native"
@@ -279,4 +278,4 @@ sysroot_stage_dirs_append() { rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts } -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qtcanvas3d_git.bb +1 -1
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "f8fe29aab406ded57f13ad961ba977401d9585c9" +SRCREV = "e372a67c1bbdf695f8e550950a3dbf3106389479"
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
@@ -21,4 +21,4 @@ do_configure_prepend() { sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro } -SRCREV = "e4a5dc7dbe62c32032e5e683ac1fdb57663a14b3" +SRCREV = "b31cbd7c5d6b16a20035ace6675835356b69fd65"
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +2 -2
@@ -1,4 +1,4 @@ -From 47b3408b8aeed4795dcfebcd81b6b7b4185712de Mon Sep 17 00:00:00 2001 +From c866d9b3f38f1a0adabdeb19648058711a66a900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH] qmltestexample: fix link
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 load(qt_tool) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
@@ -32,6 +32,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "cc0df64bb0e1dea2fe37950816095802f527a241" +SRCREV = "9794e7d66c30f012a19ec9530d719293b7c5bc7c" BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_git.bb +1 -1
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "1.2" -SRCREV = "749bcec16b89269026a2048c7394df74f08935c4" +SRCREV = "e32bcb7b714454f9167c4d49776a95c9a5799d70"
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
@@ -16,4 +16,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "73357afbbe46e660b3497f621505f351b43c5efa" +SRCREV = "9aa0edc6d13d20796feb1712883eddb7cd411ecd"
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +2 -2
@@ -1,4 +1,4 @@ -From f2e3dfd496a79a993ae4a03c2239b757131a9a68 Mon Sep 17 00:00:00 2001 +From 464c01a76acdde344248a873f63c5016d0258a31 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 4 Aug 2014 19:19:05 +0200 Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 load(qt_parts) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtimageformats_git.bb +1 -1
@@ -27,4 +27,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" -SRCREV = "e76fd83774f2e2ba552700e02e974fd4608bb001" +SRCREV = "3c68f26c052b06da9b43bb775cbe5a539fccb0c3"
recipes-qt/qt5/qtlocation_git.bb +1 -1
@@ -28,4 +28,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" -SRCREV = "d2d08b4f04a40c9760d73da36ed7c61881d99326" +SRCREV = "d1c91515ef0ad4208c41a4052f92bfb817333aca"
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +2 -2
@@ -1,4 +1,4 @@ -From fe90d2bb5dcfd1cb75ed5414a4acdb9dfc9d4367 Mon Sep 17 00:00:00 2001 +From 29a30927b25866e92a485d655c6aa97d1b13f908 Mon Sep 17 00:00:00 2001 From: Yoann Lopes <[email protected]> Date: Thu, 31 Oct 2013 15:06:30 +0100 Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -54,5 +54,5 @@ index 1225ffb..a60b1fc 100644 qtCompileTest(resourcepolicy) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtmultimedia_git.bb +5 -1
@@ -30,4 +30,8 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'G # Disable GStreamer if completely disabled EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" -SRCREV = "3f15c1b17e55b5b118d11621f85fa74f7cc74ae6" +SRC_URI += "\ + file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ +" + +SRCREV = "46a83d5b86a792e62f14674e27c5d95695f2b44d"
recipes-qt/qt5/qtquick1_git.bb +1 -1
@@ -23,4 +23,4 @@ do_configure_prepend() { sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro } -SRCREV = "eb3c45a5a6a84bd02cac2f5254ef56c3fe2536e8" +SRCREV = "f079636a3ee5538eb79fd4e7e6ffcb0465a015a0"
recipes-qt/qt5/qtquickcontrols_git.bb +1 -1
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "32ac38930c7a5183d6ce7f88d7008c9c45b2c94b" +SRCREV = "b35b0d60c8252b44e21e53922cba9c3a2d1abbc1"
recipes-qt/qt5/qtscript_git.bb +1 -1
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS += "qtbase" -SRCREV = "2724355d3a1029168e19162e1d1b10dd3f98dc89" +SRCREV = "50446e4edb0360871309a5d72a9a873f45fb17bd"
recipes-qt/qt5/qtsensors_git.bb +1 -1
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "414c0a82944bcf1bd4763f343b85abb0d8eb2f2d" +SRCREV = "a7b94516e1412073eb9d3fb57e49315ef966b183"
recipes-qt/qt5/qtserialport_git.bb +1 -1
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "d9ab9258ca81650a914357d53e7f92f293d4ef81" +SRCREV = "ad108e9d56e7838eac3726e0492a246086d53e70"
recipes-qt/qt5/qtsvg_git.bb +1 -1
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "ae3990fbf41039c78066c8440c654936365d9404" +SRCREV = "b5d689eaafd1e243d38f4df30f2d35eaab8b3b44"
recipes-qt/qt5/qtsystems_git.bb +1 -1
@@ -30,4 +30,4 @@ QT_MODULE_BRANCH = "dev" # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.5 -SRCREV = "4e3a7ed3ef5226256ae6aee1a73e264768aac8f4" +SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698"
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +11 -9
@@ -1,4 +1,4 @@ -From 5d1c8cdf5d448d5b3f719447dae3a59340348d2e Mon Sep 17 00:00:00 2001 +From 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -15,8 +15,8 @@ Signed-off-by: Martin Jansa <[email protected]> src/designer/src/src.pro | 18 ++++++++++-------- src/linguist/linguist.pro | 2 +- src/src.pro | 14 ++++++++------ - tests/auto/auto.pro | 22 ++++++++++++---------- - 5 files changed, 33 insertions(+), 26 deletions(-) + tests/auto/auto.pro | 24 +++++++++++++----------- + 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 69365d1..da7b38b 100644
@@ -122,10 +122,10 @@ index 494898f..c02848d 100644 qtNomakeTools( \ pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index a703a06..44bae18 100644 +index 20b5fec..8a42d1f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro -@@ -1,14 +1,16 @@ +@@ -1,15 +1,17 @@ TEMPLATE=subdirs -SUBDIRS=\ - linguist \
@@ -136,7 +136,8 @@ index a703a06..44bae18 100644 - qhelpprojectdata \ - cmake \ - installed_cmake \ -- qtdiag +- qtdiag \ +- windeployqt +!linguistonly { + SUBDIRS=\ + linguist \
@@ -146,12 +147,13 @@ index a703a06..44bae18 100644 + qhelpindexmodel \ + qhelpprojectdata \ + cmake \ -+ installed_cmake -+ qtdiag ++ installed_cmake \ ++ qtdiag \ ++ windeployqt +} installed_cmake.depends = cmake -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From b0f96a829a7a04400f6a8b6cb14756db175c8e03 Mon Sep 17 00:00:00 2001 +From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +2 -2
@@ -1,4 +1,4 @@ -From a4438a8c93e9846f1057dd7a21cbb41183440ec1 Mon Sep 17 00:00:00 2001 +From ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools_git.bb +1 -1
@@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" -SRCREV = "33c65366a7c3901d2aecfde3dbc485e1eac5c10c" +SRCREV = "02402887562f55b822fd29a64437da3d1252fd5b" BBCLASSEXTEND = "native nativesdk"
recipes-qt/qt5/qttranslations_git.bb +1 -1
@@ -98,4 +98,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "5e65c6fcdbbc75040426c8239c686f7b1ea689fd" +SRCREV = "6fbc830e0ebeb66a5570e8c432c27658670cd071"
recipes-qt/qt5/qtwayland-native_git.bb +3 -2
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -24,4 +25,4 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c" +SRCREV = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c"
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +2 -2
@@ -1,4 +1,4 @@ -From 5d3dbd14e72724f4cbffe79b82d5055d19094437 Mon Sep 17 00:00:00 2001 +From 09ba9e7eaebd72be5703d29848f5a65e5ca2e21c Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side
@@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644 +target.path = $$[QT_HOST_BINS] +INSTALLS += target -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +2 -2
@@ -1,4 +1,4 @@ -From f47f46bb3ea3a01967f0a4beab72e16e5e603fdf Mon Sep 17 00:00:00 2001 +From 19a3382694b3d66a056207e4e0345348f1d5bd57 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 22 Feb 2014 17:47:44 +0100 Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 + } } -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwayland_git.bb +4 -3
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -37,7 +38,7 @@ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ " -QT_VERSION ?= "5.5.0" +QT_VERSION ?= "5.5.1" do_install_append() { # do install files created by qtwaylandscanner
@@ -45,4 +46,4 @@ do_install_append() { install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private } -SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c" +SRCREV = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c"
recipes-qt/qt5/qtwebchannel_git.bb +3 -1
@@ -6,11 +6,13 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "b0fb9dcb63e21c197417164e6067086426f1d4c6" +SRCREV = "6a7de61bc15d0cde3a3c91c58f45ba10957aa39b"
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +4 -4
@@ -1,8 +1,8 @@ -From d1dfff21428643488790926bde3d699d64746f19 Mon Sep 17 00:00:00 2001 +From 8752cdaf7961ad0be8482cd6ebf76c91972f5088 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc - when building for x64 arch +Subject: [PATCH 1/2] <chromium> base.gypi: include + atomicops_internals_x86_gcc.cc when building for x64 arch Signed-off-by: Martin Jansa <[email protected]> ---
@@ -23,5 +23,5 @@ index a5a285a..f1cad86 100644 ['include', 'atomicops_internals_x86_gcc.cc'], ], -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +4 -4
@@ -1,7 +1,7 @@ -From 42b7e38e8d6fd36976a984edb40f947923d78d2c Mon Sep 17 00:00:00 2001 +From f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa <[email protected]>
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index ef0320d..98cff24 100644 +index 69d3fd3..5689ce0 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -98,9 +98,9 @@ defineReplace(mocOutput) {
@@ -26,5 +26,5 @@ index ef0320d..98cff24 100644 } -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch +4 -3
@@ -1,7 +1,8 @@ -From 75e9a963561a73ef2a449d7915cd8b41285ac862 Mon Sep 17 00:00:00 2001 +From 1efcdf981e6f4cc4e2b5e5dfe407030dc1e43e65 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 27 Jun 2015 13:29:52 -0700 -Subject: [PATCH] chromium/third_party/boringssl: Demand for newer POSIX macro +Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX + macro Reason for change: Define _POSIX_C_SOURCE such that it demands correct posix interfaces, netdb.h declares interfaces such as
@@ -33,5 +34,5 @@ index ba65a1a..66c3976 100644 #include <openssl/bio.h> #include <openssl/err.h> -- -2.5.0 +2.5.3
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +4 -4
@@ -1,7 +1,7 @@ -From 4b5d3c736714b2712d7f3a77ea5a8a76fea0fc1f Mon Sep 17 00:00:00 2001 +From 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to +Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch <[email protected]>
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 98cff24..aec54ea 100644 +index 5689ce0..e71e6e4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) {
@@ -25,5 +25,5 @@ index 98cff24..aec54ea 100644 for(ext, $$list($${QMAKE_EXT_CPP})): \ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +6 -6
@@ -1,7 +1,7 @@ -From 399990aa9b68437be7f3d6fa16556bf091645c34 Mon Sep 17 00:00:00 2001 +From b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <[email protected]> Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform +Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform Upstream-Status: Inappropriate [OE specific]
@@ -12,18 +12,18 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index aec54ea..6a4b01f 100644 +index e71e6e4..2161505 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) -- linux-g++*|win32-msvc2013|macx-clang: return(true) -+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) +- linux-g++*|win32-msvc2013|macx-clang*: return(true) ++ linux-g++*|linux-oe-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.") -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +6 -6
@@ -1,7 +1,7 @@ -From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001 +From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <[email protected]> Date: Mon, 11 May 2015 13:47:06 +0300 -Subject: [PATCH] Generate usable qmake_extras.gypi +Subject: [PATCH 4/4] Generate usable qmake_extras.gypi Running qmake recursively does not take .depends into account, so the SUBDIRS need to be in correct order so that qmake_extras.gypi
@@ -39,7 +39,7 @@ index cf00f39..747b711 100644 +SUBDIRS += gyp_run \ + core_module diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro -index 3eb6738..d6820c4 100644 +index eb94cb8..859bcbf 100644 --- a/src/core/gyp_configure_host.pro +++ b/src/core/gyp_configure_host.pro @@ -6,9 +6,6 @@ option(host_build)
@@ -50,10 +50,10 @@ index 3eb6738..d6820c4 100644 - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ - " ['LD.host', '$$which($$QMAKE_LINK)']," - GYPI_FILE = $$absolute_path('qmake_extras.gypi') + GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !build_pass { diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro -index 4d52044..f02bfa0 100644 +index 2a59966..317d24a 100644 --- a/src/core/gyp_configure_target.pro +++ b/src/core/gyp_configure_target.pro @@ -3,9 +3,6 @@ TEMPLATE = aux
@@ -67,5 +67,5 @@ index 4d52044..f02bfa0 100644 " 'target_defaults': {" \ " 'target_conditions': [" \ -- -1.9.1 +2.5.3
recipes-qt/qt5/qtwebengine_git.bb +2 -2
@@ -83,8 +83,8 @@ SRC_URI += " \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ file://0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch \ " -SRCREV_qtwebengine = "c6573119006014ff7bc0efb2da16ea35d302a1ec" -SRCREV_chromium = "41a1a031cd69e187a9608359ffe56652dcaaa6c5" +SRCREV_qtwebengine = "ccb373c4937777ce4af10918f7412c606cbd56ce" +SRCREV_chromium = "305284960db83fe9b9ae47674db9914d82180c23" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine"
recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch +2 -2
@@ -1,4 +1,4 @@ -From a3c5765b9ef6e45db847c79ed333ed5e124dbecb Mon Sep 17 00:00:00 2001 +From 9097d1fe3b21df880ec799414aeab78e62f032d2 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Tue, 8 Oct 2013 00:18:10 -0400 Subject: [PATCH] qtwebkit-examples: enable building examples by default
@@ -25,5 +25,5 @@ index 3fcecf1..2da8a36 100644 -SUBDIRS += doc +SUBDIRS += doc examples -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
@@ -20,4 +20,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "b7c95dc2ada1171f06183ce8608990732791aa3f" +SRCREV = "df729f9f284df2d30db432de351e7e80360097c8"
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +3 -3
@@ -1,7 +1,7 @@ -From 6b1704fcbe24d78c546a45c882db817634192058 Mon Sep 17 00:00:00 2001 +From d765da41bafa8349d4c64a74a841ebe3b2fb9443 Mon Sep 17 00:00:00 2001 From: Trevor Woerner <[email protected]> Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH) +Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) Building qtwebkit causes a QA issue such that QtWebPluginProcess and QtWebProcess contain bad RPATHs which point into the build location. This fix
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644 CONFIG(debug, debug|release)|force_debug_info { # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +3 -3
@@ -1,7 +1,7 @@ -From 8239c912d045d04d4944650dde397473a8eb4462 Mon Sep 17 00:00:00 2001 +From 05e0ba998775d92bd3c0701cd5e290815700e3f4 Mon Sep 17 00:00:00 2001 From: Magnus Granberg <[email protected]> Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH 2/2] Remove TEXTREL tag in x86 +Subject: [PATCH 2/3] Remove TEXTREL tag in x86 Fix textrel QA warnings when building qtwebkit for x86:
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) #endif -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +3 -3
@@ -1,7 +1,7 @@ -From b345a3414a7d09b47586aac437d79e2bbfa52fb8 Mon Sep 17 00:00:00 2001 +From c9ed11eff6f200ea42ae64372186d560880591bc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries +Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries It was excluding musl with current checks, so lets make it such that it considers only glibc when using backtrace API
@@ -34,5 +34,5 @@ index 1b2091f..ba03a28 100644 #elif OS(WINDOWS) && !OS(WINCE) // The CaptureStackBackTrace function is available in XP, but it is not defined -- -2.1.4 +2.5.3
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -64,4 +64,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "3f0fbb46e2e4e3d0d9ac9f0731b3f8435a504b4b" +SRCREV = "0d592678bad23a77f35c109253a0263664e69812"
recipes-qt/qt5/qtwebsockets_git.bb +1 -1
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "158ec0ca22f8f6713eb80f737eb8d0ef84f515ac" +SRCREV = "12e424f241b29ef26ad2a3a70740d8b320e9e85a"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f2da28b77cf3256d98e00ff7435938ebee44cb01" +SRCREV = "e4f2f0a146a83fa3160687ca06e11430ff02c5a8"
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1
@@ -12,6 +12,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "ae6504efc85adf754d60a02f81413e5949282d78" +SRCREV = "670b2073c0b1c40f5b67fc36c18ed15fe2cdfee2" BBCLASSEXTEND =+ "native nativesdk"
Signature · 1 line
2.5.3
PATCH v2 1/1 qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 +- recipes-qt/qt5/qt3d_git.bb | 7 +- recipes-qt/qt5/qtbase-native_git.bb | 10 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 14 +-- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 6 +- .../0003-Add-external-hostbindir-option.patch | 16 +-- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 8 +- ...mintegration-Undefine-CursorShape-from-X..patch | 4 +- ...ump-path-length-from-256-to-512-character.patch | 10 +- .../0007-QOpenGLPaintDevice-sub-area-support.patch | 4 +- recipes-qt/qt5/qtbase/0008-Always-build-uic.patch | 31 +++++ .../qt5/qtbase/0008-Fix-build-with-clang-3.7.patch | 72 ----------- ...-build-it-in-configure-but-allow-to-build.patch | 68 +++++++++++ ...external-hostbindir-option-for-native-sdk.patch | 134 +++++++++++++++++++++ recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | 31 ----- ...Invert-conditional-for-defining-QT_SOCKLE.patch | 36 ++++++ ...-build-it-in-configure-but-allow-to-build.patch | 68 ----------- ...external-hostbindir-option-for-native-sdk.patch | 134 --------------------- ...reserve-built-qmake-and-swap-with-native-.patch | 30 +++++ ...Invert-conditional-for-defining-QT_SOCKLE.patch | 36 ------ ...mscreen.cpp-reorder-headers-to-fix-build-.patch | 49 ++++++++ ...reserve-built-qmake-and-swap-with-native-.patch | 30 ----- ...mscreen.cpp-reorder-headers-to-fix-build-.patch | 49 -------- recipes-qt/qt5/qtbase_git.bb | 12 +- recipes-qt/qt5/qtcanvas3d_git.bb | 5 +- recipes-qt/qt5/qtconnectivity_git.bb | 5 +- .../0001-qmltestexample-fix-link.patch | 4 +- recipes-qt/qt5/qtdeclarative_git.bb | 5 +- recipes-qt/qt5/qtenginio_git.bb | 5 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 5 +- ...ats.pro-Make-the-dependencies-determinist.patch | 4 +- recipes-qt/qt5/qtimageformats_git.bb | 5 +- recipes-qt/qt5/qtlocation_git.bb | 5 +- ...1-Initial-porting-effort-to-GStreamer-1.0.patch | 25 ++-- recipes-qt/qt5/qtmultimedia_git.bb | 9 +- recipes-qt/qt5/qtquick1_git.bb | 5 +- recipes-qt/qt5/qtquickcontrols_git.bb | 5 +- recipes-qt/qt5/qtscript_git.bb | 5 +- recipes-qt/qt5/qtsensors_git.bb | 5 +- recipes-qt/qt5/qtserialport_git.bb | 5 +- recipes-qt/qt5/qtsvg_git.bb | 5 +- recipes-qt/qt5/qtsystems_git.bb | 6 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 20 +-- ...t-help-fix-linking-of-dependent-libraries.patch | 4 +- .../0003-add-noqtwebkit-configuration.patch | 4 +- recipes-qt/qt5/qttools_git.bb | 5 +- recipes-qt/qt5/qttranslations_git.bb | 5 +- recipes-qt/qt5/qtwayland-native_git.bb | 5 +- ...-qtwaylandscanner-tool-to-the-native-side.patch | 4 +- ...yland-include-server-buffer-only-when-bui.patch | 4 +- recipes-qt/qt5/qtwayland_git.bb | 7 +- recipes-qt/qt5/qtwebchannel_git.bb | 6 +- ...se.gypi-include-atomicops_internals_x86_g.patch | 8 +- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 8 +- ...ird_party-boringssl-Demand-for-newer-POSI.patch | 7 +- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 8 +- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 12 +- .../0004-Generate-usable-qmake_extras.gypi.patch | 12 +- recipes-qt/qt5/qtwebengine_git.bb | 8 +- ...amples-enable-building-examples-by-defaul.patch | 4 +- recipes-qt/qt5/qtwebkit-examples_git.bb | 5 +- .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 6 +- .../qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 6 +- ...ude-backtrace-API-for-non-glibc-libraries.patch | 6 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 5 +- recipes-qt/qt5/qtx11extras_git.bb | 5 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 5 +- 68 files changed, 559 insertions(+), 596 deletions(-) create mode 100644 recipes-qt/qt5/qtbase/0008-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch create mode 100644 recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch create mode 100644 recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch create mode 100644 recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch create mode 100644 recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
recipes-qt/qt5/nativesdk-qtbase_git.bb +6 -6
@@ -6,7 +6,8 @@ HOMEPAGE = "http://qt-project.org" LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -28,18 +29,17 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0009-Always-build-uic.patch \ - file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ + file://0008-Always-build-uic.patch \ + file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0010-configure-preserve-built-qmake-and-swap-with-native-.patch \ " # CMake's toolchain configuration of nativesdk-qtbase
@@ -278,4 +278,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qt3d_git.bb +4 -3
@@ -3,8 +3,9 @@ require qt5-git.inc LICENSE = "LGPL-3.0 | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec\ + file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ " DEPENDS = "qtdeclarative"
@@ -14,4 +15,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/*/*/*.obj \ " -SRCREV = "a3b99941751598fb734b189333d5020666df2b2c" +SRCREV = "0bcb6600db2a74ee8c8b51207d3ba15e4973aa95"
recipes-qt/qt5/qtbase-native_git.bb +5 -5
@@ -5,7 +5,8 @@ HOMEPAGE = "http://qt-project.org" LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -22,13 +23,12 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ - file://0009-Always-build-uic.patch \ - file://0010-Add-external-hostbindir-option-for-native-sdk.patch \ + file://0008-Always-build-uic.patch \ + file://0009-Add-external-hostbindir-option-for-native-sdk.patch \ " CLEANBROKEN = "1"
@@ -116,4 +116,4 @@ do_install() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +7 -7
@@ -1,4 +1,4 @@ -From de9a457dacd9388e8ef145fce9cf4e1e1da6468b Mon Sep 17 00:00:00 2001 +From 566de5f3f4dc14bae25a1b77eb6859c820447a32 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/10] Add linux-oe-g++ platform
@@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <[email protected]> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 8a4c89e..dfbb111 100755 +index cea62fb..e1929e7 100755 --- a/configure +++ b/configure @@ -342,6 +342,16 @@ getQMakeConf()
@@ -120,7 +120,7 @@ index 8a4c89e..dfbb111 100755 fi'` eval "$cmd" done -@@ -3337,7 +3347,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3350,7 +3360,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi
@@ -129,7 +129,7 @@ index 8a4c89e..dfbb111 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3394,7 +3404,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3407,7 +3417,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi
@@ -138,7 +138,7 @@ index 8a4c89e..dfbb111 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3896,6 +3906,14 @@ setBootstrapVariable() +@@ -3909,6 +3919,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" }
@@ -153,7 +153,7 @@ index 8a4c89e..dfbb111 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3934,14 +3952,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3947,14 +3965,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -348,5 +348,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +3 -3
@@ -1,4 +1,4 @@ -From 7ca620bb9f03ddc8536ac3c45b485cc83603f1c8 Mon Sep 17 00:00:00 2001 +From 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index 2912e68..f663c88 100644 +index 0cfcc4e..c3b5c2d 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -157,7 +157,10 @@ void QLibrarySettings::load()
@@ -35,5 +35,5 @@ index 2912e68..f663c88 100644 return new QSettings(qtconfig, QSettings::IniFormat); #ifdef QT_BUILD_QMAKE -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +8 -8
@@ -1,4 +1,4 @@ -From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 Mon Sep 17 00:00:00 2001 +From 90f3f8f59dd23f67e14c9988c2f4449a31762752 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 03/10] Add -external-hostbindir option
@@ -37,10 +37,10 @@ Conflicts: 7 files changed, 37 insertions(+), 12 deletions(-) diff --git a/configure b/configure -index dfbb111..548dd0d 100755 +index e1929e7..a757ce5 100755 --- a/configure +++ b/configure -@@ -806,6 +806,7 @@ QT_HOST_BINS= +@@ -809,6 +809,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index dfbb111..548dd0d 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do +@@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \
@@ -56,7 +56,7 @@ index dfbb111..548dd0d 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do +@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;;
@@ -66,7 +66,7 @@ index dfbb111..548dd0d 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2380,6 +2385,10 @@ Installation options: +@@ -2383,6 +2388,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX)
@@ -77,7 +77,7 @@ index dfbb111..548dd0d 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -3097,6 +3106,11 @@ fi +@@ -3110,6 +3119,11 @@ fi # command line and environment validation #-------------------------------------------------------------------------------
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +4 -4
@@ -1,4 +1,4 @@ -From bae1b8fbd3fe94a99a02fb751302baa788e9f2ff Mon Sep 17 00:00:00 2001 +From d28d15f9489ab9bb09627014003ad1bde2a79e1f Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <[email protected]> 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 5861941..474827c 100644 +index 55f65b5..2412fdd 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,7 +80,7 @@ index 5861941..474827c 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 5412f37..5ab348a 100644 +index c89b6d2..23d4366 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -214,6 +214,11 @@ unix|mingw {
@@ -108,5 +108,5 @@ index 5412f37..5ab348a 100644 } -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +2 -2
@@ -1,4 +1,4 @@ -From 0b4d9044218df6e7fb700be6cfd21b4aaab24b18 Mon Sep 17 00:00:00 2001 +From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644 class QEGLPlatformWindow; -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +5 -5
@@ -1,7 +1,7 @@ -From fe6405c5a628c168e42138ac82ba70bb8c909d0b Mon Sep 17 00:00:00 2001 +From 37aec78ac44bad8754c3bd5b56836025e4eed50a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Tue, 25 Aug 2015 10:05:15 -0400 -Subject: [PATCH] configure: bump path length from 256 to 512 characters +Subject: [PATCH 06/10] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long.
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 22867a7..fe18487 100755 +index a757ce5..f0f42ab 100755 --- a/configure +++ b/configure -@@ -3851,10 +3851,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3863,10 +3863,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */
@@ -32,5 +32,5 @@ index 22867a7..fe18487 100755 static const short qt_configure_str_offsets[] = { -- -2.2.0 +2.5.3
recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch +2 -2
@@ -1,4 +1,4 @@ -From 7dfc673d6968ce890e5fad7fd8fd8a74c12b876b Mon Sep 17 00:00:00 2001 +From ca3b8fabcc38a9545e935a7c530565689fb85ff7 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH 07/10] QOpenGLPaintDevice sub-area support
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644 } else { if (m_vao.isCreated()) { -- -2.5.0 +2.5.3
recipes-qt/qt5/qtbase/0008-Always-build-uic.patch new file +31 -0
@@ -0,0 +1,31 @@ +From d1feb6d0a80460e66872749d931cddc8ed22851d Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH 08/10] Always build uic + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa <[email protected]> +Signed-off-by: Martin Jansa <[email protected]> +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 61e5ce2..a4047aa 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent + } + } + } +-SUBDIRS += src_plugins src_tools_qdoc ++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic + + nacl: SUBDIRS -= src_network src_testlib + +-- +2.5.3 +
recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch deleted +0 -72
72 lines not on this page · raw message
recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch new file +68 -0
68 lines not on this page · raw message
recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch new file +134 -0
134 lines not on this page · raw message
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From c6a58549ef110a31960fca80f6d3dcdcf4d9176a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 09/11] Always build uic - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa <[email protected]> -Signed-off-by: Martin Jansa <[email protected]> ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index b4d62aa..5e19215 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent - } - } - } --SUBDIRS += src_plugins src_tools_qdoc -+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic - - nacl: SUBDIRS -= src_network src_testlib - --- -2.5.0 -
recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch new file +36 -0
@@ -0,0 +1,36 @@ +From b0648c997d24855b2a6f56fc61e3159af815fb4d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 8 Jun 2015 13:59:25 -0700 +Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining + QT_SOCKLEN_T + +This helps to make sure that QT_SOCKLEN_T is defined to be 'int' +only when its glibc < 2 and not also for the libraries which may define +it as per standards but are not glibc, e.g. musl + +Signed-off-by: Khem Raj <[email protected]> +--- + mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h +index dd12003..8623651 100644 +--- a/mkspecs/linux-oe-g++/qplatformdefs.h ++++ b/mkspecs/linux-oe-g++/qplatformdefs.h +@@ -86,10 +86,10 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) +-#define QT_SOCKLEN_T socklen_t +-#else ++#if defined(__GLIBC__) && (__GLIBC__ < 2) + #define QT_SOCKLEN_T int ++#else ++#define QT_SOCKLEN_T socklen_t + #endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +-- +2.5.3 +
recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch deleted +0 -68
68 lines not on this page · raw message
recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch deleted +0 -134
134 lines not on this page · raw message
recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 706d9a8b270d5eb803e93005cc90a1aa1553572a Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Mon, 11 Nov 2013 20:22:34 -0500 +Subject: [PATCH 10/10] configure: preserve built qmake and swap with native + one + +Let configure script build the real qmake, but right after it's built, swap +it with a native qmake for further internal use, preserving the real one. + +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index 04fd1ba..8914e9c 100755 +--- a/configure ++++ b/configure +@@ -4112,6 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Done." + fi + fi # Build qmake ++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" ++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" + + echo "Running configuration tests..." + +-- +2.5.3 +
recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From bae2c6afb951d1352845ca257fdc2389f3fe851e Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 8 Jun 2015 13:59:25 -0700 -Subject: [PATCH 10/10] linux-oe-g++: Invert conditional for defining - QT_SOCKLEN_T - -This helps to make sure that QT_SOCKLEN_T is defined to be 'int' -only when its glibc < 2 and not also for the libraries which may define -it as per standards but are not glibc, e.g. musl - -Signed-off-by: Khem Raj <[email protected]> ---- - mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -index dd12003..8623651 100644 ---- a/mkspecs/linux-oe-g++/qplatformdefs.h -+++ b/mkspecs/linux-oe-g++/qplatformdefs.h -@@ -86,10 +86,10 @@ - - #undef QT_SOCKLEN_T - --#if defined(__GLIBC__) && (__GLIBC__ >= 2) --#define QT_SOCKLEN_T socklen_t --#else -+#if defined(__GLIBC__) && (__GLIBC__ < 2) - #define QT_SOCKLEN_T int -+#else -+#define QT_SOCKLEN_T socklen_t - #endif - - #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.5.0 -
recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch new file +49 -0
49 lines not on this page · raw message
recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From cef1ac9fa399ad5c57480de26a1ef441414f125c Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <[email protected]> -Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH 11/11] configure: preserve built qmake and swap with native - one - -Let configure script build the real qmake, but right after it's built, swap -it with a native qmake for further internal use, preserving the real one. - -Signed-off-by: Denys Dmytriyenko <[email protected]> ---- - configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure b/configure -index 1d2157f..bea14af 100755 ---- a/configure -+++ b/configure -@@ -4099,6 +4099,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Done." - fi - fi # Build qmake -+mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" -+mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" - - echo "Running configuration tests..." - --- -2.5.0 -
recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch deleted +0 -49
49 lines not on this page · raw message
recipes-qt/qt5/qtbase_git.bb +6 -6
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -18,14 +19,13 @@ SRC_URI += "\ file://0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ file://0006-configure-bump-path-length-from-256-to-512-character.patch \ file://0007-QOpenGLPaintDevice-sub-area-support.patch \ - file://0008-Fix-build-with-clang-3.7.patch \ " # specific for target qtbase SRC_URI += "\ - file://0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ - file://0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ - file://0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \ + file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ + file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ + file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \ " DEPENDS += "qtbase-native"
@@ -279,4 +279,4 @@ sysroot_stage_dirs_append() { rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts } -SRCREV = "2fde9f59eeab68ede92324e7613daf8be3eaf498" +SRCREV = "c619d2daac9b1f61e8ad2320b59c648b6af6af90"
recipes-qt/qt5/qtcanvas3d_git.bb +3 -2
@@ -3,10 +3,11 @@ require qt5-git.inc LICENSE = "LGPL-3.0 | GPL-3.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ " DEPENDS = "qtdeclarative" -SRCREV = "f8fe29aab406ded57f13ad961ba977401d9585c9" +SRCREV = "e372a67c1bbdf695f8e550950a3dbf3106389479"
recipes-qt/qt5/qtconnectivity_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -21,4 +22,4 @@ do_configure_prepend() { sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro } -SRCREV = "e4a5dc7dbe62c32032e5e683ac1fdb57663a14b3" +SRCREV = "b31cbd7c5d6b16a20035ace6675835356b69fd65"
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +2 -2
@@ -1,4 +1,4 @@ -From 47b3408b8aeed4795dcfebcd81b6b7b4185712de Mon Sep 17 00:00:00 2001 +From c866d9b3f38f1a0adabdeb19648058711a66a900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <[email protected]> Date: Sun, 26 May 2013 14:26:19 +0200 Subject: [PATCH] qmltestexample: fix link
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 load(qt_tool) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtdeclarative_git.bb +3 -2
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -32,6 +33,6 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "cc0df64bb0e1dea2fe37950816095802f527a241" +SRCREV = "9794e7d66c30f012a19ec9530d719293b7c5bc7c" BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_git.bb +3 -2
@@ -4,11 +4,12 @@ require qt5-git.inc LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ " DEPENDS += "qtbase qtdeclarative qtxmlpatterns" QT_MODULE_BRANCH = "1.2" -SRCREV = "749bcec16b89269026a2048c7394df74f08935c4" +SRCREV = "e32bcb7b714454f9167c4d49776a95c9a5799d70"
recipes-qt/qt5/qtgraphicaleffects_git.bb +3 -2
@@ -6,7 +6,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -16,4 +17,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "73357afbbe46e660b3497f621505f351b43c5efa" +SRCREV = "9aa0edc6d13d20796feb1712883eddb7cd411ecd"
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +2 -2
@@ -1,4 +1,4 @@ -From f2e3dfd496a79a993ae4a03c2239b757131a9a68 Mon Sep 17 00:00:00 2001 +From 464c01a76acdde344248a873f63c5016d0258a31 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 4 Aug 2014 19:19:05 +0200 Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
@@ -27,5 +27,5 @@ index 8382e5c..63d13ce 100644 load(qt_parts) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtimageformats_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -27,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" -SRCREV = "e76fd83774f2e2ba552700e02e974fd4608bb001" +SRCREV = "3c68f26c052b06da9b43bb775cbe5a539fccb0c3"
recipes-qt/qt5/qtlocation_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -28,4 +29,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" -SRCREV = "d2d08b4f04a40c9760d73da36ed7c61881d99326" +SRCREV = "d1c91515ef0ad4208c41a4052f92bfb817333aca"
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +13 -12
@@ -1,4 +1,4 @@ -From fe90d2bb5dcfd1cb75ed5414a4acdb9dfc9d4367 Mon Sep 17 00:00:00 2001 +From c75cdeeb0ea705b9415c3cf777c611aee01f62c2 Mon Sep 17 00:00:00 2001 From: Yoann Lopes <[email protected]> Date: Thu, 31 Oct 2013 15:06:30 +0100 Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -13,14 +13,14 @@ Subject: [PATCH] Initial porting effort to GStreamer 1.0. Signed-off-by: Martin Jansa <[email protected]> --- - qtmultimedia.pro | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) + qtmultimedia.pro | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/qtmultimedia.pro b/qtmultimedia.pro -index 1225ffb..a60b1fc 100644 +index 1225ffb..4f675fe 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro -@@ -18,19 +18,20 @@ win32 { +@@ -18,19 +18,21 @@ win32 { contains(QT_CONFIG, alsa):qtCompileTest(alsa) contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
@@ -36,6 +36,13 @@ index 1225ffb..a60b1fc 100644 + } else: contains(QT_CONFIG, gstreamer-1.0) { + GST_VERSION = 1.0 + } ++ } ++ cache(GST_VERSION, set) ++ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { ++ qtCompileTest(gstreamer_photography) ++ qtCompileTest(gstreamer_encodingprofiles) ++ qtCompileTest(gstreamer_appsrc) ++ qtCompileTest(linux_v4l) } - } - cache(GST_VERSION, set)
@@ -44,15 +51,9 @@ index 1225ffb..a60b1fc 100644 - qtCompileTest(gstreamer_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) -+ cache(GST_VERSION, set) -+ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { -+ qtCompileTest(gstreamer_photography) -+ qtCompileTest(gstreamer_encodingprofiles) -+ qtCompileTest(gstreamer_appsrc) -+ qtCompileTest(linux_v4l) } qtCompileTest(resourcepolicy) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtmultimedia_git.bb +7 -2
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -30,4 +31,8 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'G # Disable GStreamer if completely disabled EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}" -SRCREV = "3f15c1b17e55b5b118d11621f85fa74f7cc74ae6" +SRC_URI += "\ + file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ +" + +SRCREV = "46a83d5b86a792e62f14674e27c5d95695f2b44d"
recipes-qt/qt5/qtquick1_git.bb +3 -2
@@ -7,7 +7,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -23,4 +24,4 @@ do_configure_prepend() { sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro } -SRCREV = "eb3c45a5a6a84bd02cac2f5254ef56c3fe2536e8" +SRCREV = "f079636a3ee5538eb79fd4e7e6ffcb0465a015a0"
recipes-qt/qt5/qtquickcontrols_git.bb +3 -2
@@ -3,7 +3,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ "
@@ -12,4 +13,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "32ac38930c7a5183d6ce7f88d7008c9c45b2c94b" +SRCREV = "b35b0d60c8252b44e21e53922cba9c3a2d1abbc1"
recipes-qt/qt5/qtscript_git.bb +3 -2
@@ -6,7 +6,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -25,4 +26,4 @@ ARM_INSTRUCTION_SET = "arm" DEPENDS += "qtbase" -SRCREV = "2724355d3a1029168e19162e1d1b10dd3f98dc89" +SRCREV = "50446e4edb0360871309a5d72a9a873f45fb17bd"
recipes-qt/qt5/qtsensors_git.bb +3 -2
@@ -6,7 +6,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -14,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "414c0a82944bcf1bd4763f343b85abb0d8eb2f2d" +SRCREV = "a7b94516e1412073eb9d3fb57e49315ef966b183"
recipes-qt/qt5/qtserialport_git.bb +3 -2
@@ -6,7 +6,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -14,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "d9ab9258ca81650a914357d53e7f92f293d4ef81" +SRCREV = "ad108e9d56e7838eac3726e0492a246086d53e70"
recipes-qt/qt5/qtsvg_git.bb +3 -2
@@ -5,11 +5,12 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtbase" -SRCREV = "ae3990fbf41039c78066c8440c654936365d9404" +SRCREV = "b5d689eaafd1e243d38f4df30f2d35eaab8b3b44"
recipes-qt/qt5/qtsystems_git.bb +3 -3
@@ -3,8 +3,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.LGPLv21;md5=4193e7f1d47a858f6b7c0f1ee66161de \ + file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -30,4 +30,4 @@ QT_MODULE_BRANCH = "dev" # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.5 -SRCREV = "4e3a7ed3ef5226256ae6aee1a73e264768aac8f4" +SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698"
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +11 -9
@@ -1,4 +1,4 @@ -From 5d1c8cdf5d448d5b3f719447dae3a59340348d2e Mon Sep 17 00:00:00 2001 +From 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -15,8 +15,8 @@ Signed-off-by: Martin Jansa <[email protected]> src/designer/src/src.pro | 18 ++++++++++-------- src/linguist/linguist.pro | 2 +- src/src.pro | 14 ++++++++------ - tests/auto/auto.pro | 22 ++++++++++++---------- - 5 files changed, 33 insertions(+), 26 deletions(-) + tests/auto/auto.pro | 24 +++++++++++++----------- + 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 69365d1..da7b38b 100644
@@ -122,10 +122,10 @@ index 494898f..c02848d 100644 qtNomakeTools( \ pixeltool \ diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro -index a703a06..44bae18 100644 +index 20b5fec..8a42d1f 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro -@@ -1,14 +1,16 @@ +@@ -1,15 +1,17 @@ TEMPLATE=subdirs -SUBDIRS=\ - linguist \
@@ -136,7 +136,8 @@ index a703a06..44bae18 100644 - qhelpprojectdata \ - cmake \ - installed_cmake \ -- qtdiag +- qtdiag \ +- windeployqt +!linguistonly { + SUBDIRS=\ + linguist \
@@ -146,12 +147,13 @@ index a703a06..44bae18 100644 + qhelpindexmodel \ + qhelpprojectdata \ + cmake \ -+ installed_cmake -+ qtdiag ++ installed_cmake \ ++ qtdiag \ ++ windeployqt +} installed_cmake.depends = cmake -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From b0f96a829a7a04400f6a8b6cb14756db175c8e03 Mon Sep 17 00:00:00 2001 +From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +2 -2
@@ -1,4 +1,4 @@ -From a4438a8c93e9846f1057dd7a21cbb41183440ec1 Mon Sep 17 00:00:00 2001 +From ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.4.2 +2.5.3
recipes-qt/qt5/qttools_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -30,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" -SRCREV = "33c65366a7c3901d2aecfde3dbc485e1eac5c10c" +SRCREV = "02402887562f55b822fd29a64437da3d1252fd5b" BBCLASSEXTEND = "native nativesdk"
recipes-qt/qt5/qttranslations_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "(LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ "
@@ -98,4 +99,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "5e65c6fcdbbc75040426c8239c686f7b1ea689fd" +SRCREV = "6fbc830e0ebeb66a5570e8c432c27658670cd071"
recipes-qt/qt5/qtwayland-native_git.bb +3 -2
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -24,4 +25,4 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c" +SRCREV = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c"
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +2 -2
@@ -1,4 +1,4 @@ -From 5d3dbd14e72724f4cbffe79b82d5055d19094437 Mon Sep 17 00:00:00 2001 +From 09ba9e7eaebd72be5703d29848f5a65e5ca2e21c Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side
@@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644 +target.path = $$[QT_HOST_BINS] +INSTALLS += target -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +2 -2
@@ -1,4 +1,4 @@ -From f47f46bb3ea3a01967f0a4beab72e16e5e603fdf Mon Sep 17 00:00:00 2001 +From 19a3382694b3d66a056207e4e0345348f1d5bd57 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 22 Feb 2014 17:47:44 +0100 Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 + } } -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwayland_git.bb +4 -3
@@ -5,7 +5,8 @@ require qt5-git.inc LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ "
@@ -37,7 +38,7 @@ SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ " -QT_VERSION ?= "5.5.0" +QT_VERSION ?= "5.5.1" do_install_append() { # do install files created by qtwaylandscanner
@@ -45,4 +46,4 @@ do_install_append() { install ${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h ${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private } -SRCREV = "0e4e0a7c6be2928cc4300c8ef41d10ed8b3b316c" +SRCREV = "10fd51a3e69a0a2ee6b8cd151fa6c847f684253c"
recipes-qt/qt5/qtwebchannel_git.bb +4 -2
@@ -6,11 +6,13 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "b0fb9dcb63e21c197417164e6067086426f1d4c6" +SRCREV = "6a7de61bc15d0cde3a3c91c58f45ba10957aa39b"
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +4 -4
@@ -1,8 +1,8 @@ -From d1dfff21428643488790926bde3d699d64746f19 Mon Sep 17 00:00:00 2001 +From 8752cdaf7961ad0be8482cd6ebf76c91972f5088 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc - when building for x64 arch +Subject: [PATCH 1/2] <chromium> base.gypi: include + atomicops_internals_x86_gcc.cc when building for x64 arch Signed-off-by: Martin Jansa <[email protected]> ---
@@ -23,5 +23,5 @@ index a5a285a..f1cad86 100644 ['include', 'atomicops_internals_x86_gcc.cc'], ], -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +4 -4
@@ -1,7 +1,7 @@ -From 42b7e38e8d6fd36976a984edb40f947923d78d2c Mon Sep 17 00:00:00 2001 +From f66dceb807d27e4c0a3d1dd4d5b4f448b08317c9 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa <[email protected]>
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index ef0320d..98cff24 100644 +index 69d3fd3..5689ce0 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -98,9 +98,9 @@ defineReplace(mocOutput) {
@@ -26,5 +26,5 @@ index ef0320d..98cff24 100644 } -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch +4 -3
@@ -1,7 +1,8 @@ -From 75e9a963561a73ef2a449d7915cd8b41285ac862 Mon Sep 17 00:00:00 2001 +From 1efcdf981e6f4cc4e2b5e5dfe407030dc1e43e65 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 27 Jun 2015 13:29:52 -0700 -Subject: [PATCH] chromium/third_party/boringssl: Demand for newer POSIX macro +Subject: [PATCH 2/2] chromium/third_party/boringssl: Demand for newer POSIX + macro Reason for change: Define _POSIX_C_SOURCE such that it demands correct posix interfaces, netdb.h declares interfaces such as
@@ -33,5 +34,5 @@ index ba65a1a..66c3976 100644 #include <openssl/bio.h> #include <openssl/err.h> -- -2.5.0 +2.5.3
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +4 -4
@@ -1,7 +1,7 @@ -From 4b5d3c736714b2712d7f3a77ea5a8a76fea0fc1f Mon Sep 17 00:00:00 2001 +From 3cdf1ffa138026a601df8e8ddff5ac0723edb0b7 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to +Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch <[email protected]>
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index 98cff24..aec54ea 100644 +index 5689ce0..e71e6e4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -95,7 +95,8 @@ defineReplace(findIncludedMocFiles) {
@@ -25,5 +25,5 @@ index 98cff24..aec54ea 100644 for(ext, $$list($${QMAKE_EXT_CPP})): \ out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +6 -6
@@ -1,7 +1,7 @@ -From 399990aa9b68437be7f3d6fa16556bf091645c34 Mon Sep 17 00:00:00 2001 +From b7b5fa151e1ff1749ab5b04763f0f64a156e6e48 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <[email protected]> Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform +Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform Upstream-Status: Inappropriate [OE specific]
@@ -12,18 +12,18 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf -index aec54ea..6a4b01f 100644 +index e71e6e4..2161505 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -14,7 +14,7 @@ defineTest(isPlatformSupported) { linux-g++*:!isGCCVersionSupported(): return(false) !isPythonVersionSupported(): return(false) -- linux-g++*|win32-msvc2013|macx-clang: return(true) -+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true) +- linux-g++*|win32-msvc2013|macx-clang*: return(true) ++ linux-g++*|linux-oe-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.") -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebengine/0004-Generate-usable-qmake_extras.gypi.patch +6 -6
@@ -1,7 +1,7 @@ -From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001 +From 55c5a15f0a11c76a930020ac725e57303da2ef48 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <[email protected]> Date: Mon, 11 May 2015 13:47:06 +0300 -Subject: [PATCH] Generate usable qmake_extras.gypi +Subject: [PATCH 4/4] Generate usable qmake_extras.gypi Running qmake recursively does not take .depends into account, so the SUBDIRS need to be in correct order so that qmake_extras.gypi
@@ -39,7 +39,7 @@ index cf00f39..747b711 100644 +SUBDIRS += gyp_run \ + core_module diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro -index 3eb6738..d6820c4 100644 +index eb94cb8..859bcbf 100644 --- a/src/core/gyp_configure_host.pro +++ b/src/core/gyp_configure_host.pro @@ -6,9 +6,6 @@ option(host_build)
@@ -50,10 +50,10 @@ index 3eb6738..d6820c4 100644 - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ - " ['LD.host', '$$which($$QMAKE_LINK)']," - GYPI_FILE = $$absolute_path('qmake_extras.gypi') + GYPI_FILE = $$OUT_PWD/qmake_extras.gypi !build_pass { diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro -index 4d52044..f02bfa0 100644 +index 2a59966..317d24a 100644 --- a/src/core/gyp_configure_target.pro +++ b/src/core/gyp_configure_target.pro @@ -3,9 +3,6 @@ TEMPLATE = aux
@@ -67,5 +67,5 @@ index 4d52044..f02bfa0 100644 " 'target_defaults': {" \ " 'target_conditions': [" \ -- -1.9.1 +2.5.3
recipes-qt/qt5/qtwebengine_git.bb +5 -3
@@ -4,7 +4,9 @@ LICENSE = "LGPL-3.0 & BSD" LIC_FILES_CHKSUM = " \ file://src/core/browser_context_qt.cpp;md5=5fe719c44250955a5d5f8fb15fc8b1da;beginline=1;endline=35 \ file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \ - file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ " DEPENDS += " \
@@ -83,8 +85,8 @@ SRC_URI += " \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ file://0002-chromium-third_party-boringssl-Demand-for-newer-POSI.patch \ " -SRCREV_qtwebengine = "c6573119006014ff7bc0efb2da16ea35d302a1ec" -SRCREV_chromium = "41a1a031cd69e187a9608359ffe56652dcaaa6c5" +SRCREV_qtwebengine = "ccb373c4937777ce4af10918f7412c606cbd56ce" +SRCREV_chromium = "305284960db83fe9b9ae47674db9914d82180c23" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine"
recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch +2 -2
@@ -1,4 +1,4 @@ -From a3c5765b9ef6e45db847c79ed333ed5e124dbecb Mon Sep 17 00:00:00 2001 +From 9097d1fe3b21df880ec799414aeab78e62f032d2 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Tue, 8 Oct 2013 00:18:10 -0400 Subject: [PATCH] qtwebkit-examples: enable building examples by default
@@ -25,5 +25,5 @@ index 3fcecf1..2da8a36 100644 -SUBDIRS += doc +SUBDIRS += doc examples -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit-examples_git.bb +3 -2
@@ -7,7 +7,8 @@ LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://examples/webkitwidgets/scroller/wheel/main.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f \ "
@@ -20,4 +21,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "b7c95dc2ada1171f06183ce8608990732791aa3f" +SRCREV = "df729f9f284df2d30db432de351e7e80360097c8"
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +3 -3
@@ -1,7 +1,7 @@ -From 6b1704fcbe24d78c546a45c882db817634192058 Mon Sep 17 00:00:00 2001 +From d765da41bafa8349d4c64a74a841ebe3b2fb9443 Mon Sep 17 00:00:00 2001 From: Trevor Woerner <[email protected]> Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH) +Subject: [PATCH 1/3] qtwebkit: fix QA issue (bad RPATH) Building qtwebkit causes a QA issue such that QtWebPluginProcess and QtWebProcess contain bad RPATHs which point into the build location. This fix
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644 CONFIG(debug, debug|release)|force_debug_info { # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +3 -3
@@ -1,7 +1,7 @@ -From 8239c912d045d04d4944650dde397473a8eb4462 Mon Sep 17 00:00:00 2001 +From 05e0ba998775d92bd3c0701cd5e290815700e3f4 Mon Sep 17 00:00:00 2001 From: Magnus Granberg <[email protected]> Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH 2/2] Remove TEXTREL tag in x86 +Subject: [PATCH 2/3] Remove TEXTREL tag in x86 Fix textrel QA warnings when building qtwebkit for x86:
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) #endif -- -2.4.2 +2.5.3
recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +3 -3
@@ -1,7 +1,7 @@ -From b345a3414a7d09b47586aac437d79e2bbfa52fb8 Mon Sep 17 00:00:00 2001 +From c9ed11eff6f200ea42ae64372186d560880591bc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries +Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries It was excluding musl with current checks, so lets make it such that it considers only glibc when using backtrace API
@@ -34,5 +34,5 @@ index 1b2091f..ba03a28 100644 #elif OS(WINDOWS) && !OS(WINCE) // The CaptureStackBackTrace function is available in XP, but it is not defined -- -2.1.4 +2.5.3
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -64,4 +64,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "3f0fbb46e2e4e3d0d9ac9f0731b3f8435a504b4b" +SRCREV = "0d592678bad23a77f35c109253a0263664e69812"
recipes-qt/qt5/qtwebsockets_git.bb +3 -2
@@ -4,10 +4,11 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "158ec0ca22f8f6713eb80f737eb8d0ef84f515ac" +SRCREV = "12e424f241b29ef26ad2a3a70740d8b320e9e85a"
recipes-qt/qt5/qtx11extras_git.bb +3 -2
@@ -4,7 +4,8 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
@@ -12,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f2da28b77cf3256d98e00ff7435938ebee44cb01" +SRCREV = "e4f2f0a146a83fa3160687ca06e11430ff02c5a8"
recipes-qt/qt5/qtxmlpatterns_git.bb +3 -2
@@ -5,13 +5,14 @@ require qt5-git.inc LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ - file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtbase" -SRCREV = "ae6504efc85adf754d60a02f81413e5949282d78" +SRCREV = "670b2073c0b1c40f5b67fc36c18ed15fe2cdfee2" BBCLASSEXTEND =+ "native nativesdk"
Signature · 1 line
2.5.3