From ac007e838ad766b34271eee33f8415b1e268d43d Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Thu, 11 Feb 2010 13:52:03 +0000 Subject: [PATCH] xserver-xorg 1.7.4: OpenPandora HACK! - Temp! - Do NOT put into mainline. --- .../evil-no-XkbSendNewKeyboardNotify.patch | 14 ++++++++++++++ recipes/xorg-xserver/xserver-xorg_1.7.4.bb | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.4/evil-no-XkbSendNewKeyboardNotify.patch diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/evil-no-XkbSendNewKeyboardNotify.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/evil-no-XkbSendNewKeyboardNotify.patch new file mode 100644 index 0000000000..36c4075002 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/evil-no-XkbSendNewKeyboardNotify.patch @@ -0,0 +1,14 @@ +diff -urp xorg-server-1.7.4_orig/xkb/xkbUtils.c xorg-server-1.7.4/xkb/xkbUtils.c +--- xorg-server-1.7.4_orig/xkb/xkbUtils.c 2010-01-08 00:44:57.000000000 +0200 ++++ xorg-server-1.7.4/xkb/xkbUtils.c 2010-02-11 13:05:52.000000000 +0200 +@@ -2112,8 +2112,8 @@ XkbCopyDeviceKeymap(DeviceIntPtr dst, De + nkn.changed |= XkbNKN_GeometryMask; + + ret = XkbCopyKeymap(dst->key->xkbInfo->desc, src->key->xkbInfo->desc); +- if (ret) +- XkbSendNewKeyboardNotify(dst, &nkn); ++// if (ret) ++// XkbSendNewKeyboardNotify(dst, &nkn); + + return ret; + } diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb index 41f0afc6d9..0bffcb566a 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto" PE = "2" -PR = "${INC_PR}.2" +PR = "${INC_PR}.1" SRC_URI += "file://sysroot_fix.patch \ file://dolt-fix.patch \ @@ -14,6 +14,9 @@ SRC_URI += "file://sysroot_fix.patch \ SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" +# OpenPandora HACK! - Temp! - Do NOT put into mainline. +SRC_URI_append_omap3-pandora = " file://evil-no-XkbSendNewKeyboardNotify.patch;patch=1" + do_install_prepend() { mkdir -p ${D}/${libdir}/X11/fonts } -- 2.39.5