mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 07:41:50 -04:00
47be7a61c9
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2] Approved by: portmgr (bdrewery), core (jhb) [0]
24 lines
618 B
C
24 lines
618 B
C
Index: src/kbd.c
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#include "xf86.h"
|
|
#include "atKeynames.h"
|
|
+#include "xf86Priv.h"
|
|
#include "xf86Privstr.h"
|
|
|
|
#include <X11/extensions/XI.h>
|
|
@@ -392,6 +393,14 @@
|
|
RemoveEnabledDevice(pInfo->fd);
|
|
pKbd->KbdOff(pInfo, what);
|
|
device->public.on = FALSE;
|
|
+ /*
|
|
+ * Close device file for keyboards which are not attached
|
|
+ * to console, otherwise they can't be opened again after
|
|
+ * relogin when using session manager like xdm.
|
|
+ * X server will take care about console attached keyboards.
|
|
+ */
|
|
+ if (pInfo->fd != xf86Info.consoleFd)
|
|
+ close(pInfo->fd);
|
|
break;
|
|
|
|
default:
|