summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 09:58:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:37 +0100
commitdf2a7dbeed6bb75056b3668f9fe34f5aa30e9bdc (patch)
tree55ee3b9db26f1935b4e638e2184b7f6bd650bd69 /meta/recipes-graphics/xorg-lib/libx11
parent2ee903a73804f16e844c98285962123413bc457b (diff)
downloadpoky-df2a7dbeed6bb75056b3668f9fe34f5aa30e9bdc.tar.gz
libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory
(From OE-Core rev: 3859ae3fb0164c88223f072578a5295070bdce2a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/include_fix.patch25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/nodolt.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch31
3 files changed, 0 insertions, 70 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
deleted file mode 100644
index b3bcbabfeb..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7--- libX11-1.1.5.orig/configure.ac
8+++ libX11-1.1.5/configure.ac
9@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
10 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
11
12 #
13 # Find keysymdef.h
14 #
15-AC_MSG_CHECKING([keysymdef.h])
16-dir=`pkg-config --variable=includedir xproto`
17-KEYSYMDEF="$dir/X11/keysymdef.h"
18+AC_ARG_WITH(keysymdef,
19+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
20+ KEYSYMDEF=$withval, KEYSYMDEF="")
21 if test -f "$KEYSYMDEF"; then
22 AC_MSG_RESULT([$KEYSYMDEF])
23 else
24 AC_MSG_ERROR([Cannot find keysymdef.h])
25 fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
deleted file mode 100644
index cc05fdca7e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libX11-1.2.1/configure.ac
4===================================================================
5--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
6+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
7@@ -20,7 +20,6 @@
8
9 # Checks for programs.
10 AC_PROG_LIBTOOL
11-DOLT
12 AC_PROG_CC
13 XORG_CWARNFLAGS
14
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
deleted file mode 100644
index 04458359e4..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/util/Makefile.am | 17 -----------------
5 1 file changed, 17 deletions(-)
6
7Index: libX11-1.2.1/src/util/Makefile.am
8===================================================================
9--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
10+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
11@@ -1,20 +1,3 @@
12 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
13
14-noinst_PROGRAMS=makekeys
15-
16-makekeys_CFLAGS=$(X11_CFLAGS)
17-
18-CC = @CC_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