t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-17 04:31:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt: refresh remaining patches and add links to meta-qt5 repos

Browse Source 
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
  files are maintained, include branch and tag name so that it's more
  clear from where these changes are exported (with:
  git format-patch --no-numbered --no-signature)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2018-01-15 18:34:53 +00:00
parent 7ac3d20bd2
commit e8ec89bf17
46 changed files with 100 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-qt/qt5/nativesdk-qtbase_git.bb
View File

@@ -22,6 +22,8 @@ require qt5-git.inc
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-shared
# 5.6.meta-qt5-shared.9
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
@@ -35,6 +37,8 @@ SRC_URI += "\
"
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-native
# 5.6.meta-qt5-native.9
SRC_URI += " \
file://0010-Always-build-uic.patch \
file://0011-Add-external-hostbindir-option-for-native-sdk.patch \

2
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
View File

@@ -1,4 +1,4 @@
From 339e527e5ca0e1b7839d28e9f140630af634b569 Mon Sep 17 00:00:00 2001
From e46d749532d1ca5f74d5c4d8d690972675e5c638 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Wed, 10 Feb 2016 09:02:09 +0200
Subject: [PATCH] Allow a tools-only build

2
recipes-qt/qt5/qt3d_git.bb
View File

@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
DEPENDS_class-target += "qtdeclarative qt3d-native"
# Patches from https://github.com/meta-qt5/qt3d/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += " \
file://0001-Allow-a-tools-only-build.patch \
"

4
recipes-qt/qt5/qtbase-native_git.bb
View File

@@ -15,6 +15,8 @@ require qt5-native.inc
require qt5-git.inc
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-shared
# 5.6.meta-qt5-shared.9
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
@@ -28,6 +30,8 @@ SRC_URI += "\
"
# common for qtbase-native and nativesdk-qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-native
# 5.6.meta-qt5-native.9
SRC_URI += " \
file://0010-Always-build-uic.patch \
file://0011-Add-external-hostbindir-option-for-native-sdk.patch \

4
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
View File

@@ -1,4 +1,4 @@
From 46260d1a93e10a6a6f47f38d0b4355b4b63a4682 Mon Sep 17 00:00:00 2001
From 5d1bf6c3e826af7282b858c192c62aad77095fc0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
Subject: [PATCH] Add linux-oe-g++ platform
@@ -56,7 +56,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
diff --git a/configure b/configure
index f4c7813..9ab6a9d 100755
index 6ebeab3..9e552c6 100755
--- a/configure
+++ b/configure
@@ -343,6 +343,16 @@ getQMakeConf()

4
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
View File

@@ -1,4 +1,4 @@
From 03824427f227ff16c6d23d08c73708b0faf98e06 Mon Sep 17 00:00:00 2001
From a5e43264353bafc2ea4ad6813dbab6b271aee388 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 8bcacca..e1c87b5 100644
index 14be4c3..1bddb53 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -157,7 +157,10 @@ void QLibrarySettings::load()

6
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
View File

@@ -1,4 +1,4 @@
From 7421a689c695a09fff2d5ffbdbe56e34d73f771d Mon Sep 17 00:00:00 2001
From 1e9313a736c9d381c70e723d8075c206bfaf47f5 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
Subject: [PATCH] Add -external-hostbindir option
@@ -37,7 +37,7 @@ Conflicts:
7 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 9ab6a9d..225b9f3 100755
index 9e552c6..ae724d6 100755
--- a/configure
+++ b/configure
@@ -826,6 +826,7 @@ QT_HOST_BINS=
@@ -125,7 +125,7 @@ index 839c3d6..45934a0 100644
!host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
diff --git a/qtbase.pro b/qtbase.pro
index 98ca86a..0eed475 100644
index 78f9b3a..f4b7fc4 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -37,12 +37,16 @@ CONFIG -= qt

8
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
View File

@@ -1,4 +1,4 @@
From 156a2e3f61258de4127d582895376a1c674e30a6 Mon Sep 17 00:00:00 2001
From da99a6be6f55cce1363962ffa897b868a6009cd3 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 23:15:37 +0200
Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index be08a2a..0310cbb 100644
index ddf99da..9596b87 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
@@ -318,6 +318,19 @@ contains(TEMPLATE, .*app) {
QTPLUGIN = $$manualplugs $$autoplugs
}
@@ -92,7 +92,7 @@ index be08a2a..0310cbb 100644
contains(QT_CONFIG, static) {
QT_PLUGIN_VERIFY += QTPLUGIN
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index de9ba9d..e59c5e5 100644
index 08b3f3e..8a667f3 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) {

4
recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
View File

@@ -1,4 +1,4 @@
From 4316f6b00153765fd39a0054896910049c607169 Mon Sep 17 00:00:00 2001
From 8eaae5ee0e77b3783afd0f10a89004fd981f29b3 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Tue, 25 Aug 2015 10:05:15 -0400
Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -14,7 +14,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 225b9f3..746a088 100755
index ae724d6..df089f2 100755
--- a/configure
+++ b/configure
@@ -3959,10 +3959,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$

2
recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
View File

@@ -1,4 +1,4 @@
From af6fed015c4d685e922ed6761262610910ea2219 Mon Sep 17 00:00:00 2001
From b4be62e9ac936b110375492dcdc7aeccfe46bd29 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
Date: Thu, 16 May 2013 09:52:07 +0300
Subject: [PATCH] QOpenGLPaintDevice sub-area support

2
recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
View File

@@ -1,4 +1,4 @@
From 92eafaf0f5902916ca87b8e3bd63040602ff18bf Mon Sep 17 00:00:00 2001
From 6649a3df359d3d55b1caaa6601692a1dcc2ef92c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 8 Jun 2015 13:59:25 -0700
Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T

4
recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
View File

@@ -1,4 +1,4 @@
From 92b13af05077dec0d194d4018e36568146d41232 Mon Sep 17 00:00:00 2001
From 5e8f8f44227fea48b84fd79e1fc4122d66776bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 13 Nov 2015 12:36:11 +0100
Subject: [PATCH] configure paths for target qmake properly
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 746a088..d98ea53 100755
index df089f2..224f9f5 100755
--- a/configure
+++ b/configure
@@ -3904,8 +3904,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then

2
recipes-qt/qt5/qtbase/0009-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
View File

@@ -1,4 +1,4 @@
From e70b35ba680f2138f0a7ff65852e76248462d459 Mon Sep 17 00:00:00 2001
From 34864cac45a112f27c2587ebfff7f10184607fad Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@siemens.com>
Date: Wed, 11 May 2016 15:20:41 +0200
Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS

6
recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
View File

@@ -1,4 +1,4 @@
From 609d853b42509e8c7da4409e2c97dc44834db564 Mon Sep 17 00:00:00 2001
From d3e797e0fa9bb9425bc50ac280685b541ed830c7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
Subject: [PATCH] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/src.pro b/src/src.pro
index ed752c3..dbb0b56 100644
index dd15559..b29a33c 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -186,7 +186,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
@@ -189,7 +189,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
}
}
}

2
recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch
View File

@@ -1,4 +1,4 @@
From a67370ba276ae4a098a8c34bda72dba5387d9dae Mon Sep 17 00:00:00 2001
From 1bea31d8abd34ab33daec6df91ffc0bc63b75f9e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
Subject: [PATCH] Add -external-hostbindir option for native(sdk)

2
recipes-qt/qt5/qtbase_git.bb
View File

@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
"
# common for qtbase-native, qtbase-nativesdk and qtbase
# Patches from https://github.com/meta-qt5/qtbase/commits/b5.6-shared
# 5.6.meta-qt5-shared.9
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \

2
recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
View File

@@ -1,4 +1,4 @@
From 8228a74e72ad130f8ab91dd3ebe1969c0acfd81b Mon Sep 17 00:00:00 2001
From bf1357512cd31b20f4f974e17e52f8a842b65317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Sun, 26 May 2013 14:26:19 +0200
Subject: [PATCH] qmltestexample: fix link

2
recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
View File

@@ -1,4 +1,4 @@
From b958ab5685384a4c612f13c8cb83fa6b87fee18e Mon Sep 17 00:00:00 2001
From da7f84900e7efb6ce1e6914861beb1636b99347c Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Thu, 31 Mar 2016 19:38:58 -0400
Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been

2
recipes-qt/qt5/qtdeclarative_git.bb
View File

@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
# Patches from https://github.com/meta-qt5/qtdeclarative/commits/b5.6
# 5.6.meta-qt5.7
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \

2
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
View File

@@ -1,4 +1,4 @@
From ff035d111c39a0f3b1b5a93e99d266341878f573 Mon Sep 17 00:00:00 2001
From 93c115856aa0d07f10dd308723af9c2453b1b29e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 4 Aug 2014 19:19:05 +0200
Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic

2
recipes-qt/qt5/qtimageformats_git.bb
View File

@@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
ALLOW_EMPTY_${PN} = "1"
# Patches from https://github.com/meta-qt5/qtimageformats/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch"
PACKAGECONFIG ?= "libtiff"

4
recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
View File

@@ -1,4 +1,4 @@
From 98455d75df7b040817e323417b6042118c093d56 Mon Sep 17 00:00:00 2001
From d8911e0db56151d39f7c8c6d9f32349ca54e8c48 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Thu, 31 Oct 2013 15:06:30 +0100
Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -17,7 +17,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 98bb315..287887f 100644
index e58ae1d..81e6ce8 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -17,19 +17,21 @@ win32 {

2
recipes-qt/qt5/qtmultimedia_git.bb
View File

@@ -31,6 +31,8 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer010', 'G
# Disable GStreamer if completely disabled
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', 'CONFIG+=done_config_gstreamer', d)}"
# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += "\
file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
"

4
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
View File

@@ -1,4 +1,4 @@
From 0dcc16dafac2fec76c178f3b3195f57bb2ac3d8e Mon Sep 17 00:00:00 2001
From 61dfc0e7b4c78ba7296e8e6c3a1da0c688b73513 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Thu, 31 Mar 2016 19:57:01 -0400
Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+)
diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
index 2e03f74..3d1b3c8 100644
index b07099e..6a34e55 100644
--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
@@ -44,6 +44,7 @@

2
recipes-qt/qt5/qtquickcontrols_git.bb
View File

@@ -13,6 +13,8 @@ DEPENDS += "qtdeclarative"
RDEPENDS_${PN}-dev = ""
# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += " \
file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
"

2
recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
View File

@@ -1,4 +1,4 @@
From 782bef8198cc5aacd7b11903a4e4739950d6b90c Mon Sep 17 00:00:00 2001
From 517561c76fcd0d5174d6b138d1c5d3ca5ee48981 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert

2
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
View File

@@ -1,4 +1,4 @@
From b7e29ffe5f00847de7e87a183e0ff2ecf0cccb20 Mon Sep 17 00:00:00 2001
From 3e79a7ac0e1f77544283efe73baa98b2e205e7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 17 Jan 2014 14:33:19 +0100
Subject: [PATCH] assistant/help: fix linking of dependent libraries

2
recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
View File

@@ -1,4 +1,4 @@
From 79a9f6a65355203fc49fa610f6bb9fe8ddd07cda Mon Sep 17 00:00:00 2001
From 8058b3f26003a3fae25db08694ee0fe671c96bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 4 Jun 2014 11:28:16 +0200
Subject: [PATCH] add noqtwebkit configuration

2
recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
View File

@@ -1,4 +1,4 @@
From a2d297031e08f986189761dafdac78a95db39de8 Mon Sep 17 00:00:00 2001
From 1c5dd153433fed55e70ef208a3068075fa38f006 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Thu, 9 Jul 2015 11:28:19 -0400
Subject: [PATCH] linguist-tools cmake: allow overriding the location for

2
recipes-qt/qt5/qttools_git.bb
View File

@@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
# Patches from https://github.com/meta-qt5/qttools/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += " \
file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \

2
recipes-qt/qt5/qtwayland-native_git.bb
View File

@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtbase-native wayland-native"
# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.6-native
# 5.6.meta-qt5-native.1
SRC_URI += " \
file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \
"

2
recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
View File

@@ -1,4 +1,4 @@
From 58cea434f7b4f0f2469ba6e8eb892a448e20f6a6 Mon Sep 17 00:00:00 2001
From 07ec1f1728be3dff2f93f939065b7fb58f1df434 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Fri, 19 Jul 2013 13:35:14 +0000
Subject: [PATCH] Install the qtwaylandscanner tool to the native side

2
recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
View File

@@ -1,4 +1,4 @@
From 2be2c512d07fb013022c9ccb7d81308295e71866 Mon Sep 17 00:00:00 2001
From a714384fa9bba88d2536d644121587ca06fc010c Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 22 Feb 2014 17:47:44 +0100
Subject: [PATCH] examples/wayland: include server-buffer only when building

2
recipes-qt/qt5/qtwayland_git.bb
View File

@@ -32,6 +32,8 @@ FILES_${PN}-plugins-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
"
# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += " \
file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
"

12
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
View File

@@ -1,4 +1,4 @@
From 092e3c94fbec392c6b2f29bc2999595a10d0e66f Mon Sep 17 00:00:00 2001
From af1bd58f69ac6b292a840401b676f6ba29b8764c Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 3 Oct 2014 03:52:11 +0200
Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
@@ -9,11 +9,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 b860735..0ed5de3 100644
--- a/src/3rdparty/chromium/base/base.gypi
+++ b/src/3rdparty/chromium/base/base.gypi
@@ -785,7 +785,7 @@
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
index 63c3f76..331c975 100644
--- a/chromium/base/base.gypi
+++ b/chromium/base/base.gypi
@@ -801,7 +801,7 @@
['include', '^nix/'],
],
}],

6
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
View File

@@ -1,4 +1,4 @@
From 8d94528e14cc00934a0beaac53fa990567740596 Mon Sep 17 00:00:00 2001
From 66cc10051d1379d1696276ca64c01f2ac7efc3ef Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 30 Jun 2014 20:08:17 +0200
Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index a4abf45..47311c6 100644
index c8fd278..6cf49f4 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -125,9 +125,9 @@ defineReplace(mocOutput) {
@@ -182,9 +182,9 @@ defineReplace(mocOutput) {
out = $$1
# The order is important, since the output of the second replace would end up accidentaly transformed by the first one
for(ext, $$list($${QMAKE_EXT_CPP})): \

8
recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
View File

@@ -1,4 +1,4 @@
From eaaf8074a826137d3ad061f4c09bb36f449188a3 Mon Sep 17 00:00:00 2001
From 3c3e4d07a9950e818798d585ec797667a72c531f Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Thu, 24 Dec 2015 12:46:58 -0200
Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
diff --git a/chromium/ui/gfx/codec/jpeg_codec.cc b/chromium/ui/gfx/codec/jpeg_codec.cc
index 8a08fe0..32b2a05 100644
--- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
+++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--- a/chromium/ui/gfx/codec/jpeg_codec.cc
+++ b/chromium/ui/gfx/codec/jpeg_codec.cc
@@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
// tell libjpeg where to write the next data
cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];

6
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
View File

@@ -1,4 +1,4 @@
From 19f7088dd18c4966ec40501cd7e07a0ea16613ae Mon Sep 17 00:00:00 2001
From 35805156dff632f05a85cd0a30e4707d9ba2e093 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Tue, 18 Nov 2014 10:38:18 +0100
Subject: [PATCH] functions.prf: Make sure we only use the file name to
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 47311c6..be2b2a5 100644
index 6cf49f4..1287799 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -122,7 +122,8 @@ defineReplace(findIncludedMocFiles) {
@@ -179,7 +179,8 @@ defineReplace(findIncludedMocFiles) {
}
defineReplace(mocOutput) {

4
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
View File

@@ -1,4 +1,4 @@
From 99e307a75a331e60cb9bcb6d75bc3e0afb8e1b24 Mon Sep 17 00:00:00 2001
From 70d76cb38e611c42411d623f165ec27eaa4ba615 Mon Sep 17 00:00:00 2001
From: Frieder Schrempf <frieder.schrempf@online.de>
Date: Mon, 1 Dec 2014 14:34:40 +0000
Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 6 insertions(+)
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index be2b2a5..fb650c2 100644
index 1287799..fb06b21 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) {

6
recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
View File

@@ -1,4 +1,4 @@
From dd72b83e84d0c9f8034096ff2db3d826ba708eb6 Mon Sep 17 00:00:00 2001
From fc8955e190f45ebb9999a1ff34be81f400960592 Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Fri, 25 Dec 2015 18:16:05 -0200
Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 0fd187a..54b4b7f 100644
index c762c4d..9836ebf 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -56,6 +56,8 @@
@@ -59,6 +59,8 @@
#include <QString>
#include <QtCore/qcompilerdetection.h>
#include <QtGui/qaccessibleobject.h>

6
recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
View File

@@ -1,4 +1,4 @@
From 149dd23e66b3e0ea64f090478ac974a51e0b6a42 Mon Sep 17 00:00:00 2001
From 3102dad3fd5887c1c0a2eea2466d985d6279683f Mon Sep 17 00:00:00 2001
From: Cleiton Bueno <cleitonrbueno@gmail.com>
Date: Thu, 24 Dec 2015 15:59:51 -0200
Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index 500fe76..eda2824 100644
index b13a9da..8a54cce 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -43,6 +43,8 @@
@@ -46,6 +46,8 @@
#include <map>
#include <QtCore/qcompilerdetection.h>

13
recipes-qt/qt5/qtwebengine_git.bb
View File

@@ -107,6 +107,8 @@ RDEPENDS_${PN}-examples += " \
QT_MODULE_BRANCH_CHROMIUM = "49-based"
# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
@@ -114,13 +116,16 @@ SRC_URI += " \
file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
file://0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
file://0005-Include-dependency-to-QCoreApplication-translate.patch \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
"
# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/49-based
# 49-based.meta-qt5.1
SRC_URI += " \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch;patchdir=src/3rdparty \
file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patchh;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "fad625e0ba39e855817bbf206ab9a846d07aeeec"
# This is in git submodule, but we're using latest in 45-based
# SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3"
SRCREV_chromium = "cb094c05c5f06489fa64412e7f5d9e194a3f9495"
SRCREV = "${SRCREV_qtwebengine}"

2
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
View File

@@ -1,4 +1,4 @@
From 24f843d4b73de923712c40335068f6f32ff65c7c Mon Sep 17 00:00:00 2001
From 2c2f861f1495f477290d5bd8c49b59bcd20ae845 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <trevor.woerner@linaro.org>
Date: Fri, 7 Feb 2014 04:07:17 +0100
Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)

2
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
View File

@@ -1,4 +1,4 @@
From 63d1bab5741e08b91549a55ff039eeac36e745b8 Mon Sep 17 00:00:00 2001
From 38211ab724d5379dd393414cc8668cd906bde2cb Mon Sep 17 00:00:00 2001
From: Magnus Granberg <zorry@gentoo.org>
Date: Fri, 27 Feb 2015 11:55:09 +0100
Subject: [PATCH] Remove TEXTREL tag in x86

2
recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
View File

@@ -1,4 +1,4 @@
From cec1f02bcd1e484fe422e98562a093541c9c9011 Mon Sep 17 00:00:00 2001
From 3a8d40cb1297a26a6877857e74e752a1be08ad2b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 5 Jun 2015 19:55:05 -0700
Subject: [PATCH] Exclude backtrace() API for non-glibc libraries

2
recipes-qt/qt5/qtwebkit_git.bb
View File

@@ -18,6 +18,8 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.6
# 5.6.meta-qt5.1
SRC_URI += "\
file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
file://0002-Remove-TEXTREL-tag-in-x86.patch \