diff options
author | Ross Burton <ross@openedhand.com> | 2008-02-11 22:11:12 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-02-11 22:11:12 +0000 |
commit | 162f879a0c74aa46fe890022af300381e6ed3cc6 (patch) | |
tree | 35f750e6e939506c469623d20e43a215aa45d48f /meta/packages/xorg-lib/files | |
parent | c490cc596a503a4e3935e13a407406636a3df15d (diff) | |
download | poky-162f879a0c74aa46fe890022af300381e6ed3cc6.tar.gz |
Patch re-jiggle to remove unused and duplicates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3767 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/files')
3 files changed, 0 insertions, 68 deletions
diff --git a/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065e..0000000000 --- a/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 | ||
2 | +++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 | ||
3 | @@ -56,7 +56,7 @@ | ||
4 | #include <stdio.h> | ||
5 | |||
6 | #ifndef ERRORDB | ||
7 | -#define ERRORDB "/usr/lib/X11/XErrorDB" | ||
8 | +#define ERRORDB "/usr/share/X11/XErrorDB" | ||
9 | #endif | ||
10 | |||
11 | /* | ||
12 | --- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 | ||
13 | +++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 | ||
14 | @@ -36,7 +36,7 @@ | ||
15 | #include "Key.h" | ||
16 | |||
17 | #ifndef KEYSYMDB | ||
18 | -#define KEYSYMDB "/usr/lib/X11/XKeysymDB" | ||
19 | +#define KEYSYMDB "/usr/share/X11/XKeysymDB" | ||
20 | #endif | ||
21 | |||
22 | static Bool initialized; | ||
diff --git a/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba92..0000000000 --- a/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define | ||
7 | +++ libX11-6.2.1/include/X11/Xlib.h | ||
8 | @@ -100,7 +100,7 @@ | ||
9 | |||
10 | /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in | ||
11 | November 2000. Its presence is indicated through the following macro. */ | ||
12 | -#define X_HAVE_UTF8_STRING 1 | ||
13 | +#undef X_HAVE_UTF8_STRING | ||
14 | |||
15 | typedef char *XPointer; | ||
16 | |||
diff --git a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch b/meta/packages/xorg-lib/files/x11_disable_makekeys.patch deleted file mode 100644 index 2a8a55cdf5..0000000000 --- a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | --- | ||
2 | src/util/Makefile.am | 17 ----------------- | ||
3 | 1 file changed, 17 deletions(-) | ||
4 | |||
5 | Index: libX11-1.1.2/src/util/Makefile.am | ||
6 | =================================================================== | ||
7 | --- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 | ||
8 | +++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 | ||
9 | @@ -1,21 +1,4 @@ | ||
10 | # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ | ||
11 | |||
12 | -noinst_PROGRAMS=makekeys | ||
13 | - | ||
14 | -makekeys_CFLAGS=$(X11_CFLAGS) | ||
15 | - | ||
16 | -#override CC = gcc | ||
17 | -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
18 | - | ||
19 | EXTRA_DIST = mkks.sh | ||
20 | |||
21 | -if LINT | ||
22 | -# Check source code with tools like lint & sparse | ||
23 | - | ||
24 | -ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
25 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) | ||
26 | - | ||
27 | -lint: | ||
28 | - $(LINT) $(ALL_LINT_FLAGS) makekeys.c | ||
29 | - | ||
30 | -endif LINT | ||