From 3abe41b139e3613ff875ef75e6124e38b19ba24c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 2 Jul 2009 15:10:50 +0100 Subject: libx11-trim: Fix patches properly this time Signed-off-by: Richard Purdie --- .../xorg-lib/libx11-trim/include_fix.patch | 23 +++++++++++++++++ meta/packages/xorg-lib/libx11-trim/nodolt.patch | 12 +++++++++ .../libx11-trim/x11_disable_makekeys.patch | 29 ++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 meta/packages/xorg-lib/libx11-trim/include_fix.patch create mode 100644 meta/packages/xorg-lib/libx11-trim/nodolt.patch create mode 100644 meta/packages/xorg-lib/libx11-trim/x11_disable_makekeys.patch (limited to 'meta') 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 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + 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 @@ +Index: libX11-1.2.1/configure.ac +=================================================================== +--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 ++++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100 +@@ -20,7 +20,6 @@ + + # Checks for programs. + AC_PROG_LIBTOOL +-DOLT + AC_PROG_CC + XORG_CWARNFLAGS + 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 @@ +--- + src/util/Makefile.am | 17 ----------------- + 1 file changed, 17 deletions(-) + +Index: libX11-1.2.1/src/util/Makefile.am +=================================================================== +--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100 ++++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100 +@@ -1,20 +1,3 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-CC = @CC_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