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 /meta | |
| parent | 32cb1b049ec36c8093383f76250eca5438beb2a8 (diff) | |
| download | openembedded-core-4853c362a97ee91a348b0c16dfc07990120be487.tar.gz openembedded-core-4853c362a97ee91a348b0c16dfc07990120be487.tar.bz2 openembedded-core-4853c362a97ee91a348b0c16dfc07990120be487.tar.xz openembedded-core-4853c362a97ee91a348b0c16dfc07990120be487.zip | |
Drop libx11-trim patches
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
| -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 99ed57194..000000000 --- a/meta/packages/xorg-lib/libx11-trim/include_fix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- libX11-1.1.5.orig/configure.ac -+++ libX11-1.1.5/configure.ac -@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) - AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) - - # - # Find keysymdef.h - # --AC_MSG_CHECKING([keysymdef.h]) --dir=`pkg-config --variable=includedir xproto` --KEYSYMDEF="$dir/X11/keysymdef.h" -+AC_ARG_WITH(keysymdef, -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), -+ KEYSYMDEF=$withval, KEYSYMDEF="") - if test -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) - else - AC_MSG_ERROR([Cannot find keysymdef.h]) - 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 2a8a55cdf..000000000 --- a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- - src/util/Makefile.am | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: libX11-1.1.2/src/util/Makefile.am -=================================================================== ---- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 -+++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 -@@ -1,21 +1,4 @@ - # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ - --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS=$(X11_CFLAGS) -- --#override CC = gcc --LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT |