* [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally
@ 2019-05-14 1:44 Eric Ruei
2019-05-14 1:44 ` [PATCH 1/5] packagegroup-arago-qte: replace qtwebengine with qtwebkit Eric Ruei
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
Disable qtwebengine for now because version 5.11.3 is broken. We shall
revert these recipe changes when fix is available.
Eric Ruei (5):
packagegroup-arago-qte: replace qtwebengine with qtwebkit
ackagegroup-arago-qte-toolchain-target: replace qtwebengine with
qtwebkit
ackagegroup-arago-tisdk-qte: replace qtwebengine examples with
qtwebkit ones
ackagegroup-arago-tisdk-matrix: replace qtwebengine browser with
qtwebkit one
matrix-gui-browser: pick up the matrix-gui-browser built on top of
qtwebkit
.../packagegroups/packagegroup-arago-qte.bb | 16 ++++++-------
.../packagegroup-arago-tisdk-matrix.bb | 12 +++++-----
.../packagegroup-arago-tisdk-qte.bb | 20 +++++++---------
.../matrix/matrix-gui-browser_2.0.bb | 13 +++++-----
...packagegroup-arago-qte-toolchain-target.bb | 24 +++++++++----------
5 files changed, 42 insertions(+), 43 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] packagegroup-arago-qte: replace qtwebengine with qtwebkit
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
@ 2019-05-14 1:44 ` Eric Ruei
2019-05-14 1:44 ` [PATCH 2/5] ackagegroup-arago-qte-toolchain-target: " Eric Ruei
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
- qtwebengine 5.11.3 does not work, replace it with qtwebkit until the
fix is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../packagegroups/packagegroup-arago-qte.bb | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index c038a165..8cfcdfc3 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -40,18 +40,18 @@ QT5_ESSENTIALS = "\
qtgraphicaleffects-qmlplugins \
qtvirtualkeyboard-plugins \
qtvirtualkeyboard-qmlplugins \
- qtwebengine-qmlplugins \
+ qtwebkit-qmlplugins \
liberation-fonts \
qtconnectivity \
qtconnectivity-qmlplugins \
"
-QT5_ESSENTIALS_append_k3 = "\
- qtwebkit-qmlplugins \
-"
-QT5_ESSENTIALS_remove_k3 = "\
- qtwebengine-qmlplugins \
-"
+#QT5_ESSENTIALS_append_k3 = "\
+# qtwebkit-qmlplugins \
+#"
+#QT5_ESSENTIALS_remove_k3 = "\
+# qtwebengine-qmlplugins \
+#"
RDEPENDS_${PN} = "\
${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] ackagegroup-arago-qte-toolchain-target: replace qtwebengine with qtwebkit
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
2019-05-14 1:44 ` [PATCH 1/5] packagegroup-arago-qte: replace qtwebengine with qtwebkit Eric Ruei
@ 2019-05-14 1:44 ` Eric Ruei
2019-05-14 1:44 ` [PATCH 3/5] ackagegroup-arago-tisdk-qte: replace qtwebengine examples with qtwebkit ones Eric Ruei
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
- qtwebengine 5.11.3 does not work, replace it with qtwebkit until the
fix is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...packagegroup-arago-qte-toolchain-target.bb | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index 2afc9746..4802acd7 100644
--- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Target packages for Qt Embedded SDK"
LICENSE = "MIT"
-PR = "r13"
+PR = "r14"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -61,21 +61,21 @@ QT5_DEV = " \
qtsensors-dev \
qtsvg-dev \
qtxmlpatterns-dev \
- qtwebengine-mkspecs \
- qtwebengine-dev \
- qtserialport-mkspecs \
- qtserialport-dev \
-"
-
-QT5_DEV_append_k3 = " \
qtwebkit-mkspecs \
qtwebkit-dev \
+ qtserialport-mkspecs \
+ qtserialport-dev \
"
-QT5_DEV_remove_k3 = " \
- qtwebengine-mkspecs \
- qtwebengine-dev \
-"
+#QT5_DEV_append_k3 = " \
+# qtwebkit-mkspecs \
+# qtwebkit-dev \
+#"
+#
+#QT5_DEV_remove_k3 = " \
+# qtwebengine-mkspecs \
+# qtwebengine-dev \
+#"
RDEPENDS_${PN} += " \
${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] ackagegroup-arago-tisdk-qte: replace qtwebengine examples with qtwebkit ones
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
2019-05-14 1:44 ` [PATCH 1/5] packagegroup-arago-qte: replace qtwebengine with qtwebkit Eric Ruei
2019-05-14 1:44 ` [PATCH 2/5] ackagegroup-arago-qte-toolchain-target: " Eric Ruei
@ 2019-05-14 1:44 ` Eric Ruei
2019-05-14 1:44 ` [PATCH 4/5] ackagegroup-arago-tisdk-matrix: replace qtwebengine browser with qtwebkit one Eric Ruei
2019-05-14 1:44 ` [PATCH 5/5] matrix-gui-browser: pick up the matrix-gui-browser built on top of qtwebkit Eric Ruei
4 siblings, 0 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
- qtwebengine 5.11.3 does not work, replace it with qtwebkit until the
fix is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../packagegroup-arago-tisdk-qte.bb | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index 43a0d02f..b2ca56eb 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,19 +22,17 @@ QT5_DEMOS = "\
qtscript-examples \
qtsvg-examples \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
- qtwebbrowser \
- qtwebbrowser-examples \
- qtwebengine-examples \
+ qtwebkit-examples \
qtserialport-examples \
"
-QT5_DEMOS_append_k3 = " qtwebkit-examples-examples"
-
-QT5_DEMOS_remove_k3 = "\
- qtwebbrowser \
- qtwebbrowser-examples \
- qtwebengine-examples \
-"
+#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples"
+#
+#QT5_DEMOS_remove_k3 = "\
+# qtwebbrowser \
+# qtwebbrowser-examples \
+# qtwebengine-examples \
+#"
QT_DEMOS = "\
qt-tstat \
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] ackagegroup-arago-tisdk-matrix: replace qtwebengine browser with qtwebkit one
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
` (2 preceding siblings ...)
2019-05-14 1:44 ` [PATCH 3/5] ackagegroup-arago-tisdk-qte: replace qtwebengine examples with qtwebkit ones Eric Ruei
@ 2019-05-14 1:44 ` Eric Ruei
2019-05-14 1:44 ` [PATCH 5/5] matrix-gui-browser: pick up the matrix-gui-browser built on top of qtwebkit Eric Ruei
4 siblings, 0 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
- qtwebengine 5.11.3 does not work, replace it with qtwebkit until the
fix is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../packagegroups/packagegroup-arago-tisdk-matrix.bb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 1e543616..2b7ee6de 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to include Matrix v2"
LICENSE = "MIT"
-PR = "r77"
+PR = "r78"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -33,7 +33,7 @@ MATRIX_COMMON_APPS = " \
MATRIX_QT_APPS = " \
matrix-qt5-demo-animated \
- matrix-qt5-demo-browser \
+ matrix-qt5-demo-webkit-browser \
matrix-qt5-demo-calculator \
matrix-qt5-demo-deform \
matrix-gui-thermostat-demo \
@@ -45,10 +45,10 @@ MATRIX_TOUCH_APPS = " \
MATRIX_QT_APPS_keystone = ""
MATRIX_QT_APPS_omapl138 = ""
-MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
-MATRIX_QT_APPS_append_k3 = " \
- matrix-qt5-demo-webkit-browser \
-"
+#MATRIX_QT_APPS_remove_k3 = "matrix-qt5-demo-browser"
+#MATRIX_QT_APPS_append_k3 = " \
+# matrix-qt5-demo-webkit-browser \
+#"
MATRIX_SGX_DEMOS = " \
matrix-3d-demo-chameleon \
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] matrix-gui-browser: pick up the matrix-gui-browser built on top of qtwebkit
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
` (3 preceding siblings ...)
2019-05-14 1:44 ` [PATCH 4/5] ackagegroup-arago-tisdk-matrix: replace qtwebengine browser with qtwebkit one Eric Ruei
@ 2019-05-14 1:44 ` Eric Ruei
4 siblings, 0 replies; 6+ messages in thread
From: Eric Ruei @ 2019-05-14 1:44 UTC (permalink / raw)
To: meta-arago
- qtwebengine 5.11.3 does not work, replace it with qtwebkit until the
fix is available
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
.../recipes-core/matrix/matrix-gui-browser_2.0.bb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index 9ceaa560..9c99b469 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -9,15 +9,16 @@ inherit qt-provider
# Make sure that QT font libraries have been installed
RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
-DEPENDS += "${QT_DEPENDS_WEBENGINE}"
-DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}"
-DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}"
+DEPENDS += "${QT_DEPENDS_WEBKIT}"
+#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}"
+#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}"
-PR = "r16"
+PR = "r17"
QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79"
-QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc"
-QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
+QT5_SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
+#QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc"
+#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5"
SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}"
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-14 1:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14 1:44 [PATCH 0/5] Replace qtwebengine with qtwebkit unconditionally Eric Ruei
2019-05-14 1:44 ` [PATCH 1/5] packagegroup-arago-qte: replace qtwebengine with qtwebkit Eric Ruei
2019-05-14 1:44 ` [PATCH 2/5] ackagegroup-arago-qte-toolchain-target: " Eric Ruei
2019-05-14 1:44 ` [PATCH 3/5] ackagegroup-arago-tisdk-qte: replace qtwebengine examples with qtwebkit ones Eric Ruei
2019-05-14 1:44 ` [PATCH 4/5] ackagegroup-arago-tisdk-matrix: replace qtwebengine browser with qtwebkit one Eric Ruei
2019-05-14 1:44 ` [PATCH 5/5] matrix-gui-browser: pick up the matrix-gui-browser built on top of qtwebkit Eric Ruei
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.