diff options
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 6 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch | 19 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch | 10 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch | 31 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11.inc | 3 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11_1.3.4.bb (renamed from meta/packages/xorg-lib/libx11_1.3.bb) | 11 |
6 files changed, 72 insertions, 8 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 1085c6309b..060c8b7ecb 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -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" diff --git a/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch new file mode 100644 index 0000000000..c8aa08595d --- /dev/null +++ b/meta/packages/xorg-lib/libx11-1.3.4/include_fix.patch @@ -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 diff --git a/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch new file mode 100644 index 0000000000..011c23e8d8 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-1.3.4/nodolt.patch @@ -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 + diff --git a/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch new file mode 100644 index 0000000000..4036757e54 --- /dev/null +++ b/meta/packages/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch @@ -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 diff --git a/meta/packages/xorg-lib/libx11.inc b/meta/packages/xorg-lib/libx11.inc index 3c8d4f9592..f8c17b1a6d 100644 --- a/meta/packages/xorg-lib/libx11.inc +++ b/meta/packages/xorg-lib/libx11.inc @@ -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" diff --git a/meta/packages/xorg-lib/libx11_1.3.bb b/meta/packages/xorg-lib/libx11_1.3.4.bb index ff62d90464..aaeb38e2d6 100644 --- a/meta/packages/xorg-lib/libx11_1.3.bb +++ b/meta/packages/xorg-lib/libx11_1.3.4.bb @@ -1,11 +1,14 @@ require libx11.inc +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5" + PE = "1" -PR = "r2" +PR = "r0" -SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ - file://nodolt.patch;patch=1 \ - file://include_fix.patch;patch=1" +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" |