xserver-xorg 1.7.4: OpenPandora HACK! - Temp! - Do NOT put into mainline.

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 (file)
index 0000000..36c4075
--- /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 41f0afc..0bffcb5 100644 (file)
--- 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
 }