diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 21:00:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:28 +0100 |
commit | aea363afaa193feee774dad30d81c516ea4a98fc (patch) | |
tree | 00b6ca102fe4b7c09da87d482ec04a90d128e03c /meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch | |
parent | 425df23c02b7dad3c843ec9959a51337ab450cd1 (diff) | |
download | poky-aea363afaa193feee774dad30d81c516ea4a98fc.tar.gz |
qt4: replace all local patches with git patches with headers
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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, 39 insertions, 0 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 new file mode 100644 index 0000000000..bdd5d4fc84 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0022-webkit-fix-conflicting-types.patch | |||
@@ -0,0 +1,39 @@ | |||
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 | |||