From fb02061ecea0bf6cc6c4a309627a16d759a9c83e Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 9 Jul 2010 13:32:10 +0800 Subject: libx11: upgrade to the latest version 1.3.4 Rebased the 3 patches x11_disable_makekeys.patch, nodolt.patch and include_fix.patch; since the patches are also used by other recipes of lower versions, I created a new directory libx11-1.3.4/ to hold the rebased patches (the original patches are still kept unchanged); Updated LICENSE and LIC_FILES_CHKSUM, and reset PR to "r0"; Removed "patch=1" in SRC_URI as by default a patch is applied; Updated preferred-xorg-versions.inc. Signed-off-by: Dexuan Cui --- .../libx11-1.3.4/x11_disable_makekeys.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch (limited to 'meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch') diff --git a/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch new file mode 100644 index 0000000000..4036757e54 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch @@ -0,0 +1,31 @@ +--- + src/util/Makefile.am | 21 ----------------- + 1 file changed, 21 deletions(-) + +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1,3 @@ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + 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 -- cgit v1.2.3-54-g00ecf