From df2a7dbeed6bb75056b3668f9fe34f5aa30e9bdc Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 3 Oct 2011 09:58:05 +0200 Subject: 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 Signed-off-by: Richard Purdie --- .../xorg-lib/libx11-diet-1.3/include_fix.patch | 25 +++++++++++++++++ .../xorg-lib/libx11-diet-1.3/nodolt.patch | 14 ++++++++++ .../libx11-diet-1.3/x11_disable_makekeys.patch | 31 ++++++++++++++++++++++ meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 1 - .../xorg-lib/libx11/include_fix.patch | 25 ----------------- meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 14 ---------- .../xorg-lib/libx11/x11_disable_makekeys.patch | 31 ---------------------- 7 files changed, 70 insertions(+), 71 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/include_fix.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch new file mode 100644 index 0000000..b3bcbab --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch @@ -0,0 +1,25 @@ +Upstream-Status: Inappropriate [configuration] + +--- + 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/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch new file mode 100644 index 0000000..cc05fdc --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch @@ -0,0 +1,14 @@ +Upstream-Status: Inappropriate [configuration] + +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/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch new file mode 100644 index 0000000..0445835 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch @@ -0,0 +1,31 @@ +Upstream-Status: Inappropriate [configuration] + +--- + 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 diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb index d97a5b8..de7edf1 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb @@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2 DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale" CFLAGS += "-D_GNU_SOURCE" 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 b3bcbab..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - 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/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch deleted file mode 100644 index cc05fdc..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -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/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 0445835..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - 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.1