diff options
author | Jonathan Liu <net147@gmail.com> | 2013-07-04 09:50:32 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:43:35 +0100 |
commit | f119566477243ce43b727492dc78b9cb3dd76de4 (patch) | |
tree | 54822117191b5a1269a7ad50cc367e1484e6d859 /meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch | |
parent | bb113474bcc9f4733cc5604093e8d7016a35bae9 (diff) | |
download | openembedded-core-f119566477243ce43b727492dc78b9cb3dd76de4.tar.gz |
qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch deleted file mode 100644 index 98fc88738f..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5e6b1051afa3099a02a758b0596236759d70670e Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Wed, 26 Sep 2012 20:18:08 +0200 -Subject: [PATCH 02/21] qkbdtty_qws: fix build with old kernel headers - -This issue is that with C++ compiler process an old version of kernel -header file, coincidently that file has a variable named 'new': - -* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h'; -* '/usr/include/linux/vt.h' has below code on SLED-11.x: - + unsigned int new; - -On mostly hosts it has been changed to: new -> newev. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp -index a46811b..762138f 100644 ---- a/src/gui/embedded/qkbdtty_qws.cpp -+++ b/src/gui/embedded/qkbdtty_qws.cpp -@@ -54,8 +54,20 @@ - - #if defined Q_OS_LINUX - # include <linux/kd.h> -+ -+/* Workaround kernel headers using "new" as variable name. The problem -+ is specific to SLED-11, other distros use "newev" rather than "new" */ -+#ifdef __cplusplus -+#warning "workaround kernel headers using new as variable name on SLED 11" -+#define new newev -+#endif -+ - # include <linux/vt.h> //TODO: move vt handling somewhere else (QLinuxFbScreen?) - -+#ifdef __cplusplus -+#undef new -+#endif -+ - # include "qscreen_qws.h" - # include "qwindowsystem_qws.h" - # include "qapplication.h" --- -1.8.0 - |