diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 14:28:29 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 14:28:29 +0100 |
| commit | 5377e4fa3a003b7dcfce1b153ee9c1b9ddc2537f (patch) | |
| tree | 6ce4ecebd391e72a0302100ba1933c3be9438879 /meta/packages/xorg-lib/libx11 | |
| parent | 136fecf7af7f98edc2302f0896442cba82342b72 (diff) | |
| download | poky-5377e4fa3a003b7dcfce1b153ee9c1b9ddc2537f.tar.gz | |
libx11 1.1.5 -> 1.2.1
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/xorg-lib/libx11')
| -rw-r--r-- | meta/packages/xorg-lib/libx11/nodolt.patch | 12 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/meta/packages/xorg-lib/libx11/nodolt.patch b/meta/packages/xorg-lib/libx11/nodolt.patch new file mode 100644 index 0000000000..ecf9625cad --- /dev/null +++ b/meta/packages/xorg-lib/libx11/nodolt.patch | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | Index: libX11-1.2.1/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 | ||
| 4 | +++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 | ||
| 5 | @@ -20,7 +20,6 @@ | ||
| 6 | |||
| 7 | # Checks for programs. | ||
| 8 | AC_PROG_LIBTOOL | ||
| 9 | -DOLT | ||
| 10 | AC_PROG_CC | ||
| 11 | XORG_CWARNFLAGS | ||
| 12 | |||
diff --git a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch index 2a8a55cdf5..670578257c 100644 --- a/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch +++ b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch | |||
| @@ -2,22 +2,21 @@ | |||
| 2 | src/util/Makefile.am | 17 ----------------- | 2 | src/util/Makefile.am | 17 ----------------- |
| 3 | 1 file changed, 17 deletions(-) | 3 | 1 file changed, 17 deletions(-) |
| 4 | 4 | ||
| 5 | Index: libX11-1.1.2/src/util/Makefile.am | 5 | Index: libX11-1.2.1/src/util/Makefile.am |
| 6 | =================================================================== | 6 | =================================================================== |
| 7 | --- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 | 7 | --- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100 |
| 8 | +++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 | 8 | +++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100 |
| 9 | @@ -1,21 +1,4 @@ | 9 | @@ -1,20 +1,3 @@ |
| 10 | # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ | 10 | # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ |
| 11 | 11 | ||
| 12 | -noinst_PROGRAMS=makekeys | 12 | -noinst_PROGRAMS=makekeys |
| 13 | - | 13 | - |
| 14 | -makekeys_CFLAGS=$(X11_CFLAGS) | 14 | -makekeys_CFLAGS=$(X11_CFLAGS) |
| 15 | - | 15 | - |
| 16 | -#override CC = gcc | 16 | -CC = @CC_FOR_BUILD@ |
| 17 | -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ | ||
| 18 | - | 17 | - |
| 19 | EXTRA_DIST = mkks.sh | 18 | EXTRA_DIST = mkks.sh |
| 20 | 19 | - | |
| 21 | -if LINT | 20 | -if LINT |
| 22 | -# Check source code with tools like lint & sparse | 21 | -# Check source code with tools like lint & sparse |
| 23 | - | 22 | - |