diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 15:04:00 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 15:04:00 +0100 |
commit | 4853c362a97ee91a348b0c16dfc07990120be487 (patch) | |
tree | c072f4a76a82ed41d84717b58ea9c731d2f9cb0e | |
parent | 32cb1b049ec36c8093383f76250eca5438beb2a8 (diff) | |
download | poky-4853c362a97ee91a348b0c16dfc07990120be487.tar.gz |
Drop libx11-trim patches
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/xorg-lib/libx11-trim/include_fix.patch | 23 | ||||
-rw-r--r-- | meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch | 30 |
2 files changed, 0 insertions, 53 deletions
diff --git a/meta/packages/xorg-lib/libx11-trim/include_fix.patch b/meta/packages/xorg-lib/libx11-trim/include_fix.patch deleted file mode 100644 index 99ed57194e..0000000000 --- a/meta/packages/xorg-lib/libx11-trim/include_fix.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | --- | ||
2 | configure.ac | 6 +++--- | ||
3 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
4 | |||
5 | --- libX11-1.1.5.orig/configure.ac | ||
6 | +++ libX11-1.1.5/configure.ac | ||
7 | @@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) | ||
8 | AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) | ||
9 | |||
10 | # | ||
11 | # Find keysymdef.h | ||
12 | # | ||
13 | -AC_MSG_CHECKING([keysymdef.h]) | ||
14 | -dir=`pkg-config --variable=includedir xproto` | ||
15 | -KEYSYMDEF="$dir/X11/keysymdef.h" | ||
16 | +AC_ARG_WITH(keysymdef, | ||
17 | + AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), | ||
18 | + KEYSYMDEF=$withval, KEYSYMDEF="") | ||
19 | if test -f "$KEYSYMDEF"; then | ||
20 | AC_MSG_RESULT([$KEYSYMDEF]) | ||
21 | else | ||
22 | AC_MSG_ERROR([Cannot find keysymdef.h]) | ||
23 | fi | ||
diff --git a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch deleted file mode 100644 index 2a8a55cdf5..0000000000 --- a/meta/packages/xorg-lib/libx11-trim/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 | ||