diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2010-07-09 13:32:10 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-13 15:21:43 +0100 |
commit | fb02061ecea0bf6cc6c4a309627a16d759a9c83e (patch) | |
tree | 8d7670a5aeb5a7f18f2b7f7ae673246b67bc6ea6 /meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch | |
parent | 40421c1024497cb8729fbfb494c5852ee0dc6992 (diff) | |
download | poky-fb02061ecea0bf6cc6c4a309627a16d759a9c83e.tar.gz |
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 <dexuan.cui@intel.com>
Diffstat (limited to 'meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch')
-rw-r--r-- | meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch | 31 |
1 files changed, 31 insertions, 0 deletions
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 @@ | |||
1 | --- | ||
2 | src/util/Makefile.am | 21 ----------------- | ||
3 | 1 file changed, 21 deletions(-) | ||
4 | |||
5 | --- libX11-1.3.4.orig/src/util/Makefile.am | ||
6 | +++ libX11-1.3.4/src/util/Makefile.am | ||
7 | @@ -1,24 +1,3 @@ | ||
8 | |||
9 | -noinst_PROGRAMS=makekeys | ||
10 | - | ||
11 | -makekeys_CFLAGS = \ | ||
12 | - $(X11_CFLAGS) \ | ||
13 | - $(CWARNFLAGS) | ||
14 | - | ||
15 | -CC = @CC_FOR_BUILD@ | ||
16 | -CPPFLAGS = @CPPFLAGS_FOR_BUILD@ | ||
17 | -CFLAGS = @CFLAGS_FOR_BUILD@ | ||
18 | -LDFLAGS = @LDFLAGS_FOR_BUILD@ | ||
19 | - | ||
20 | EXTRA_DIST = mkks.sh | ||
21 | |||
22 | -if LINT | ||
23 | -# Check source code with tools like lint & sparse | ||
24 | - | ||
25 | -ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | ||
26 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) | ||
27 | - | ||
28 | -lint: | ||
29 | - $(LINT) $(ALL_LINT_FLAGS) makekeys.c | ||
30 | - | ||
31 | -endif LINT | ||