summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch')
-rw-r--r--recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
deleted file mode 100644
index 0571ea5e..00000000
--- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 19 Feb 2013 11:16:05 -0800
4Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency
5
6Not all platforms that use qtwayland depend on xcbcommon to be present
7for them to be functional
8
9This change won't be needed when this commit from dev branch is merged
10to stable:
11commit 894adf8a447865119be7c6c4d01577d8032f4177
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Mon Apr 8 12:54:58 2013 +0200
14
15make failure to configure wayland non-fatal for a top-level build of qt
16
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18---
19 qtwayland.pro | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/qtwayland.pro b/qtwayland.pro
23index 24e104b..66dd38a 100644
24--- a/qtwayland.pro
25+++ b/qtwayland.pro
26@@ -11,7 +11,7 @@ qtCompileTest(xcomposite)
27 load(qt_parts)
28
29 !config_wayland {
30- error(QtWayland requires Wayland 1.0.3 or higher)
31+ error("QtWayland requires Wayland 1.0.3 or higher")
32 }
33
34 !config_xkbcommon {
35@@ -19,7 +19,7 @@ load(qt_parts)
36 }
37
38 !config_wayland_scanner {
39- error(QtWayland requires wayland-scanner)
40+ error("QtWayland requires wayland-scanner")
41 }
42
43 !config_wayland_egl {
44--
451.8.2.1
46