diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-19 14:22:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:47 +0000 |
commit | 1f71583dacaf2abde4930815b3415c3af104f514 (patch) | |
tree | 205b617c5ad55675e2a050ace6c933e29d30ecf2 /meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch | |
parent | 4e2de8f749103a54d51f627e75401b70bb41d47c (diff) | |
download | poky-1f71583dacaf2abde4930815b3415c3af104f514.tar.gz |
qt4: remove 4.8.1
(From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch deleted file mode 100644 index bdd5d4fc84..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 5cc08e33ea7ab5d32b6a14ccb23a366d56e50ea1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
3 | Date: Wed, 26 Sep 2012 20:56:33 +0200 | ||
4 | Subject: [PATCH 22/22] webkit: fix conflicting types | ||
5 | |||
6 | This patch fixes the type mismatch fixing this compile issue: | ||
7 | |||
8 | | | ||
9 | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: | ||
10 | error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive] | ||
11 | | In file included from ./wtf/Platform.h:1217:0, | ||
12 | | from ./config.h:30, | ||
13 | | from wtf/gobject/GOwnPtr.cpp:19: | ||
14 | | wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously | ||
15 | declared here | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | --- | ||
21 | src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
25 | index c7f7ac4..f00e9cf 100644 | ||
26 | --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
27 | +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h | ||
28 | @@ -52,7 +52,7 @@ typedef struct _GFile GFile; | ||
29 | typedef struct _GHashTable GHashTable; | ||
30 | typedef struct _GInputStream GInputStream; | ||
31 | typedef struct _GList GList; | ||
32 | -typedef struct _GMutex GMutex; | ||
33 | +typedef union _GMutex GMutex; | ||
34 | typedef struct _GPatternSpec GPatternSpec; | ||
35 | typedef struct _GPollableOutputStream GPollableOutputStream; | ||
36 | typedef struct _GSocketClient GSocketClient; | ||
37 | -- | ||
38 | 1.7.12 | ||
39 | |||