libx11: Upgrade to 1.1.5, rename diet-x11 to libx11-diet for consistent naming. Create common .inc file for diet,trim and full-fat version versions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5320 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 30 insertions, 0 deletions

diff --git a/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..2a8a55cdf5
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
@@ -0,0 +1,30 @@
+---
+ 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