summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-02 15:10:50 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-02 15:10:50 +0100
commit3abe41b139e3613ff875ef75e6124e38b19ba24c (patch)
tree4909d401090ad54ca73aab29204d06e414410a88
parent3f8c6e69606c601488b424b19e59e184a0409304 (diff)
downloadpoky-3abe41b139e3613ff875ef75e6124e38b19ba24c.tar.gz
libx11-trim: Fix patches properly this time
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/xorg-lib/libx11-trim/include_fix.patch23
-rw-r--r--meta/packages/xorg-lib/libx11-trim/nodolt.patch12
-rw-r--r--meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch29
3 files changed, 64 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/libx11-trim/include_fix.patch b/meta/packages/xorg-lib/libx11-trim/include_fix.patch
new file mode 100644
index 0000000000..99ed57194e
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/include_fix.patch
@@ -0,0 +1,23 @@
1---
2 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5--- libX11-1.1.5.orig/configure.ac
6+++ libX11-1.1.5/configure.ac
7@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
8 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
9
10 #
11 # Find keysymdef.h
12 #
13-AC_MSG_CHECKING([keysymdef.h])
14-dir=`pkg-config --variable=includedir xproto`
15-KEYSYMDEF="$dir/X11/keysymdef.h"
16+AC_ARG_WITH(keysymdef,
17+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
18+ KEYSYMDEF=$withval, KEYSYMDEF="")
19 if test -f "$KEYSYMDEF"; then
20 AC_MSG_RESULT([$KEYSYMDEF])
21 else
22 AC_MSG_ERROR([Cannot find keysymdef.h])
23 fi
diff --git a/meta/packages/xorg-lib/libx11-trim/nodolt.patch b/meta/packages/xorg-lib/libx11-trim/nodolt.patch
new file mode 100644
index 0000000000..ecf9625cad
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/nodolt.patch
@@ -0,0 +1,12 @@
1Index: 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-trim/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..670578257c
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
1---
2 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-)
4
5Index: libX11-1.2.1/src/util/Makefile.am
6===================================================================
7--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
8+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
9@@ -1,20 +1,3 @@
10 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
11
12-noinst_PROGRAMS=makekeys
13-
14-makekeys_CFLAGS=$(X11_CFLAGS)
15-
16-CC = @CC_FOR_BUILD@
17-
18 EXTRA_DIST = mkks.sh
19-
20-if LINT
21-# Check source code with tools like lint & sparse
22-
23-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
24- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
25-
26-lint:
27- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
28-
29-endif LINT