mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
libx11: add new version 1.4.4
(From OE-Core rev: c3ae134362382fd0db6ee34613b0c258076ef9b6) 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
af0a957760
commit
d2aea41ec2
@@ -0,0 +1,23 @@
|
|||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
|
||||||
|
|
||||||
|
diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
|
||||||
|
--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
|
||||||
|
+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
|
||||||
|
@@ -355,7 +355,14 @@
|
||||||
|
# Find keysymdef.h
|
||||||
|
#
|
||||||
|
AC_MSG_CHECKING([keysym definitions])
|
||||||
|
-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
|
||||||
|
+AC_ARG_WITH(keysymdefdir,
|
||||||
|
+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
|
||||||
|
+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
|
||||||
|
+
|
||||||
|
+if test x$KEYSYMDEFDIR = x; then
|
||||||
|
+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
|
||||||
|
for i in $FILES; do
|
||||||
|
if test -f "$KEYSYMDEFDIR/$i"; then
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
Index: libX11-1.3.4/src/util/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- libX11-1.3.4.orig/src/util/Makefile.am
|
||||||
|
+++ libX11-1.3.4/src/util/Makefile.am
|
||||||
|
@@ -1,24 +1 @@
|
||||||
|
-
|
||||||
|
-noinst_PROGRAMS=makekeys
|
||||||
|
-
|
||||||
|
-makekeys_CFLAGS = \
|
||||||
|
- $(X11_CFLAGS) \
|
||||||
|
- $(CWARNFLAGS)
|
||||||
|
-
|
||||||
|
-CC = @CC_FOR_BUILD@
|
||||||
|
-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
|
||||||
|
-CFLAGS = @CFLAGS_FOR_BUILD@
|
||||||
|
-LDFLAGS = @LDFLAGS_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
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
require libx11.inc
|
||||||
|
inherit gettext
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
|
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
|
||||||
|
|
||||||
|
DEPENDS += "util-macros xtrans libxdmcp libxau \
|
||||||
|
bigreqsproto xproto xextproto xcmiscproto \
|
||||||
|
xf86bigfontproto kbproto inputproto libxcb \
|
||||||
|
xproto-native"
|
||||||
|
|
||||||
|
SRC_URI += " file://keysymdef_include.patch \
|
||||||
|
file://x11_disable_makekeys.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
|
||||||
|
SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
|
||||||
Reference in New Issue
Block a user