qtbase.inc: mention that qtwebengine requires qtbase with accessibility enabled
PATCH 1/7 qtbase.inc: mention that qtwebengine requires qtbase with accessibility enabled
Signed-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/qtbase.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtbase.inc +1 -1
@@ -65,7 +65,7 @@ PACKAGECONFIG[examples] = "-make examples -compile-examples,-nomake examples" PACKAGECONFIG[tools] = "-make tools,-nomake tools" # only for completeness, configure will add libs even if you try to explicitly remove it PACKAGECONFIG[libs] = "-make libs,-nomake libs" -# accessibility is required to compile qtquickcontrols +# accessibility is required to compile qtquickcontrols and qtwebengine PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" # use either system freetype or bundled freetype, if you disable freetype completely
Signature · 1 line
2.3.1
PATCH 2/7 qtsystems: rename to 5.4.1
Signed-off-by Martin Jansa <[email protected]>
---
recipes-qt/qt5/{qtsystems_5.4.0+git.bb => qtsystems_5.4.1+git.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename recipes-qt/qt5/{qtsystems_5.4.0+git.bb => qtsystems_5.4.1+git.bb} (88%)recipes-qt/qt5/qtsystems_5.4.1+git.bb renamed from recipes-qt/qt5/qtsystems_5.4.0+git.bb +2 -2
@@ -2,8 +2,8 @@ require qt5-git.inc require ${PN}.inc # this wasn't released, the PV is set just to signify that this SRCREV was tested together -# with 5.4.0 version of other modules -PV = "5.4.0" +# with 5.4.1 version of other modules +PV = "5.4.1" DEFAULT_PREFERENCE = "1" QT_MODULE_BRANCH = "dev"
Signature · 1 line
2.3.1
PATCH 3/7 recipes: Refresh patches to match git recipes
In reply to Martin JansaSigned-off-by Martin Jansa <[email protected]>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 18 ++---
recipes-qt/qt5/qtbase-native.inc | 16 ++---
recipes-qt/qt5/qtbase.inc | 17 +++--
.../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 11 ++--
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 10 +--
.../0003-Add-external-hostbindir-option.patch | 14 ++--
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 30 ---------
...e-Fix-pkgconfig-and-libtool-replacements.patch} | 8 +--
...fs-Print-the-chosen-config-in-debug-mode.patch} | 8 +--
...integration-Undefine-CursorShape-from-X..patch} | 6 +-
...mp-path-length-from-256-to-512-character.patch} | 8 +--
...l-error-for-platforms-only-supporting-on.patch} | 6 +-
...0009-QOpenGLPaintDevice-sub-area-support.patch} | 22 +++----
...onfigExtras.cmake-find-gl-es-include-dir.patch} | 6 +-
recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | 10 +--
...-build-it-in-configure-but-allow-to-build.patch | 21 +++---
...xternal-hostbindir-option-for-native-sdk.patch} | 76 +++++++++++-----------
...ch => 0012-Set-paths-for-target-properly.patch} | 14 ++--
...tch => 0013-Fix-build-of-egl-integration.patch} | 39 +++++++----
...eserve-built-qmake-and-swap-with-native-.patch} | 8 +--
recipes-qt/qt5/qtbase_5.4.1.bb | 2 +-
.../0001-qmltestexample-fix-link.patch | 8 +--
...ats.pro-Make-the-dependencies-determinist.patch | 4 +-
...1-Initial-porting-effort-to-GStreamer-1.0.patch | 33 +++++-----
...w-to-build-only-lrelease-lupdate-lconvert.patch | 4 +-
...t-help-fix-linking-of-dependent-libraries.patch | 4 +-
.../0003-add-noqtwebkit-configuration.patch | 8 +--
...-qtwaylandscanner-tool-to-the-native-side.patch | 4 +-
...yland-include-server-buffer-only-when-bui.patch | 4 +-
...amples-enable-building-examples-by-defaul.patch | 4 +-
recipes-qt/qt5/qtwebkit.inc | 2 +-
.../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 19 +++---
....patch => 0002-Remove-TEXTREL-tag-in-x86.patch} | 51 +++++++++------
33 files changed, 249 insertions(+), 246 deletions(-)
delete mode 100644 recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
rename recipes-qt/qt5/qtbase/{0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch => 0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch} (96%)
rename recipes-qt/qt5/qtbase/{0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch => 0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch} (97%)
rename recipes-qt/qt5/qtbase/{0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (87%)
rename recipes-qt/qt5/qtbase/{0008-configure-bump-path-length-from-256-to-512-character.patch => 0007-configure-bump-path-length-from-256-to-512-character.patch} (84%)
rename recipes-qt/qt5/qtbase/{0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (94%)
rename recipes-qt/qt5/qtbase/{0010-QOpenGLPaintDevice-sub-area-support.patch => 0009-QOpenGLPaintDevice-sub-area-support.patch} (90%)
rename recipes-qt/qt5/qtbase/{0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch => 0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch} (90%)
rename recipes-qt/qt5/qtbase/{0014-Add-external-hostbindir-option-native.patch => 0012-Add-external-hostbindir-option-for-native-sdk.patch} (84%)
rename recipes-qt/qt5/qtbase/{0015-Set-paths-for-target-properly.patch => 0012-Set-paths-for-target-properly.patch} (87%)
rename recipes-qt/qt5/qtbase/{0014-fix-build-of-egl-integration.patch => 0013-Fix-build-of-egl-integration.patch} (81%)
rename recipes-qt/qt5/qtbase/{0012-configure-preserve-built-qmake-and-swap-with-native-.patch => 0013-configure-preserve-built-qmake-and-swap-with-native-.patch} (81%)
rename recipes-qt/qt5/qtwebkit/{0002-qtwebkit-fix-textrel-x86.patch => 0002-Remove-TEXTREL-tag-in-x86.patch} (73%)recipes-qt/qt5/nativesdk-qtbase.inc +9 -9
@@ -15,24 +15,24 @@ SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ - file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-QOpenGLPaintDevice-sub-area-support.patch \ + file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ + file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ + file://0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0014-Add-external-hostbindir-option-native.patch \ + file://0012-Add-external-hostbindir-option-for-native-sdk.patch \ " # specific for nativesdk-qtbase SRC_URI += " \ - file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ + file://0013-configure-preserve-built-qmake-and-swap-with-native-.patch \ " # CMake's toolchain configuration of nativesdk-qtbase
recipes-qt/qt5/qtbase-native.inc +8 -8
@@ -12,19 +12,19 @@ SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ - file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-QOpenGLPaintDevice-sub-area-support.patch \ + file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ + file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ + file://0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \ " # common for qtbase-native and nativesdk-qtbase SRC_URI += " \ file://0011-Always-build-uic.patch \ - file://0014-Add-external-hostbindir-option-native.patch \ + file://0012-Add-external-hostbindir-option-for-native-sdk.patch \ " QT_CONF_PATH = "${B}/qt.conf"
recipes-qt/qt5/qtbase.inc +8 -9
@@ -5,20 +5,19 @@ SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ - file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ - file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ - file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ - file://0008-configure-bump-path-length-from-256-to-512-character.patch \ - file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ - file://0010-QOpenGLPaintDevice-sub-area-support.patch \ - file://0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \ + file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ + file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \ + file://0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch \ + file://0007-configure-bump-path-length-from-256-to-512-character.patch \ + file://0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0009-QOpenGLPaintDevice-sub-area-support.patch \ + file://0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch \ " # specific for qtbase SRC_URI += "\ file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ - file://0015-Set-paths-for-target-properly.patch \ + file://0012-Set-paths-for-target-properly.patch \ " DEPENDS += "qtbase-native"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +6 -5
@@ -1,7 +1,7 @@ -From 81cd2947e9b1290498bdc2505a76fb053ff33be8 Mon Sep 17 00:00:00 2001 +From df887cc51d1cf5328e536708b461f475e9fb4577 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/11] Add linux-oe-g++ platform +Subject: [PATCH 01/13] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export
@@ -40,6 +40,7 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform Upstream-Status: Inappropriate [embedded specific] too OE specific, probably cannot be upstreamed +Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa <[email protected]> --- configure | 66 ++++++++++++++++-------
@@ -51,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 229fb4e..b7a6fe3 100755 +index 5ad29bb..0bcc175 100755 --- a/configure +++ b/configure @@ -316,6 +316,16 @@ getQMakeConf()
@@ -195,7 +196,7 @@ index 6b37a04..dcf6025 100644 write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..ca26b10 +index 0000000..2ad2810 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,40 @@
@@ -346,5 +347,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +5 -5
@@ -1,7 +1,7 @@ -From aae38b0ff226f287ad40f6eb423f1b974f548b73 Mon Sep 17 00:00:00 2001 +From 046ff855191e587ce9263f40bd46183c175b6387 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/13] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows
@@ -19,10 +19,10 @@ 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 7ca0aa7..d68c51b 100644 +index d592032..c418c5e 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -139,7 +139,10 @@ QLibrarySettings::QLibrarySettings() +@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() QSettings *QLibraryInfoPrivate::findConfiguration() {
@@ -35,5 +35,5 @@ index 7ca0aa7..d68c51b 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +7 -7
@@ -1,7 +1,7 @@ -From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001 +From 6c015d77a95910deec0a8c4a265587578531b476 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/13] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target
@@ -31,10 +31,10 @@ Signed-off-by: Jonathan Liu <[email protected]> src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 11 files changed, 50 insertions(+), 13 deletions(-) + 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/configure b/configure -index b7a6fe3..d715f6c 100755 +index 0bcc175..996ce50 100755 --- a/configure +++ b/configure @@ -769,6 +769,7 @@ QT_HOST_BINS=
@@ -95,10 +95,10 @@ index b7a6fe3..d715f6c 100755 "qt_hostspec=$shortspec", #endif diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index a9a622d..b6f1db0 100644 +index 7961f65..e11b23d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -191,7 +191,11 @@ defineTest(qtAddRpathLink) { +@@ -192,7 +192,11 @@ defineTest(qtAddRpathLink) { defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) {
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Upstream-Status: Pending - again a bit OE specific ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index d0a62c8..b3f3ff8 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3384,8 +3384,8 @@ void Configure::generateQConfigPri() - configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - configStream << "}" << endl; - configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; --- -2.1.3 -
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch renamed from recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +4 -4
@@ -1,7 +1,7 @@ -From 5778f98f990781710e72be8275dae32a7999330d Mon Sep 17 00:00:00 2001 +From 55e85e61eb93bce5b84f856ea5cc47af73e01a1d Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH 04/13] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <[email protected]> 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index af9d6ca..a4781d6 100644 +index eb65e73..4db40d0 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
@@ -110,5 +110,5 @@ index d213f9e..915c596 100644 } -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch renamed from recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +4 -4
@@ -1,7 +1,7 @@ -From 4a067c162d08596e3ec89dcfb3ecdf197b1bf22a Mon Sep 17 00:00:00 2001 +From 129d2a82da2ef6eede761967d981c5edcc0820d8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 21 Apr 2014 19:22:04 +0200 -Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" +Subject: [PATCH 05/13] Revert "eglfs: Print the chosen config in debug mode" With this change the build is failing with: | In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0,
@@ -68,7 +68,7 @@ index c1a491c..7a0fc87 100644 #ifdef Q_OS_UNIX diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp -index 7cc3300..ccbd974 100644 +index 7cc3300..ccbd974a 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -37,7 +37,6 @@
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974 100644 } -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch renamed from recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +3 -3
@@ -1,7 +1,7 @@ -From 8e152449beb18454347cfdb300c50d113fa48383 Mon Sep 17 00:00:00 2001 +From f2092e73beaffe163a5c7f66f73956477f0d97a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 -Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h +Subject: [PATCH 06/13] qeglplatformintegration: Undefine CursorShape from X.h Signed-off-by: Martin Jansa <[email protected]> ---
@@ -26,5 +26,5 @@ index 4d7adce..c9b6873 100644 class QEGLPlatformScreen; -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch renamed from recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch +4 -4
@@ -1,7 +1,7 @@ -From 3a31a14c9c244a22337f22d083a680f69a1b1ce8 Mon Sep 17 00:00:00 2001 +From 24e36583f44a17ce6d21e4392dd4f6a83ea9846a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 08/11] configure: bump path length from 256 to 512 characters +Subject: [PATCH 07/13] 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.
@@ -12,7 +12,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index d715f6c..bd43281 100755 +index 996ce50..a40d471 100755 --- a/configure +++ b/configure @@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
@@ -25,5 +25,5 @@ index d715f6c..bd43281 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch renamed from recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +3 -3
@@ -1,7 +1,7 @@ -From 621d867223a135a9babd452d4918200bc6d0463b Mon Sep 17 00:00:00 2001 +From 7886d849487f0c0bbfa54f9ef9708fdc9cc84c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 5 Feb 2014 18:35:08 +0100 -Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one +Subject: [PATCH 08/13] eglfs: fix egl error for platforms only supporting one window/surface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
@@ -68,5 +68,5 @@ index f5839e0..5ebde6d 100644 if (isRaster()) { -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch renamed from recipes-qt/qt5/qtbase/0010-QOpenGLPaintDevice-sub-area-support.patch +11 -11
@@ -1,7 +1,7 @@ -From 46074ffb4525e8217acd78c9cbe29f3d62f85c78 Mon Sep 17 00:00:00 2001 +From 47ee1da94f74c46fd692bcd55c2770f6c3be92f3 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 -Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support +Subject: [PATCH 09/13] QOpenGLPaintDevice sub-area support Allows creating QOpenGLPaintDevice targetting sub-area of binded framebuffer.
@@ -81,10 +81,10 @@ index 0b01129..211f2f3 100644 qreal dpmx; diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp -index c490726..1d775fd 100644 +index 8eeaa31..e17520e 100644 --- a/src/gui/opengl/qopenglpaintengine.cpp +++ b/src/gui/opengl/qopenglpaintengine.cpp -@@ -2002,7 +2002,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) +@@ -2080,7 +2080,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) d->vertexAttributeArraysEnabledState[i] = false;
@@ -95,16 +95,16 @@ index c490726..1d775fd 100644 d->width = sz.width(); d->height = sz.height(); d->mode = BrushDrawingMode; -@@ -2089,7 +2092,7 @@ void QOpenGL2PaintEngineEx::ensureActive() +@@ -2167,7 +2170,7 @@ void QOpenGL2PaintEngineEx::ensureActive() d->device->ensureActiveTarget(); d->transferMode(BrushDrawingMode); - d->funcs.glViewport(0, 0, d->width, d->height); + d->funcs.glViewport(d->x, d->y, d->width, d->height); d->needsSync = false; - d->lastMaskTextureUsed = 0; d->shaderManager->setDirty(); -@@ -2132,6 +2135,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() + d->syncGlState(); +@@ -2209,6 +2212,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() if (bounds == QRect(0, 0, width, height)) { funcs.glDisable(GL_SCISSOR_TEST); } else {
@@ -112,7 +112,7 @@ index c490726..1d775fd 100644 funcs.glEnable(GL_SCISSOR_TEST); setScissor(bounds); } -@@ -2140,12 +2144,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() +@@ -2217,12 +2221,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) {
@@ -128,10 +128,10 @@ index c490726..1d775fd 100644 funcs.glScissor(left, bottom, width, height); diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h -index 5ef0366..c5b517d 100644 +index 9722ea3..07e3163 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h -@@ -256,6 +256,7 @@ public: +@@ -264,6 +264,7 @@ public: QOpenGL2PaintEngineEx* q; QOpenGLEngineShaderManager* shaderManager; QOpenGLPaintDevice* device;
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 } else { if (m_vao.isCreated()) { -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch renamed from recipes-qt/qt5/qtbase/0013-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +3 -3
@@ -1,7 +1,7 @@ -From f5df17e2a02cf67f3436b7fe640c6bf54ba93ad6 Mon Sep 17 00:00:00 2001 +From d6158c2cb6ce64af531246636c3b2adb35afeb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Thu, 18 Dec 2014 13:41:09 +0100 -Subject: [PATCH] Make Qt5GuiConfigExtras.cmake find gl(es) include dir +Subject: [PATCH 10/13] Make Qt5GuiConfigExtras.cmake find gl(es) include dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 if (NOT _qt5gui_OPENGL_INCLUDE_DIR) message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") -- -1.8.3.1 +2.3.1
recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +5 -5
@@ -1,7 +1,7 @@ -From d48323aae1bee4b2398d61e1777815ffac15ccce Mon Sep 17 00:00:00 2001 +From fa0cf613bc9ef4de65de12791eedc337de85d911 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH 11/12] Always build uic +Subject: [PATCH 11/13] 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.
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 81f4fa5..74ec23d 100644 +index 83f7587..9dbcf70 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -162,7 +162,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent } } }
@@ -27,5 +27,5 @@ index 81f4fa5..74ec23d 100644 nacl: SUBDIRS -= src_network src_testlib -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +13 -8
@@ -1,7 +1,7 @@ -From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001 +From 7943ec2256163f6049d442ff00f579a5cbff5acc Mon Sep 17 00:00:00 2001 From: Michael Krelin <[email protected]> Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build +Subject: [PATCH 11/13] qmake: don't build it in configure, but allow to build it separately * it is already built in qtbase-native, so we don't need it in configure
@@ -18,13 +18,18 @@ Signed-off-by: Martin Jansa <[email protected]> qmake/qmake.pri | 3 ++- qmake/qmake.pro | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) +--- + configure | 2 +- + qmake/qmake.pri | 3 ++- + qmake/qmake.pro | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 43be722..39516d2 100755 +index a40d471..8d15f59 100755 --- a/configure +++ b/configure -@@ -3759,7 +3759,7 @@ setBootstrapVariable() - } +@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() + # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -33,7 +38,7 @@ index 43be722..39516d2 100755 mkdir -p "$outpath/qmake" || exit diff --git a/qmake/qmake.pri b/qmake/qmake.pri -index 57dcbb0..e2c5845 100644 +index 4de41d6..69982b7 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -82,7 +82,8 @@ bootstrap { #Qt code
@@ -47,7 +52,7 @@ index 57dcbb0..e2c5845 100644 HEADERS+= \ qbitarray.h \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 89d6ea5..7c605b9 100644 +index 89d6ea5..0ff4a96 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -8,6 +8,7 @@ CONFIG -= qt
@@ -59,5 +64,5 @@ index 89d6ea5..7c605b9 100644 VPATH += \ ../src/corelib/global \ -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch renamed from recipes-qt/qt5/qtbase/0014-Add-external-hostbindir-option-native.patch +39 -37
111 lines not on this page · raw message
recipes-qt/qt5/qtbase/0012-Set-paths-for-target-properly.patch renamed from recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch +7 -7
@@ -1,7 +1,7 @@ -From d84b7386902e024a0cfe5a6689930e5548a60480 Mon Sep 17 00:00:00 2001 +From 62ec5bc2946911b2cd2f577d58f07f566d84c88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Thu, 22 Jan 2015 16:09:35 +0100 -Subject: [PATCH] Set paths for target properly +Subject: [PATCH 12/13] Set paths for target properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
@@ -10,14 +10,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <[email protected]> --- - configure | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) + configure | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/configure b/configure -index 43be722..0e1a64a 100755 +index 8d15f59..bf2bac0 100755 --- a/configure +++ b/configure -@@ -3634,28 +3634,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { +@@ -3639,28 +3639,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { "qt_xmplpath=$QT_SYSROOT_EXAMPLES", "qt_tstspath=$QT_SYSROOT_TESTS", #else
@@ -68,5 +68,5 @@ index 43be722..0e1a64a 100755 }; static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; -- -1.8.3.1 +2.3.1
recipes-qt/qt5/qtbase/0013-Fix-build-of-egl-integration.patch renamed from recipes-qt/qt5/qtbase/0014-fix-build-of-egl-integration.patch +27 -12
@@ -1,13 +1,25 @@ -commit f8c8c79029867a087c9a753269d82b808c16f047 -Author: Stephan Binner <[email protected]> -Date: Mon Feb 2 13:10:50 2015 +0100 +From 2cece4539990f9e7b0239681bd2fc2808aeb8dbc Mon Sep 17 00:00:00 2001 +From: Stephan Binner <[email protected]> +Date: Mon, 2 Feb 2015 13:10:50 +0100 +Subject: [PATCH 13/13] Fix build of egl integration - Fix build of egl integration - - Add missing includes and reorder includes to avoid X defines breakage - - Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9 - Reviewed-by: Laszlo Agocs <[email protected]> +Add missing includes and reorder includes to avoid X defines breakage + +Upstream-Status: Backport from 5.4 branch https://codereview.qt-project.org/#/c/105116/ + +Change-Id: Iaf95ae2488df3d3301436262ed79f7091b4be0a9 +Reviewed-by: Laszlo Agocs <[email protected]> +Signed-off-by: Stephan Binner <[email protected]> +--- + .../eglconvenience/qeglplatformcontext_p.h | 1 + + .../eglconvenience/qeglplatformintegration_p.h | 2 +- + src/plugins/platforms/eglfs/qeglfscontext.cpp | 13 +++++++------ + src/plugins/platforms/eglfs/qeglfshooks_stub.cpp | 2 +- + src/plugins/platforms/eglfs/qeglfsintegration.cpp | 20 ++++++++++---------- + src/plugins/platforms/eglfs/qeglfsscreen.cpp | 4 +++- + src/plugins/platforms/eglfs/qeglfswindow.cpp | 6 ++++-- + .../platforms/minimalegl/qminimaleglwindow.cpp | 4 ++-- + 8 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index 7825c7b..0c10710 100644
@@ -22,7 +34,7 @@ index 7825c7b..0c10710 100644 #include <qpa/qplatformopenglcontext.h> #include <QtCore/QVariant> diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h -index 4d7adce..2b5d5f5 100644 +index c9b6873..a0aab03 100644 --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h @@ -45,9 +45,9 @@
@@ -35,7 +47,7 @@ index 4d7adce..2b5d5f5 100644 -#include <QtCore/QVariant> #include <EGL/egl.h> - QT_BEGIN_NAMESPACE + // Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ diff --git a/src/plugins/platforms/eglfs/qeglfscontext.cpp b/src/plugins/platforms/eglfs/qeglfscontext.cpp index 6216fa8..6470280 100644 --- a/src/plugins/platforms/eglfs/qeglfscontext.cpp
@@ -139,7 +151,7 @@ index cd68540..bc93fe2 100644 QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp -index f5839e0..39a3ef9 100644 +index 5ebde6d..2c05979 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp @@ -31,8 +31,7 @@
@@ -179,3 +191,6 @@ index 906a130..d4bee2c 100644 QT_BEGIN_NAMESPACE QMinimalEglWindow::QMinimalEglWindow(QWindow *w) +-- +2.3.1 +
recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch renamed from recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch +4 -4
@@ -1,7 +1,7 @@ -From 9089bf90632ffc983625816c5b0f2f2509ffc176 Mon Sep 17 00:00:00 2001 +From 137890aa64442866a861f0a9f028ee632f19cae4 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:22:34 -0500 -Subject: [PATCH 12/12] configure: preserve built qmake and swap with native +Subject: [PATCH 13/13] configure: preserve built qmake and swap with native one Let configure script build the real qmake, but right after it's built, swap
@@ -13,7 +13,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index bd43281..d331711 100755 +index a40d471..c007427 100755 --- a/configure +++ b/configure @@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -26,5 +26,5 @@ index bd43281..d331711 100755 echo "Running configuration tests..." -- -2.1.3 +2.3.1
recipes-qt/qt5/qtbase_5.4.1.bb +1 -1
@@ -3,7 +3,7 @@ require ${PN}.inc # This patch is in 5.4 branch but didn't make it into 5.4.1 release SRC_URI += "\ - file://0014-fix-build-of-egl-integration.patch \ + file://0013-Fix-build-of-egl-integration.patch \ " SRC_URI[md5sum] = "9507825e558c980fed602de1f16ec7ae"
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +4 -4
@@ -1,4 +1,4 @@ -From fd077fa40e7750f5836a07dde4f9c65864f87c3f Mon Sep 17 00:00:00 2001 +From ccfd4907a2683fb0840fa4fd6a9d979395f4331c 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
@@ -36,7 +36,7 @@ index b5893c5..1b00e6c 100644 macx: CONFIG -= app_bundle diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro -index a62eb75..73b6917 100644 +index fc2452c..919710f 100644 --- a/tests/auto/qml/qjsengine/qjsengine.pro +++ b/tests/auto/qml/qjsengine/qjsengine.pro @@ -1,7 +1,7 @@
@@ -47,7 +47,7 @@ index a62eb75..73b6917 100644 +QT += qml qml-private widgets testlib gui-private quick macx:CONFIG -= app_bundle SOURCES += tst_qjsengine.cpp - + RESOURCES += qjsengine.qrc diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro index c6d442e..3181dcd 100644 --- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644 load(qt_tool) -- -2.1.1 +2.3.1
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch +2 -2
@@ -1,4 +1,4 @@ -From 862ce82f7c0237b839539332c860e12c7d3c3e67 Mon Sep 17 00:00:00 2001 +From 706c5aec2b49c685abe5e1ad4d09674d55add789 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.1.1 +2.3.1
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch +16 -17
@@ -1,7 +1,7 @@ -From 4af76880d63e8d392eb8add8b8999e3f5031675a Mon Sep 17 00:00:00 2001 +From 6a570205a17663e6adce9e5613eb7694fe2874dc Mon Sep 17 00:00:00 2001 From: Yoann Lopes <[email protected]> Date: Thu, 31 Oct 2013 15:06:30 +0100 -Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0. +Subject: [PATCH] Initial porting effort to GStreamer 1.0. Imported from [email protected]:jhodapp/qtmultimedia.git
@@ -38,7 +38,7 @@ Conflicts: src/gsttools/qgstreamervideowindow.cpp | 79 +++++++- src/gsttools/qgstutils.cpp | 27 ++- src/gsttools/qgstvideobuffer.cpp | 18 +- - src/gsttools/qvideosurfacegstsink.cpp | 138 +++++++++++++- + src/gsttools/qvideosurfacegstsink.cpp | 136 +++++++++++++- src/multimedia/gsttools_headers/qgstappsrc_p.h | 3 + .../qgstreameraudioprobecontrol_p.h | 5 +- .../qgstreamervideoprobecontrol_p.h | 4 +
@@ -58,7 +58,7 @@ Conflicts: .../mediaplayer/qgstreamerplayerserviceplugin.cpp | 27 ++- .../mediaplayer/qgstreamerplayersession.cpp | 154 ++++++++++++++-- .../mediaplayer/qgstreamerplayersession.h | 9 + - 36 files changed, 872 insertions(+), 130 deletions(-) + 36 files changed, 871 insertions(+), 129 deletions(-) diff --git a/config.tests/gstreamer/gstreamer.pro b/config.tests/gstreamer/gstreamer.pro index 02a7e34..6b9843a 100644
@@ -1032,7 +1032,7 @@ index a373dcc..587b010 100644 if (caps) { diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp -index 556fc03..5ea2c59 100644 +index 1281d3f..fe3fba0 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -89,8 +89,13 @@ static void addTagToMap(const GstTagList *list,
@@ -1083,7 +1083,7 @@ index 556fc03..5ea2c59 100644 /*! Builds GstCaps for an audio format. -@@ -579,7 +602,7 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac +@@ -581,7 +604,7 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac void qt_gst_object_ref_sink(gpointer object) {
@@ -1134,7 +1134,7 @@ index 18702ec..93f22f5 100644 } diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp -index f3e2d88..a964e82 100644 +index f3e2d88..94aaee7 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -43,7 +43,11 @@
@@ -1317,11 +1317,10 @@ index f3e2d88..a964e82 100644 "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, INT_MAX, 1, "width" , GST_TYPE_INT_RANGE, 1, INT_MAX, "height" , GST_TYPE_INT_RANGE, 1, INT_MAX, -- "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, +#if GST_CHECK_VERSION(1,0,0) + "format" , G_TYPE_STRING, gst_video_format_to_string(qt_yuvColorLookup[index].vfmt), +#else -+ "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, + "format" , GST_TYPE_FOURCC, qt_yuvColorLookup[index].fourcc, +#endif NULL)); continue;
@@ -1689,10 +1688,10 @@ index f944a60..72d1cf1 100644 if (m_duration != duration) { m_duration = duration; diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp -index a4038c5..9d1fdfa 100644 +index 1ed663b..e0c6b50 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp -@@ -760,7 +760,11 @@ qint64 CameraBinSession::duration() const +@@ -796,7 +796,11 @@ qint64 CameraBinSession::duration() const if (fileSink) { GstFormat format = GST_FORMAT_TIME; gint64 duration = 0;
@@ -1704,7 +1703,7 @@ index a4038c5..9d1fdfa 100644 gst_object_unref(GST_OBJECT(fileSink)); if (ret) return duration / 1000000; -@@ -797,8 +801,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) +@@ -833,8 +837,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) if (m_camerabin) { GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER);
@@ -1718,7 +1717,7 @@ index a4038c5..9d1fdfa 100644 gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); QMapIterator<QByteArray, QVariant> it(data); -@@ -859,7 +868,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) +@@ -895,7 +904,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { if (m_captureMode == QCamera::CaptureStillImage &&
@@ -1730,7 +1729,7 @@ index a4038c5..9d1fdfa 100644 st = gst_message_get_structure(gm); if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { -@@ -869,7 +882,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) +@@ -905,7 +918,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) QImage img;
@@ -1742,7 +1741,7 @@ index a4038c5..9d1fdfa 100644 if (caps) { GstStructure *structure = gst_caps_get_structure(caps, 0); gint width = 0; -@@ -1142,7 +1159,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame +@@ -1178,7 +1195,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame gst_structure_remove_all_fields(structure); gst_structure_set_value(structure, "framerate", &rate); }
@@ -1754,7 +1753,7 @@ index a4038c5..9d1fdfa 100644 for (uint i=0; i<gst_caps_get_size(caps); i++) { -@@ -1262,7 +1283,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, +@@ -1298,7 +1319,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, gst_structure_set_value(structure, "width", &w); gst_structure_set_value(structure, "height", &h); }
@@ -2365,5 +2364,5 @@ index f2e760a..50bda3d 100644 QT_END_NAMESPACE -- -2.1.3 +2.3.1
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +2 -2
@@ -1,4 +1,4 @@ -From ff3f521648906d07ddc1e1aecaddadb95b0314f3 Mon Sep 17 00:00:00 2001 +From 80d7d1844e6e088bde4c83881ea38a52a7e608c2 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
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644 installed_cmake.depends = cmake -- -2.1.3 +2.3.1
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From 20dd8d70eb3db17173eb3965e757711cc694de2a Mon Sep 17 00:00:00 2001 +From 21163294f5f1ae633db63c5d27b458ba189dcc16 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.1.3 +2.3.1
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +4 -4
@@ -1,4 +1,4 @@ -From 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001 +From e3aba30a9cece54dd6a7edfcb39cbb1805b3dcac 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
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <[email protected]> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 5f96377..71acdfc 100644 +index 6e82b07..56df78c 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@
@@ -25,7 +25,7 @@ index 5f96377..71acdfc 100644 QT += webkitwidgets } else { DEFINES += QT_NO_WEBKIT -@@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ +@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \ openpageswidget.cpp \ openpagesmanager.cpp \ openpagesswitcher.cpp
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +2 -2
@@ -1,4 +1,4 @@ -From 99c49a3304c1d08d164e0df252ca85f426381bb7 Mon Sep 17 00:00:00 2001 +From 9a9bc002354966b757bed13582f0bb927c3e7cc8 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.1.3 +2.3.1
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +2 -2
@@ -1,4 +1,4 @@ -From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001 +From c4876f42d841db36197e5cb8a84c70df40a0f21e 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.1.3 +2.3.1
recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch +2 -2
@@ -1,4 +1,4 @@ -From 50ab1eaf41445459422ef1fd4070ee158ea55d1c Mon Sep 17 00:00:00 2001 +From 71c988d599f624aa78772f9d68aa637d420e69c2 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 -- -1.8.3.2 +2.3.1
recipes-qt/qt5/qtwebkit.inc +1 -1
@@ -10,7 +10,7 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt leveld SRC_URI += "\ file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ - file://0002-qtwebkit-fix-textrel-x86.patch \ + file://0002-Remove-TEXTREL-tag-in-x86.patch \ " PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel"
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +10 -9
@@ -1,7 +1,7 @@ -From fe714df9641286e3f005e0021e1c6462fb0b061e Mon Sep 17 00:00:00 2001 +From 97d4af4ea8708829d6df276ae741c2076cb472e8 Mon Sep 17 00:00:00 2001 From: Trevor Woerner <[email protected]> Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) +Subject: [PATCH 1/2] 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
@@ -9,21 +9,22 @@ adds a patch to not include the rpath.prf which causes this problem. Signed-off-by: Trevor Woerner <[email protected]> Signed-off-by: Martin Jansa <[email protected]> -Signed-off-by: Jonathan Liu <[email protected]> --- - Tools/qmake/mkspecs/features/unix/default_post.prf | 2 -- - 1 file changed, 2 deletions(-) + Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - + 1 file changed, 1 deletion(-) diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index 9c52406..7ece013 100644 +index fd66af6..ef754c3 100644 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -59,8 +59,6 @@ linux-*g++* { +@@ -61,7 +61,6 @@ linux-*g++* { } } -contains(TEMPLATE, app): CONFIG += rpath -- + 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. - !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory +-- +2.3.1 +
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch renamed from recipes-qt/qt5/qtwebkit/0002-qtwebkit-fix-textrel-x86.patch +31 -20
64 lines not on this page · raw message
Signature · 1 line
2.3.1
PATCH 4/7 qtwebengine: refresh patches
In reply to Martin Jansa* drop 0001-eLinux-build-ffmpegsumo-as-well.patch which is already included in 5.4.1
Signed-off-by Martin Jansa <[email protected]>
---
...e.gypi-include-atomicops_internals_x86_g.patch} | 8 +++---
.../0001-eLinux-build-ffmpegsumo-as-well.patch | 31 ----------------------
...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 8 +++---
...rf-Make-sure-we-only-use-the-file-name-to.patch | 8 +++---
...s.prf-allow-build-for-linux-oe-g-platform.patch | 12 ++++-----
...ure.prf-don-t-fail-when-libcap-test-fails.patch | 26 ++++++++++++++++++
.../0004-dont-fail-libcap-config-test.patch | 13 ---------
recipes-qt/qt5/qtwebengine_5.4.1.bb | 5 ++--
recipes-qt/qt5/qtwebengine_git.bb | 2 +-
9 files changed, 47 insertions(+), 66 deletions(-)
rename recipes-qt/qt5/qtwebengine/{0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch => 0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch} (81%)
delete mode 100644 recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch
create mode 100644 recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
delete mode 100644 recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patchrecipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch renamed from recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch +4 -4
@@ -1,8 +1,8 @@ -From 41b142ec46c61d075b5cd95a88b57f0db74cbf31 Mon Sep 17 00:00:00 2001 +From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Fri, 3 Oct 2014 03:52:11 +0200 -Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc when - building for x64 arch +Subject: [PATCH] <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 a5a990a..af30cfa 100644 ['include', 'atomicops_internals_x86_gcc.cc'], ], -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwebengine/0001-eLinux-build-ffmpegsumo-as-well.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 Mon Sep 17 00:00:00 2001 -From: Zeno Albisser <[email protected]> -Date: Fri, 30 Jan 2015 13:10:15 +0100 -Subject: [PATCH] eLinux: build ffmpegsumo as well. - -This will only contain free codecs. - -Change-Id: I021b2c121bf146abb24b7a90dd1c3580638b1058 -Reviewed-by: Andras Becsi <[email protected]> - -Upstream-Status: Backport [ 72ff0b7d9600db642e2d2e95c78c70454bbdb5e7 from https://gitorious.org/qt/qtwebengine.git ] ---- - src/core/config/embedded_linux.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri -index 4000625..773bf0b 100644 ---- a/src/core/config/embedded_linux.pri -+++ b/src/core/config/embedded_linux.pri -@@ -1,7 +1,7 @@ - GYP_ARGS += "-D qt_os=\"embedded_linux\" -I config/embedded_linux.gypi" - - GYP_CONFIG += \ -- build_ffmpegsumo=0 \ -+ build_ffmpegsumo=1 \ - configuration_policy=0 \ - desktop_linux=0 \ - disable_nacl=1 \ --- -1.9.1 -
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +4 -4
@@ -1,4 +1,4 @@ -From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001 +From 005fabe4148c78e8393c50ca6ebc9d0c2151c3cd 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
@@ -10,10 +10,10 @@ 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 acf15a8..08b2642 100644 +index 4c2547d..64c08ad 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) { +@@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) { defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
@@ -25,5 +25,5 @@ index acf15a8..08b2642 100644 } -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +4 -4
@@ -1,4 +1,4 @@ -From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001 +From 323f3d4fbd00b8655a1928c389d5f05ef4526044 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
@@ -11,10 +11,10 @@ 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 08b2642..0123336 100644 +index 64c08ad..b46478b 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) { +@@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 08b2642..0123336 100644 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +6 -6
@@ -1,4 +1,4 @@ -From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001 +From 762c943fbe1bee878275788f376b33abce46e25a 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
@@ -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 0123336..5cea82a 100644 +index b46478b..6205bf4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) { +@@ -10,7 +10,7 @@ defineTest(isPlatformSupported) { - linux-g++*:!isGCCVersionSupported():return(false) + 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) boot2qt: return(true) - warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".) + 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.1.3 +2.3.1
recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Fri, 27 Feb 2015 19:51:55 +0100 +Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails + +Signed-off-by: Martin Jansa <[email protected]> +--- + tools/qmake/mkspecs/features/configure.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf +index 6e74b55..b91fde8 100644 +--- a/tools/qmake/mkspecs/features/configure.prf ++++ b/tools/qmake/mkspecs/features/configure.prf +@@ -20,7 +20,7 @@ defineTest(runConfigure) { + qtCompileTest($$test) + } + # libcap-dev package doesn't ship .pc files on Ubuntu. +- linux:!config_libcap:skipBuild("libcap appears to be missing") ++ #linux:!config_libcap:skipBuild("libcap appears to be missing") + contains(QT_CONFIG, xcb) { + for(package, $$list("libdrm xcomposite xi xrandr")) { + !packagesExist($$package):skipBuild("Unmet dependency: $$package") +-- +2.3.1 +
recipes-qt/qt5/qtwebengine/0004-dont-fail-libcap-config-test.patch deleted +0 -13
@@ -1,13 +0,0 @@ -diff -u -r1.1 tools/qmake/mkspecs/features/configure.prf ---- a/tools/qmake/mkspecs/features/configure.prf 2015/02/04 10:24:55 1.1 -+++ b/tools/qmake/mkspecs/features/configure.prf 2015/02/04 10:26:52 -@@ -20,7 +20,7 @@ - qtCompileTest($$test) - } - # libcap-dev package doesn't ship .pc files on Ubuntu. -- linux:!config_libcap:skipBuild("libcap appears to be missing") -+ #linux:!config_libcap:skipBuild("libcap appears to be missing") - contains(QT_CONFIG, xcb) { - for(package, $$list("libdrm xcomposite xi xrandr")) { - !packagesExist($$package):skipBuild("Unmet dependency: $$package") -
recipes-qt/qt5/qtwebengine_5.4.1.bb +2 -3
@@ -8,7 +8,6 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ - file://0001-eLinux-build-ffmpegsumo-as-well.patch \ - file://0004-dont-fail-libcap-config-test.patch \ + file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ "
recipes-qt/qt5/qtwebengine_git.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ - file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ " SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8" SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39"
Signature · 1 line
2.3.1
PATCH 5/7 qtdeclarative, qtmultimedia, qtscript, qtsvl: Drop GPLv2
In reply to Martin Jansa* LICENSE.GPLv2 was removed in 5.4.1
Signed-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/qtdeclarative.inc | 3 --- recipes-qt/qt5/qtmultimedia.inc | 3 --- recipes-qt/qt5/qtscript.inc | 3 --- recipes-qt/qt5/qtsvg.inc | 3 --- 4 files changed, 12 deletions(-)
recipes-qt/qt5/qtdeclarative.inc +0 -3
@@ -16,6 +16,3 @@ do_configure_prepend() { } EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" - -LICENSE += "| GPL-2.0" -LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
recipes-qt/qt5/qtmultimedia.inc +0 -3
@@ -23,6 +23,3 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gst SRC_URI += "\ file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ " - -LICENSE += "| GPL-2.0" -LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
recipes-qt/qt5/qtscript.inc +0 -3
@@ -1,6 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -LICENSE += "| GPL-2.0" -LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
recipes-qt/qt5/qtsvg.inc +0 -3
@@ -1,6 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -LICENSE += "| GPL-2.0" -LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
Signature · 1 line
2.3.1
PATCH 6/7 recipes-git: update to latest revisions in 5.4 branch
In reply to Martin JansaSigned-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/nativesdk-qttools_git.bb | 7 +++- recipes-qt/qt5/qt5-git.inc | 2 +- .../qtbase-git/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 | 20 +++++----- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 4 +- ...lfs-Print-the-chosen-config-in-debug-mode.patch | 4 +- ...mintegration-Undefine-CursorShape-from-X..patch | 4 +- ...ump-path-length-from-256-to-512-character.patch | 8 ++-- ...gl-error-for-platforms-only-supporting-on.patch | 4 +- .../0009-QOpenGLPaintDevice-sub-area-support.patch | 4 +- ...ConfigExtras.cmake-find-gl-es-include-dir.patch | 4 +- .../qt5/qtbase-git/0011-Always-build-uic.patch | 8 ++-- ...-build-it-in-configure-but-allow-to-build.patch | 8 ++-- ...external-hostbindir-option-for-native-sdk.patch | 6 +-- .../0012-Set-paths-for-target-properly.patch | 8 ++-- ...reserve-built-qmake-and-swap-with-native-.patch | 8 ++-- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 4 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- .../0001-qmltestexample-fix-link.patch | 4 +- recipes-qt/qt5/qtdeclarative_5.4.1.bb | 1 - recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtenginio_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- ...1-Initial-porting-effort-to-GStreamer-1.0.patch | 46 +++++++++++----------- recipes-qt/qt5/qtmultimedia_5.4.1.bb | 1 - recipes-qt/qt5/qtmultimedia_git.bb | 2 +- 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 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 4 +- ...t-help-fix-linking-of-dependent-libraries.patch | 4 +- .../0003-add-noqtwebkit-configuration.patch | 8 ++-- recipes-qt/qt5/qttools-native_git.bb | 7 +++- recipes-qt/qt5/qttools_git.bb | 7 +++- recipes-qt/qt5/qttranslations_git.bb | 2 +- ...-qtwaylandscanner-tool-to-the-native-side.patch | 4 +- ...yland-include-server-buffer-only-when-bui.patch | 4 +- recipes-qt/qt5/qtwayland-native_git.bb | 2 +- recipes-qt/qt5/qtwayland_5.4.1.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 4 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...se.gypi-include-atomicops_internals_x86_g.patch | 27 +++++++++++++ ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 8 ++-- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 8 ++-- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 12 +++--- ...ure.prf-don-t-fail-when-libcap-test-fails.patch | 26 ++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 5 ++- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- 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.inc | 3 -- recipes-qt/qt5/qtxmlpatterns_5.4.1.bb | 1 - recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 62 files changed, 209 insertions(+), 146 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch create mode 100644 recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
recipes-qt/qt5/nativesdk-qtbase_git.bb +1 -1
@@ -38,7 +38,7 @@ SRC_URI += " \ file://OEQt5Toolchain.cmake \ " -SRCREV = "02c5657a7d6d30c6e874e29a0adcc38b58a45b7d" +SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
recipes-qt/qt5/nativesdk-qttools_git.bb +6 -1
@@ -4,4 +4,9 @@ require ${PN}.inc # prepend this again, because ${PN}.inc prepends ${PN} FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" -SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319" +SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" + +LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ + file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
recipes-qt/qt5/qt5-git.inc +1 -1
@@ -10,7 +10,7 @@ SRC_URI += " \ S = "${WORKDIR}/git" -PV = "5.4.0+git${SRCPV}" +PV = "5.4.1+git${SRCPV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +7 -7
@@ -1,4 +1,4 @@ -From cfab0821397f5c41e123590b388c6f9c6834b1be Mon Sep 17 00:00:00 2001 +From e04fdddaeb59006c2d599b8b261ce714341029ba Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/12] 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 043d9fc..12fe2f0 100755 +index 6ce6753..0a00d6d 100755 --- a/configure +++ b/configure @@ -316,6 +316,16 @@ getQMakeConf()
@@ -119,7 +119,7 @@ index 043d9fc..12fe2f0 100755 # Use CC/CXX to run config.tests mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" -@@ -3173,7 +3191,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3178,7 +3196,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no fi
@@ -128,7 +128,7 @@ index 043d9fc..12fe2f0 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3211,7 +3229,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +@@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then exit 1 fi fi
@@ -137,7 +137,7 @@ index 043d9fc..12fe2f0 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3682,6 +3700,14 @@ setBootstrapVariable() +@@ -3687,6 +3705,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" }
@@ -152,7 +152,7 @@ index 043d9fc..12fe2f0 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3720,14 +3746,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -347,5 +347,5 @@ index 0000000..dd12003 + +#endif // QPLATFORMDEFS_H -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +3 -3
@@ -1,4 +1,4 @@ -From 060ea3b14cdf9c9224867d114344a4034edfd30f Mon Sep 17 00:00:00 2001 +From 182e7a96a99e9bcabcbd8858c377035a47e4e3e8 Mon Sep 17 00:00:00 2001 From: Holger Freyther <[email protected]> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 02/12] 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 d592032..c418c5e 100644 +index d66007b..91ca643 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
@@ -35,5 +35,5 @@ index d592032..c418c5e 100644 if(!QFile::exists(qtconfig)) qtconfig = qt_libraryInfoFile(); -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +10 -10
@@ -1,4 +1,4 @@ -From 4efa6ef7025ebd03379d76a419c118189e8e9d4e Mon Sep 17 00:00:00 2001 +From 457efc32bb79060a0a58a82ff8a35d67655ef6d6 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 03/12] Add -external-hostbindir option
@@ -34,10 +34,10 @@ Signed-off-by: Jonathan Liu <[email protected]> 7 files changed, 38 insertions(+), 12 deletions(-) diff --git a/configure b/configure -index 12fe2f0..7ac81d8 100755 +index 0a00d6d..ad5f4cd 100755 --- a/configure +++ b/configure -@@ -769,6 +769,7 @@ QT_HOST_BINS= +@@ -770,6 +770,7 @@ QT_HOST_BINS= QT_HOST_LIBS= QT_HOST_DATA= QT_EXT_PREFIX=
@@ -45,7 +45,7 @@ index 12fe2f0..7ac81d8 100755 #flags for SQL drivers QT_CFLAGS_PSQL= -@@ -888,6 +889,7 @@ while [ "$#" -gt 0 ]; do +@@ -889,6 +890,7 @@ while [ "$#" -gt 0 ]; do -testsdir| \ -hostdatadir| \ -hostbindir| \
@@ -53,7 +53,7 @@ index 12fe2f0..7ac81d8 100755 -hostlibdir| \ -extprefix| \ -sysroot| \ -@@ -1102,6 +1104,9 @@ while [ "$#" -gt 0 ]; do +@@ -1107,6 +1109,9 @@ while [ "$#" -gt 0 ]; do extprefix) QT_EXT_PREFIX="$VAL" ;;
@@ -63,7 +63,7 @@ index 12fe2f0..7ac81d8 100755 pkg-config) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PKGCONFIG="$VAL" -@@ -2265,6 +2270,10 @@ Installation options: +@@ -2270,6 +2275,10 @@ Installation options: -hostdatadir <dir> . Data used by qmake will be installed to <dir> (default HOSTPREFIX)
@@ -74,7 +74,7 @@ index 12fe2f0..7ac81d8 100755 Configure options: The defaults (*) are usually acceptable. A plus (+) denotes a default value -@@ -2944,6 +2953,11 @@ fi +@@ -2949,6 +2958,11 @@ fi # command line and environment validation #-------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ index 12fe2f0..7ac81d8 100755 # update QT_CONFIG to show our current predefined configuration CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h case "$CFG_QCONFIG" in -@@ -3644,6 +3658,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { +@@ -3649,6 +3663,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { "qt_hbinpath=$QT_HOST_BINS", "qt_hlibpath=$QT_HOST_LIBS", "qt_hdatpath=$QT_HOST_DATA",
@@ -163,7 +163,7 @@ index 6d0de44..ddf7478 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 4387bed..6e1aa7a 100644 +index 7213a84..a977417 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -229,5 +229,5 @@ index 99d87e2..5621dc0 100644 _qt5_Widgets_check_file_exists(${imported_location}) -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +2 -2
@@ -1,4 +1,4 @@ -From efd941d9d21a7f9a41dcabf7ea88481c3563ae93 Mon Sep 17 00:00:00 2001 +From 8c5554c1ee9a18548c166f6c3a7b487b9d3cdc3e Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 27 Apr 2013 23:15:37 +0200 Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements
@@ -110,5 +110,5 @@ index d213f9e..915c596 100644 } -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +2 -2
@@ -1,4 +1,4 @@ -From 4d32129ba11c6b7d4cfd4d037e3e3b73fd32b6b5 Mon Sep 17 00:00:00 2001 +From 825043f0a657cd4b8c3af0e00c79684388460d5c Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 21 Apr 2014 19:22:04 +0200 Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode"
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974a 100644 } -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +2 -2
@@ -1,4 +1,4 @@ -From 29c6088243796faf0b4115a93239d4ada9182757 Mon Sep 17 00:00:00 2001 +From b4d4c91bb504c9e90b69a2d78453bf3523ec6822 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Wed, 19 Mar 2014 18:32:28 +0100 Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644 class QEGLPlatformScreen; -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0007-configure-bump-path-length-from-256-to-512-character.patch +4 -4
@@ -1,4 +1,4 @@ -From 9eadba2398bfba10209f25b1c2e0ceb04e04957c Mon Sep 17 00:00:00 2001 +From e4235e3a0ebe4494ad1f4f550ddb070100e530e1 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:27:30 -0500 Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index 7ac81d8..8b42b8e 100755 +index ad5f4cd..c19ff6a 100755 --- a/configure +++ b/configure -@@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3627,7 +3627,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; /* Installation Info */
@@ -25,5 +25,5 @@ index 7ac81d8..8b42b8e 100755 "qt_prfxpath=$QT_SYSROOT_PREFIX", "qt_docspath=$QT_SYSROOT_DOCS", -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +2 -2
@@ -1,4 +1,4 @@ -From b6776c9f0da5988013d5195592b84e313b79daab Mon Sep 17 00:00:00 2001 +From 715b5d739b36588cd2e34962b33a59da1f5427fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Wed, 5 Feb 2014 18:35:08 +0100 Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one
@@ -68,5 +68,5 @@ index 39a3ef9..2c05979 100644 if (isRaster()) { -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0009-QOpenGLPaintDevice-sub-area-support.patch +2 -2
@@ -1,4 +1,4 @@ -From 010322a4ca16bcf1ea357689be4a94145733325d Mon Sep 17 00:00:00 2001 +From ab8aa4e79e156ac6df8cd36e287faf838bc32344 Mon Sep 17 00:00:00 2001 From: Jani Hautakangas <[email protected]> Date: Thu, 16 May 2013 09:52:07 +0300 Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support
@@ -153,5 +153,5 @@ index cd268cd..997bc35 100644 } else { if (m_vao.isCreated()) { -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +2 -2
@@ -1,4 +1,4 @@ -From e163574a35ad782a3d43ee8d5e3f212870962e10 Mon Sep 17 00:00:00 2001 +From 276b5046788007bcbc5607046becdd44151960c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Thu, 18 Dec 2014 13:41:09 +0100 Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir
@@ -38,5 +38,5 @@ index 9a846d4..07869ef 100644 if (NOT _qt5gui_OPENGL_INCLUDE_DIR) message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch +4 -4
@@ -1,4 +1,4 @@ -From 17929906fd0c057b35ad48b3a22770f8c52c1108 Mon Sep 17 00:00:00 2001 +From c87f9a5ec9a08c415ede4d5118deeb4177778338 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH 11/13] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 81f4fa5..74ec23d 100644 +index 83f7587..9dbcf70 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -162,7 +162,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent +@@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent } } }
@@ -27,5 +27,5 @@ index 81f4fa5..74ec23d 100644 nacl: SUBDIRS -= src_network src_testlib -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +4 -4
@@ -1,4 +1,4 @@ -From e199e105df6ded6ea9404b4f7f6f7f8381a51e85 Mon Sep 17 00:00:00 2001 +From f298d49fd1b88ae9bf8f35339a52cd333f42434b Mon Sep 17 00:00:00 2001 From: Michael Krelin <[email protected]> Date: Mon, 29 Oct 2012 20:07:49 -0700 Subject: [PATCH 11/12] qmake: don't build it in configure, but allow to build
@@ -25,10 +25,10 @@ Signed-off-by: Martin Jansa <[email protected]> 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 8b42b8e..aa21ff6 100755 +index c19ff6a..7a34b11 100755 --- a/configure +++ b/configure -@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() +@@ -3729,7 +3729,7 @@ setBootstrapEvalVariable() # build qmake
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644 VPATH += \ ../src/corelib/global \ -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch +3 -3
@@ -1,4 +1,4 @@ -From dee6fc781f5ac77155817b82f9d66787690a3bb3 Mon Sep 17 00:00:00 2001 +From e598364920b2ff4a90aaaaeb0c58162d1cb64221 Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk)
@@ -45,7 +45,7 @@ index 051e056..50da6ed 100644 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, }; diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c418c5e..c8c4188 100644 +index 91ca643..7a567fa 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild()
@@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644 << " \"qt_hostspec=" << hostSpec << "\"," << endl << "#endif" << endl -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0012-Set-paths-for-target-properly.patch +4 -4
@@ -1,4 +1,4 @@ -From f14e186762bb31f2d9c1e54fd62a0fa4d6cb3550 Mon Sep 17 00:00:00 2001 +From dbfa83051ddb8db0b4a59b226d4e4a41101ae26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Thu, 22 Jan 2015 16:09:35 +0100 Subject: [PATCH 12/12] Set paths for target properly
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller <[email protected]> 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/configure b/configure -index aa21ff6..bc965f6 100755 +index 7a34b11..7bb4476 100755 --- a/configure +++ b/configure -@@ -3639,28 +3639,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { +@@ -3644,28 +3644,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { "qt_xmplpath=$QT_SYSROOT_EXAMPLES", "qt_tstspath=$QT_SYSROOT_TESTS", #else
@@ -68,5 +68,5 @@ index aa21ff6..bc965f6 100755 }; static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-git/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +4 -4
@@ -1,4 +1,4 @@ -From 2795008ce11d680385610b80a84b4ee03db78cf0 Mon Sep 17 00:00:00 2001 +From 4ccd1823b88c039415b68a1dc2040859178cb56f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <[email protected]> Date: Mon, 11 Nov 2013 20:22:34 -0500 Subject: [PATCH 13/13] configure: preserve built qmake and swap with native
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure b/configure -index 8b42b8e..486bb2d 100755 +index c19ff6a..2d920e3 100755 --- a/configure +++ b/configure -@@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3879,6 +3879,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; (cd "$outpath/qmake"; "$MAKE") || exit 2 fi # Build qmake
@@ -26,5 +26,5 @@ index 8b42b8e..486bb2d 100755 echo "Running configuration tests..." -- -2.3.0 +2.3.1
recipes-qt/qt5/qtbase-native_git.bb +1 -1
@@ -31,7 +31,7 @@ do_install_append() { ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt } -SRCREV = "02c5657a7d6d30c6e874e29a0adcc38b58a45b7d" +SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
recipes-qt/qt5/qtbase_git.bb +2 -2
@@ -6,7 +6,7 @@ SRC_URI = "\ " # common for qtbase-native, qtbase-nativesdk and qtbase -SRC_URI += "\ +SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \
@@ -25,7 +25,7 @@ SRC_URI += "\ file://0012-Set-paths-for-target-properly.patch \ " -SRCREV = "02c5657a7d6d30c6e874e29a0adcc38b58a45b7d" +SRCREV = "a782369071db1d89448c0b94248d31fa877bcf8c" LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${BPN}.inc -SRCREV = "944dbb9b558719b3ff9e2d129a328142c0ae6228" +SRCREV = "dbf0bd93096f8ef54ebcf550ff104237742778dd"
recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch +2 -2
@@ -1,4 +1,4 @@ -From a5a0646f185a8062f6d257afba37f589a223b058 Mon Sep 17 00:00:00 2001 +From f1285bfd6f12cc4dc7727408a38edea13d3d0f46 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.1.3 +2.3.1
recipes-qt/qt5/qtdeclarative_5.4.1.bb +0 -1
@@ -9,4 +9,3 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" -
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c4fcbe9e342f5fa7b86b7facc662575a3f21689b" +SRCREV = "d43a963e49956ba772644e9f3448dc3672147f77"
recipes-qt/qt5/qtenginio_git.bb +1 -1
@@ -2,4 +2,4 @@ require qt5-git.inc require ${PN}.inc QT_MODULE_BRANCH = "1.1" -SRCREV = "f8ad37de2d7170d1548252608f8c04aac6ec1035" +SRCREV = "5581890d3c5919c3bd4b6aafdba650c14a97c312"
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "1f7e818a8c6ad81299bd82738b191e7d3ba01faf" +SRCREV = "6eef4b5fa1836c9cb7ebc5dcb269a8d3114eb6c3"
recipes-qt/qt5/qtimageformats_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "9141782adabcfd374285c3a52b7c386b9b90aa9a" +SRCREV = "2cf398f541d68f60e0205820524b79b37045bf0f"
recipes-qt/qt5/qtlocation_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "3c6693ee7f431320b2500c9c4440bb649ed50c89" +SRCREV = "e746e794dc27933467f6aed0c813e0cc9d0dae77"
recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch +23 -23
159 lines not on this page · raw message
recipes-qt/qt5/qtmultimedia_5.4.1.bb +0 -1
@@ -9,4 +9,3 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" -
recipes-qt/qt5/qtmultimedia_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "f420ac286a303bc235b8c1047f8c845314df1f8a" +SRCREV = "0e161675e6014faeeaa490a9c73a62c1577c674e"
recipes-qt/qt5/qtquick1_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "1f92491bd95abc642dcd882846884a5271c8ba16" +SRCREV = "41119e843f099ce7d80f966cc754324bfe0f063f"
recipes-qt/qt5/qtquickcontrols_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "11df73e4ac2136b72e5fca06bdc4b624a525388a" +SRCREV = "e10dcd4c98631d1d433073b43101b8c36be05520"
recipes-qt/qt5/qtscript_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "c6170fa5ee26cf9d0f2140d998fba2420ad1ed79" +SRCREV = "e12a92d71f2910c961a6ea7d6b28f7c9f55b4e96"
recipes-qt/qt5/qtsensors_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "817a964c710e4bc08b56f45d942944a038d6ab9c" +SRCREV = "a6a01b612fdb162378c4c184351e7cb8e5a559a0"
recipes-qt/qt5/qtserialport_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "cd9c48833cf4fbf73df68dcdb83f261c03950f91" +SRCREV = "b84fe7eb3d6d977a347bfbb82da724409b2eda69"
recipes-qt/qt5/qtsvg_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "5decb627d19ddb2b2aea4d7c317b9abfb86b5b8f" +SRCREV = "1fb79c9f2b50294b989cf2bdd8bfaaf0a458e2a8"
recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +2 -2
@@ -1,4 +1,4 @@ -From ff3f521648906d07ddc1e1aecaddadb95b0314f3 Mon Sep 17 00:00:00 2001 +From 4d4794880eecd27b006b4d00f44c611162d24538 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
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644 installed_cmake.depends = cmake -- -2.1.3 +2.3.1
recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch +2 -2
@@ -1,4 +1,4 @@ -From 20dd8d70eb3db17173eb3965e757711cc694de2a Mon Sep 17 00:00:00 2001 +From d6fd9b34cd507b054e20c61aaf8bee4bf800abb1 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.1.3 +2.3.1
recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch +4 -4
@@ -1,4 +1,4 @@ -From 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001 +From 9868ff8a11f36712f9bc2fe45ad129214994947a 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
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <[email protected]> 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 5f96377..71acdfc 100644 +index 6e82b07..56df78c 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@
@@ -25,7 +25,7 @@ index 5f96377..71acdfc 100644 QT += webkitwidgets } else { DEFINES += QT_NO_WEBKIT -@@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ +@@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \ openpageswidget.cpp \ openpagesmanager.cpp \ openpagesswitcher.cpp
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.1.3 +2.3.1
recipes-qt/qt5/qttools-native_git.bb +6 -1
@@ -1,4 +1,9 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319" +SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" + +LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ + file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
recipes-qt/qt5/qttools_git.bb +6 -1
@@ -1,4 +1,9 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "33eb6cdf9313f0ad969b4af8fc7160859c2a6319" +SRCREV = "638c278b76c56a51f83ef8c5cc9c03f18a887f74" + +LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \ + file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
recipes-qt/qt5/qttranslations_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "b9481cffeb41ceb9363b7be850bd9cd172b313be" +SRCREV = "35a64da9fd6fa38e92373798ed17f6cab73586ef"
recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +2 -2
@@ -1,4 +1,4 @@ -From 99c49a3304c1d08d164e0df252ca85f426381bb7 Mon Sep 17 00:00:00 2001 +From ecaf131c0307f198f8efbf06410976ded97aab80 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.1.3 +2.3.1
recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch +2 -2
@@ -1,4 +1,4 @@ -From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001 +From 256ceb71a2f56060a2716075b8258ad68d992b73 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.1.3 +2.3.1
recipes-qt/qt5/qtwayland-native_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "26ec3626f1088c272e3232f0341781bb38f518f3" +SRCREV = "1e32e71403a6a9cb117343464fbc34564598e831"
recipes-qt/qt5/qtwayland_5.4.1.bb +1 -1
@@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "653b5e600b1cbf3275d0858415570d2a2611823a4651ee911e684dcae8 SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ " -QT_VERSION ?= "5.4.1" +QT_VERSION ?= "${PV}" do_install_append() { # do install files created by qtwaylandscanner
recipes-qt/qt5/qtwayland_git.bb +2 -2
@@ -1,13 +1,13 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "26ec3626f1088c272e3232f0341781bb38f518f3" +SRCREV = "1e32e71403a6a9cb117343464fbc34564598e831" SRC_URI += " \ file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ " -QT_VERSION ?= "5.4.0" +QT_VERSION ?= "5.4.2" do_install_append() { # do install files created by qtwaylandscanner
recipes-qt/qt5/qtwebchannel_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "86d77a900852691267f556fbde98406a12ee4310" +SRCREV = "358e5acba3154a8ab4b53b22797c2c1eae4707dc"
recipes-qt/qt5/qtwebengine-git/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch new file +27 -0
@@ -0,0 +1,27 @@ +From 21d008c31a262ddcaeb3a8457de49061361ed882 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 + +Signed-off-by: Martin Jansa <[email protected]> +--- + chromium/base/base.gypi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi +index a5a990a..af30cfa 100644 +--- a/src/3rdparty/chromium/base/base.gypi ++++ b/src/3rdparty/chromium/base/base.gypi +@@ -745,7 +745,7 @@ + ['include', '^nix/'], + ], + }], +- ['use_qt==1 and target_arch=="ia32"', { ++ ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', { + 'sources/': [ + ['include', 'atomicops_internals_x86_gcc.cc'], + ], +-- +2.3.1 +
recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +4 -4
@@ -1,4 +1,4 @@ -From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001 +From 6e9a0fa4c1e3681deed659c2749223025637b38b 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
@@ -10,10 +10,10 @@ 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 acf15a8..08b2642 100644 +index 4c2547d..64c08ad 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) { +@@ -87,8 +87,8 @@ defineReplace(findIncludedMocFiles) { defineReplace(mocOutput) { out = $$1 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
@@ -25,5 +25,5 @@ index acf15a8..08b2642 100644 } -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +4 -4
@@ -1,4 +1,4 @@ -From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001 +From 418d78e063a47c4a3085ad7761fa1b842775637b 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
@@ -11,10 +11,10 @@ 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 08b2642..0123336 100644 +index 64c08ad..b46478b 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) { +@@ -85,7 +85,8 @@ defineReplace(findIncludedMocFiles) { } defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 08b2642..0123336 100644 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -- -2.1.3 +2.3.1
recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +6 -6
@@ -1,4 +1,4 @@ -From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001 +From 6c8d9e121920519a831ca09f747ed77dfc2bd135 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
@@ -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 0123336..5cea82a 100644 +index b46478b..6205bf4 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf -@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) { +@@ -10,7 +10,7 @@ defineTest(isPlatformSupported) { - linux-g++*:!isGCCVersionSupported():return(false) + 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) boot2qt: return(true) - warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".) + 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.1.3 +2.3.1
recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 7d20d5e4584abce2353557c90e79ee0b3cdc330e Mon Sep 17 00:00:00 2001 +From: Martin Jansa <[email protected]> +Date: Fri, 27 Feb 2015 19:51:55 +0100 +Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails + +Signed-off-by: Martin Jansa <[email protected]> +--- + tools/qmake/mkspecs/features/configure.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf +index 6e74b55..b91fde8 100644 +--- a/tools/qmake/mkspecs/features/configure.prf ++++ b/tools/qmake/mkspecs/features/configure.prf +@@ -20,7 +20,7 @@ defineTest(runConfigure) { + qtCompileTest($$test) + } + # libcap-dev package doesn't ship .pc files on Ubuntu. +- linux:!config_libcap:skipBuild("libcap appears to be missing") ++ #linux:!config_libcap:skipBuild("libcap appears to be missing") + contains(QT_CONFIG, xcb) { + for(package, $$list("libdrm xcomposite xi xrandr")) { + !packagesExist($$package):skipBuild("Unmet dependency: $$package") +-- +2.3.1 +
recipes-qt/qt5/qtwebengine_git.bb +3 -2
@@ -9,10 +9,11 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ + file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ " -SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8" -SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39" +SRCREV_qtwebengine = "4eceed9ac0b646238e76d77569a619d4dc515ba5" +SRCREV_chromium = "f9c03801de86b5e9da2b915a9e490c2f2254fecf" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine"
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "70bd4d5253f134bf48a30544030bb832f1eba8b3" +SRCREV = "69a9c9193abe008a9a52640b19a409e4a86c4899"
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "88c4538698fbfd7bc7d4e546abb17f9014ed61bd" +SRCREV = "67aba37ab361fc117366e283365920013b8d8464"
recipes-qt/qt5/qtwebsockets_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "df6cc41fbdbed5d61bb43e491c2f2eea32cdc596" +SRCREV = "fc2b42c874fb41487b86700a04e932e2afaded94"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "a21bbb45019e1bbc7b583811ff2e84757082a01a" +SRCREV = "bcc86311359e138ecc3a8fc1ce6eee1cda2ec0f5"
recipes-qt/qt5/qtxmlpatterns.inc +0 -3
@@ -1,6 +1,3 @@ require qt5.inc DEPENDS += "qtbase" - -LICENSE += "| GPL-2.0" -LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
recipes-qt/qt5/qtxmlpatterns_5.4.1.bb +0 -1
@@ -9,4 +9,3 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" -
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1
@@ -1,4 +1,4 @@ require qt5-git.inc require ${PN}.inc -SRCREV = "2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044" +SRCREV = "db784fb1c01ca2a0e7ada2c407cd1aab3aa98fee"
Signature · 1 line
2.3.1
PATCH 7/7 qtwebengine: fix executing config tests instead of ignoring libcap test failure
In reply to Martin JansaSigned-off-by Martin Jansa <[email protected]>
--- ...ure.prf-don-t-fail-when-libcap-test-fails.patch | 26 ---------------------- recipes-qt/qt5/qtwebengine.inc | 11 ++++----- ...ure.prf-don-t-fail-when-libcap-test-fails.patch | 26 ---------------------- recipes-qt/qt5/qtwebengine_5.4.1.bb | 1 - recipes-qt/qt5/qtwebengine_git.bb | 1 - 5 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch
recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 7d20d5e4584abce2353557c90e79ee0b3cdc330e Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Fri, 27 Feb 2015 19:51:55 +0100 -Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails - -Signed-off-by: Martin Jansa <[email protected]> ---- - tools/qmake/mkspecs/features/configure.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf -index 6e74b55..b91fde8 100644 ---- a/tools/qmake/mkspecs/features/configure.prf -+++ b/tools/qmake/mkspecs/features/configure.prf -@@ -20,7 +20,7 @@ defineTest(runConfigure) { - qtCompileTest($$test) - } - # libcap-dev package doesn't ship .pc files on Ubuntu. -- linux:!config_libcap:skipBuild("libcap appears to be missing") -+ #linux:!config_libcap:skipBuild("libcap appears to be missing") - contains(QT_CONFIG, xcb) { - for(package, $$list("libdrm xcomposite xi xrandr")) { - !packagesExist($$package):skipBuild("Unmet dependency: $$package") --- -2.3.1 -
recipes-qt/qt5/qtwebengine.inc +6 -5
@@ -35,11 +35,12 @@ export NINJA_PATH="${STAGING_BINDIR_NATIVE}/ninja" do_configure() { # replace LD with CXX, to workaround a possible gyp inheritssue? - LD="${CXX}" export LD - CC="${CC}" export CC - CXX="${CXX}" export CXX - CC_host="gcc" export CC_host - CXX_host="g++" export CXX_host + export LD="${CXX}" + export CC="${CC}" + export CXX="${CXX}" + export CC_host="gcc" + export CXX_host="g++" + export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here
recipes-qt/qt5/qtwebengine/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Fri, 27 Feb 2015 19:51:55 +0100 -Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails - -Signed-off-by: Martin Jansa <[email protected]> ---- - tools/qmake/mkspecs/features/configure.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf -index 6e74b55..b91fde8 100644 ---- a/tools/qmake/mkspecs/features/configure.prf -+++ b/tools/qmake/mkspecs/features/configure.prf -@@ -20,7 +20,7 @@ defineTest(runConfigure) { - qtCompileTest($$test) - } - # libcap-dev package doesn't ship .pc files on Ubuntu. -- linux:!config_libcap:skipBuild("libcap appears to be missing") -+ #linux:!config_libcap:skipBuild("libcap appears to be missing") - contains(QT_CONFIG, xcb) { - for(package, $$list("libdrm xcomposite xi xrandr")) { - !packagesExist($$package):skipBuild("Unmet dependency: $$package") --- -2.3.1 -
recipes-qt/qt5/qtwebengine_5.4.1.bb +0 -1
@@ -8,6 +8,5 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ - file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ "
recipes-qt/qt5/qtwebengine_git.bb +0 -1
@@ -9,7 +9,6 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ - file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ " SRCREV_qtwebengine = "4eceed9ac0b646238e76d77569a619d4dc515ba5"
Signature · 1 line
2.3.1