Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

qtbase: Rename .bbappend to match new 5.2.1 version from meta-qt5

* 0002-Enable-support-to-mtdev.patch was resolved in upstream commits:
  commit 5923196bc3fbed67beb637fd36e1bdf2d6780e36
  Author: Robin Burchell <robin.burchell@jollamobile.com>
  Date:   Fri Dec 20 15:14:42 2013 +0000
  Subject: mtdev: Change to use configure detection instead of requiring source hacking.

  commit a8d9878d48a0d3c90eff295d0c1b099baff1186c
  Author: Thiago Macieira <thiago.macieira@intel.com>
  Date:   Fri Jan 3 22:45:12 2014 -0200
  Subject: Fix Qt build when mtdev is detected

* 0001-Make-wayland-scanner-install-generated-headers.patch is included
  in 5.2.1, upstream commit 0e1ce36ae67de940b2d499ec7f23e520dce0f112

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  • Loading branch information...
commit f4f324cab61ae9e5300f2705b99982cf3227d9ef 1 parent 834c801
@shr-project shr-project authored
View
2  conf/distro/include/webos-preferred-versions.inc
@@ -30,5 +30,5 @@ PREFERRED_VERSION_yajl ?= "1.0.12"
# where <revision-hash> is the 40-character SHA-1 identifier of annotated
# submissions tag.
-PREFERRED_VERSION_qtwebkit = "5.2.0+git%"
+PREFERRED_VERSION_qtwebkit = "5.2.1+git%"
PREFERRED_VERSION_libconnman-qt = "1.0.43+git%"
View
6 recipes-qt/qt5/qtbase/0001-HACK-Add-capatibility-to-have-QT_QPA_EGLFS_DEPTH-.-i.patch
@@ -1,7 +1,7 @@
-From 510e7fa161a142b806eaa7e38e013c8db4cd8e14 Mon Sep 17 00:00:00 2001
+From 3869f3c8504935ec60923f763ff7ee007a7b79b3 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Tue, 23 Jul 2013 21:28:51 +0000
-Subject: [PATCH 1/3] HACK: Add capatibility to have QT_QPA_EGLFS_DEPTH .. in
+Subject: [PATCH 1/2] HACK: Add capatibility to have QT_QPA_EGLFS_DEPTH .. in
eglfs
Upstream-Status: Inappropiate [configuration]
@@ -43,5 +43,5 @@ index 4dc0783..8e55801 100644
bool QEglFSHooks::filterConfig(EGLDisplay, EGLConfig) const
--
-1.8.5.2
+1.8.5.3
View
139 recipes-qt/qt5/qtbase/0001-Make-wayland-scanner-install-generated-headers.patch
@@ -1,139 +0,0 @@
-From 0e1ce36ae67de940b2d499ec7f23e520dce0f112 Mon Sep 17 00:00:00 2001
-From: Jorgen Lind <jorgen.lind@digia.com>
-Date: Mon, 18 Nov 2013 10:18:56 +0100
-Subject: [PATCH] Make wayland-scanner install generated headers
-
-QtWayland uses QtWaylandScanner to generate c++ files which will be
-subclassed. This works ok in QtCompositor as it implements the pimple
-pattern. However, QtWayland has to expose a library called
-QtWaylandClient as a way to create specialized wayland plugins. These
-classes don't promise an ABI, and has limited API guarantees, so they
-subclass the classes generated by the QtWaylandScanner directly. For
-this library to be possible, we have to install the generated files.
-Also, it should be possible to use the private API, and that's not
-possible without the generated files.
-
-Change-Id: Id55200fe23652587390dabf84ca846e4f39cf70e
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-Reviewed-by: Andy Nichols <andy.nichols@digia.com>
----
- mkspecs/features/wayland-scanner.prf | 66 +++++++++++++++++++++++++++++-------
- 1 file changed, 54 insertions(+), 12 deletions(-)
-
-diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
-index b2eca41..3a9d8ca 100644
---- a/mkspecs/features/wayland-scanner.prf
-+++ b/mkspecs/features/wayland-scanner.prf
-@@ -5,10 +5,52 @@
-
- isEmpty(QMAKE_WAYLAND_SCANNER):error("QMAKE_WAYLAND_SCANNER not defined for this mkspec")
-
-+defineReplace(waylandScannerHeaderFiles) {
-+ side = $$1
-+ path = $$2
-+ isEqual(side, "server"): \
-+ sources_list = $$WAYLANDSERVERSOURCES
-+ else: \
-+ sources_list = $$WAYLANDCLIENTSOURCES
-+ wayland_header_files_for_side =
-+ for(file, sources_list) {
-+ basenameFile = $$basename(file)
-+ basenameFile ~= s,\\.xml$,,
-+ wayland_header_files_for_side += $$path/wayland-$$basenameFile-$$side-protocol$${first(QMAKE_EXT_H)}
-+ isEqual(side, "server"): \
-+ wayland_header_files_for_side += $$path/qwayland-server-$$basenameFile$${first(QMAKE_EXT_H)}
-+ else: \
-+ wayland_header_files_for_side += $$path/qwayland-$$basenameFile$${first(QMAKE_EXT_H)}
-+ }
-+ return($$wayland_header_files_for_side)
-+}
-+
-+qt_install_headers {
-+ header_dest = $$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
-+
-+ header_files_client = $$waylandScannerHeaderFiles(client, $$header_dest)
-+ !isEmpty(header_files_client) {
-+ wayland_generated_client_headers.files = $$header_files_client
-+ wayland_generated_client_headers.path = $$private_headers.path
-+ INSTALLS += wayland_generated_client_headers
-+ WAYLAND_CLIENT_HEADER_DEST = $$header_dest/
-+ WAYLAND_CLIENT_INCLUDE_DIR = $$MODULE_INCNAME/private
-+ }
-+
-+ header_files_server = $$waylandScannerHeaderFiles(server, $$header_dest)
-+ !isEmpty(header_files_server) {
-+ wayland_generated_server_headers.files = $$header_files_server
-+ wayland_generated_server_headers.path = $$private_headers.path
-+ INSTALLS += wayland_generated_server_headers
-+ WAYLAND_SERVER_HEADER_DEST = $$header_dest/
-+ WAYLAND_SERVER_INCLUDE_DIR = $$MODULE_INCNAME/private
-+ }
-+}
-+
- wayland_server_header.name = wayland ${QMAKE_FILE_BASE}
- wayland_server_header.input = WAYLANDSERVERSOURCES
- wayland_server_header.variable_out = HEADERS
--wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
-+wayland_server_header.output = $${WAYLAND_SERVER_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
- wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
- silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
- QMAKE_EXTRA_COMPILERS += wayland_server_header
-@@ -16,7 +58,7 @@ QMAKE_EXTRA_COMPILERS += wayland_server_header
- wayland_client_header.name = wayland ${QMAKE_FILE_BASE}
- wayland_client_header.input = WAYLANDCLIENTSOURCES
- wayland_client_header.variable_out = HEADERS
--wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
-+wayland_client_header.output = $${WAYLAND_CLIENT_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
- wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
- silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
- QMAKE_EXTRA_COMPILERS += wayland_client_header
-@@ -34,35 +76,35 @@ qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
- qtwayland_client_header.name = qtwayland ${QMAKE_FILE_BASE}
- qtwayland_client_header.input = WAYLANDCLIENTSOURCES
- qtwayland_client_header.variable_out = HEADERS
--qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
--qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
--qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+qtwayland_client_header.depends = $${WAYLAND_CLIENT_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
-+qtwayland_client_header.output = $${WAYLAND_CLIENT_HEADER_DEST}qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} $$WAYLAND_CLIENT_INCLUDE_DIR > ${QMAKE_FILE_OUT}
- silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
- QMAKE_EXTRA_COMPILERS += qtwayland_client_header
-
- qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE}
- qtwayland_client_code.input = WAYLANDCLIENTSOURCES
- qtwayland_client_code.variable_out = SOURCES
--qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+qtwayland_client_code.depends = $${WAYLAND_CLIENT_HEADER_DEST}qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
- qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp
--qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} $$WAYLAND_CLIENT_INCLUDE_DIR > ${QMAKE_FILE_OUT}
- silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
- QMAKE_EXTRA_COMPILERS += qtwayland_client_code
-
- qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE}
- qtwayland_server_header.input = WAYLANDSERVERSOURCES
- qtwayland_server_header.variable_out = HEADERS
--qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
--qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
--qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+qtwayland_server_header.depends = $${WAYLAND_SERVER_HEADER_DEST}wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
-+qtwayland_server_header.output = $${WAYLAND_SERVER_HEADER_DEST}qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} $$WAYLAND_SERVER_INCLUDE_DIR > ${QMAKE_FILE_OUT}
- silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
- QMAKE_EXTRA_COMPILERS += qtwayland_server_header
-
- qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE}
- qtwayland_server_code.input = WAYLANDSERVERSOURCES
- qtwayland_server_code.variable_out = SOURCES
--qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
-+qtwayland_server_code.depends = $${WAYLAND_SERVER_HEADER_DEST}qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
- qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
--qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} $$WAYLAND_SERVER_INCLUDE_DIR > ${QMAKE_FILE_OUT}
- silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
- QMAKE_EXTRA_COMPILERS += qtwayland_server_code
---
-1.8.3.2
-
View
27 recipes-qt/qt5/qtbase/0002-Enable-support-to-mtdev.patch
@@ -1,27 +0,0 @@
-From 7a074846b6b62f4dd3578a75f99581289d68fd8a Mon Sep 17 00:00:00 2001
-From: Simon Busch <morphis@gravedo.de>
-Date: Tue, 23 Jul 2013 21:32:41 +0000
-Subject: [PATCH 2/3] Enable support to mtdev
-
-Upstream-Status: Inappropiate [configuration]
-
-Signed-off-by: Simon Busch <morphis@gravedo.de>
----
- src/platformsupport/input/evdevtouch/evdevtouch.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri
-index 16e1a98..fbd26f2 100644
---- a/src/platformsupport/input/evdevtouch/evdevtouch.pri
-+++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri
-@@ -8,6 +8,6 @@ contains(QT_CONFIG, libudev) {
- LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
- }
-
--# DEFINES += USE_MTDEV
-+DEFINES += USE_MTDEV
-
- contains(DEFINES, USE_MTDEV): LIBS_PRIVATE += -lmtdev
---
-1.8.5.2
-
View
8 ...sh-when-platform-integration-isn-t-availabl.patch → ...-Don-t-crash-when-platform-integration-isn-.patch
@@ -1,11 +1,13 @@
-From 7ed1c7bbf0b2fd18927c053b1e87355bf30b45fc Mon Sep 17 00:00:00 2001
+From aa5c563cda50158e3d4f4f439f6f401be7281111 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Sun, 1 Dec 2013 22:27:18 +0100
-Subject: [PATCH 3/3] Don't crash when platform integration isn't available
+Subject: [PATCH 2/2] qfont_qpa: Don't crash when platform integration isn't
+ available
Upstream-Status: pending [https://codereview.qt-project.org/]
Signed-off-by: Simon Busch <morphis@gravedo.de>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/gui/text/qfont_qpa.cpp | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
@@ -35,5 +37,5 @@ index be432dc..d7f6ac5 100644
}
--
-1.8.5.2
+1.8.5.3
View
8 recipes-qt/qt5/qtbase_5.2.0.bbappend → recipes-qt/qt5/qtbase_5.2.1.bbappend
@@ -1,14 +1,10 @@
-DEPENDS += "mtdev"
-
PACKAGECONFIG_GL = "gles2"
-PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility"
+PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility mtdev"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://0001-HACK-Add-capatibility-to-have-QT_QPA_EGLFS_DEPTH-.-i.patch \
- file://0002-Enable-support-to-mtdev.patch \
- file://0003-Don-t-crash-when-platform-integration-isn-t-availabl.patch \
- file://0001-Make-wayland-scanner-install-generated-headers.patch \
+ file://0002-qfont_qpa-Don-t-crash-when-platform-integration-isn-.patch \
"
EXTRA_OECONF += "-qpa wayland-egl"
View
14 recipes-qt/qt5/qtbase_git.bbappend
@@ -1,13 +1,10 @@
-DEPENDS += "mtdev"
-
PACKAGECONFIG_GL = "gles2"
-PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility"
+PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility mtdev"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://0001-HACK-Add-capatibility-to-have-QT_QPA_EGLFS_DEPTH-.-i.patch \
- file://0002-Enable-support-to-mtdev.patch \
- file://0003-Don-t-crash-when-platform-integration-isn-t-availabl.patch \
+ file://0002-qfont_qpa-Don-t-crash-when-platform-integration-isn-.patch \
"
EXTRA_OECONF += "-qpa wayland-egl"
@@ -16,3 +13,10 @@ do_install_append() {
# Remove unwanted maliit input context plugin
rm -f ${D}${libdir}/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
}
+
+# Needed to build libwayland_common_webos.a in qtwayland
+WEBOS_NO_STATIC_LIBRARIES_WHITELIST = "libQt5PlatformSupport.a"
+
+# Needed to build Qt5QmlDevTools in qtdeclarative
+# | make[2]: *** No rule to make target `/home/mjansa/build-starfish-beehive-qt5.2/BUILD-m14tv/sysroots/m14tv/usr/lib/libQt5Bootstrap.a', needed by `../../lib/libQt5QmlDevTools.a'. Stop.
+WEBOS_NO_STATIC_LIBRARIES_WHITELIST += "libQt5Bootstrap.a"
Please sign in to comment.
Something went wrong with that request. Please try again.