On 12/03/2014 06:43, Peter Hutterer wrote: > On Fri, Mar 07, 2014 at 02:32:27PM -0800, Kristian Høgsberg wrote: >> From: Rui Matos >> >> This will also make it useful for cases when we have a new keymap to >> apply to a device but don't have a source device. >> >> Reviewed-by: Kristian Høgsberg <krh-1OA22m9ORUweIZ0/[email protected]> > > merged, thanks.
>> diff --git a/include/xkbsrv.h b/include/xkbsrv.h >> index 253612e..5d8e409 100644 >> --- a/include/xkbsrv.h >> +++ b/include/xkbsrv.h >> @@ -820,8 +820,8 @@ extern _X_EXPORT void >> XkbSendNewKeyboardNotify(DeviceIntPtr /* kbd */ , >> extern Bool XkbCopyKeymap(XkbDescPtr /* dst */ , >> XkbDescPtr /* src */ ); >> >> -extern _X_EXPORT Bool XkbCopyDeviceKeymap(DeviceIntPtr /* dst */ , >> - DeviceIntPtr /* src */ ); >> +extern _X_EXPORT Bool XkbDeviceApplyKeymap(DeviceIntPtr /* dst */ , >> + XkbDescPtr /* src */ ); This removes XkbCopyDeviceKeymap() from the server's exported symbols generated with sdksyms, but it is used by xf86-video-nested. Not sure how to fix this, but Google turns up a fedora patch [2] to restore it. [1] http://tinderbox.x.org/builds/2014-03-24-0010/logs/xf86-video-nested/#build [2] https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20131104/1141772.html _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
