mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore * remove older versions from libx11-trim directory * notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has --with-xcb (From OE-Core rev: ccebeb736c785cc6ade075798a1d5c27f106d780) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
dc64df6c17
commit
2ee903a738
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -9,10 +9,10 @@ PR = "r2"
|
||||
|
||||
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
|
||||
|
||||
SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
|
||||
file://../libx11-${PV}/include_fix.patch \
|
||||
file://../libx11-${PV}/nodolt.patch \
|
||||
file://../libx11-${PV}/makekeys_crosscompile.patch"
|
||||
SRC_URI += "file://x11_disable_makekeys.patch \
|
||||
file://include_fix.patch \
|
||||
file://nodolt.patch \
|
||||
file://makekeys_crosscompile.patch"
|
||||
|
||||
SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
|
||||
SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
|
||||
|
||||
Reference in New Issue
Block a user