diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2011-05-11 11:01:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-13 10:28:59 +0100 |
commit | fc1859ea661d77067774c7fa3c1cbd49cebf90d3 (patch) | |
tree | 4d0376ab86a09fb7d3eb01eb7708b762b2545acb /meta/recipes-graphics/xorg-lib/libx11 | |
parent | 6a7b1fe1bb3b723f7c985978660628d0c0d39922 (diff) | |
download | poky-fc1859ea661d77067774c7fa3c1cbd49cebf90d3.tar.gz |
recpies: add Upstream-Status for multiple recipes' patches
tcf-agent: update its patch's Upstream-Status
screen: update its patch's Upstream-Status
which (GPLv2): update its patch's Upstream-Status
gnome-vfs: update its patch's Upstream-Status
libart-lgpl: update its patch's Upstream-Status
librsvg: update its patch's Upstream-Status
fontconfig: update its patch's Upstream-Status
freetype: update its patch's Upstream-Status
libxsettings-client: update its patch's Upstream-Status
libxcb: update its patch's Upstream-Status
libx11: update its patch's Upstream-Status
- remove 2 unused xim.patch.
libx11-trim: update its patch's Upstream-Status
libxcalibrate: update its patch's Upstream-Status
libxcomposite: update its patch's Upstream-Status
libxfont: update its patch's Upstream-Status
xtrans: update its patch's Upstream-Status
- remove abstract_socket_fix.patch as it's not used at all for long.
calibrateproto: update its patch's Upstream-Status
latencytop: update its patch's Upstream-Status
powertop: update its patch's Upstream-Status
settings-daemon: update its patch's Upstream-Status
gnome-settings-daemon: update its patch's Upstream-Status
libxklavier: update its patch's Upstream-Status
liblbxutil: update its patch's Upstream-Status
oprofile: update its patch's Upstream-Status and remove an unused patch
- delete xml_callgraph_details.patch as it's not used at all.
(From OE-Core rev: 94991fb73586887bfc740eacf190032dfb206a65)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
7 files changed, 11 insertions, 55 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff index 54b1727a95..2e86a48c2b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 | 3 | --- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 |
2 | +++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 | 4 | +++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 |
3 | @@ -83,6 +83,7 @@ | 5 | @@ -83,6 +83,7 @@ |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff index 9dbf6dac68..7dcdd6af22 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
1 | --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 | 3 | --- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 |
2 | +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 | 4 | +++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 |
3 | @@ -701,7 +701,11 @@ | 5 | @@ -701,7 +701,11 @@ |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch index a098db1941..26d3349bed 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch | |||
@@ -1,3 +1,4 @@ | |||
1 | Upstream-Status: Pending | ||
1 | 2 | ||
2 | # | 3 | # |
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | 4 | # Patch managed by http://www.holgerschurig.de/patcher.html |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch index 99ed57194e..b3bcbabfeb 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | --- | 3 | --- |
2 | configure.ac | 6 +++--- | 4 | configure.ac | 6 +++--- |
3 | 1 file changed, 3 insertions(+), 3 deletions(-) | 5 | 1 file changed, 3 insertions(+), 3 deletions(-) |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch index ecf9625cad..cc05fdca7e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: libX11-1.2.1/configure.ac | 3 | Index: libX11-1.2.1/configure.ac |
2 | =================================================================== | 4 | =================================================================== |
3 | --- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 | 5 | --- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch index 670578257c..04458359e4 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | --- | 3 | --- |
2 | src/util/Makefile.am | 17 ----------------- | 4 | src/util/Makefile.am | 17 ----------------- |
3 | 1 file changed, 17 deletions(-) | 5 | 1 file changed, 17 deletions(-) |
diff --git a/meta/recipes-graphics/xorg-lib/libx11/xim.patch b/meta/recipes-graphics/xorg-lib/libx11/xim.patch deleted file mode 100644 index 0eab197a80..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/xim.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | --- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000 | ||
2 | +++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000 | ||
3 | @@ -90,6 +90,52 @@ | ||
4 | return; | ||
5 | } | ||
6 | |||
7 | +XIM | ||
8 | +XOpenIM ( | ||
9 | + Display* display, | ||
10 | + struct _XrmHashBucketRec* rdb, | ||
11 | + char* res_name, | ||
12 | + char* res_class) | ||
13 | +{ | ||
14 | + return (XIM) NULL; | ||
15 | +} | ||
16 | + | ||
17 | +Status | ||
18 | +XCloseIM ( XIM im ) | ||
19 | +{ | ||
20 | + return NULL; | ||
21 | +} | ||
22 | + | ||
23 | +XIC | ||
24 | +XCreateIC ( XIM im, ...) | ||
25 | +{ | ||
26 | + return NULL; | ||
27 | +} | ||
28 | + | ||
29 | +void | ||
30 | +XDestroyIC ( XIC ic ) | ||
31 | +{ | ||
32 | + return; | ||
33 | +} | ||
34 | + | ||
35 | +int | ||
36 | +XmbLookupString ( | ||
37 | + XIC ic, | ||
38 | + XKeyPressedEvent* ev, | ||
39 | + char* buffer, | ||
40 | + int nbytes, | ||
41 | + KeySym* keysym, | ||
42 | + Status* status) | ||
43 | +{ | ||
44 | + return XLookupNone; | ||
45 | +} | ||
46 | + | ||
47 | +char * | ||
48 | +XGetICValues( XIC ic, ...) | ||
49 | +{ | ||
50 | + return (char *) NULL; | ||
51 | +} | ||
52 | + | ||
53 | XPointer | ||
54 | _XimGetLocaleCode ( _Xconst char* encoding_name ) | ||
55 | { | ||