libx11: upgrade to the latest version 1.3.4
Rebased the 3 patches x11_disable_makekeys.patch, nodolt.patch and include_fix.patch; since the patches are also used by other recipes of lower versions, I created a new directory libx11-1.3.4/ to hold the rebased patches (the original patches are still kept unchanged); Updated LICENSE and LIC_FILES_CHKSUM, and reset PR to "r0"; Removed "patch=1" in SRC_URI as by default a patch is applied; Updated preferred-xorg-versions.inc. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
This commit is contained in:
parent
40421c1024
commit
fb02061ece
|
@ -34,10 +34,10 @@ PREFERRED_VERSION_liblbxutil ?= "1.1.0"
|
|||
PREFERRED_VERSION_liboldx ?= "1.0.1"
|
||||
PREFERRED_VERSION_libsm ?= "1.1.1"
|
||||
PREFERRED_VERSION_libwindowswm ?= "1.0.0"
|
||||
PREFERRED_VERSION_libx11 ?= "1.3"
|
||||
PREFERRED_VERSION_libx11 ?= "1.3.4"
|
||||
PREFERRED_VERSION_libx11-diet ?= "1.3"
|
||||
PREFERRED_VERSION_libx11-native ?= "1.3"
|
||||
PREFERRED_VERSION_libx11-nativesdk ?= "1.3"
|
||||
PREFERRED_VERSION_libx11-native ?= "1.3.4"
|
||||
PREFERRED_VERSION_libx11-nativesdk ?= "1.3.4"
|
||||
PREFERRED_VERSION_libx11-trim ?= "1.3"
|
||||
PREFERRED_VERSION_libxau ?= "1.0.5"
|
||||
PREFERRED_VERSION_libxau-native ?= "1.0.5"
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- libX11-1.3.4.orig/configure.ac
|
||||
+++ libX11-1.3.4/configure.ac
|
||||
@@ -353,9 +353,9 @@
|
||||
#
|
||||
# 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
|
|
@ -0,0 +1,10 @@
|
|||
--- libX11-1.3.4.orig/configure.ac
|
||||
+++ libX11-1.3.4/configure.ac
|
||||
@@ -32,7 +32,6 @@
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_LIBTOOL
|
||||
-DOLT
|
||||
AC_PROG_CC
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
---
|
||||
src/util/Makefile.am | 21 -----------------
|
||||
1 file changed, 21 deletions(-)
|
||||
|
||||
--- libX11-1.3.4.orig/src/util/Makefile.am
|
||||
+++ libX11-1.3.4/src/util/Makefile.am
|
||||
@@ -1,24 +1,3 @@
|
||||
|
||||
-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
|
|
@ -1,6 +1,7 @@
|
|||
DESCRIPTION = "X11 protocol and utility library"
|
||||
|
||||
require xorg-lib-common.inc
|
||||
|
||||
DESCRIPTION = "X11 protocol and utility library"
|
||||
PROVIDES = "virtual/libx11"
|
||||
|
||||
XORG_PN = "libX11"
|
||||
|
|
|
@ -1,11 +1,14 @@
|
|||
require libx11.inc
|
||||
|
||||
PE = "1"
|
||||
PR = "r2"
|
||||
LICENSE = "MIT & MIT-style & BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
|
||||
|
||||
SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
|
||||
file://nodolt.patch;patch=1 \
|
||||
file://include_fix.patch;patch=1"
|
||||
PE = "1"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI += "file://x11_disable_makekeys.patch \
|
||||
file://nodolt.patch \
|
||||
file://include_fix.patch"
|
||||
|
||||
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
|
||||
libxdmcp xf86bigfontproto kbproto inputproto xproto-native gettext"
|
Loading…
Reference in New Issue