x11-servers/xlibre-server: Update to 25.1.7

- Remove obsolete patch files
- x11-drivers/xlibre-xf86-video-intel: Update to 25.0.2
- x11-drivers/xlibre-*: Bump PORTREVISION

With hat:       xlibre
ChangeLog at:  https://github.com/X11Libre/xserver/releases/tag/xlibre-xserver-25.1.7

29 files changed, 40 insertions, 153 deletions

diff --git a/x11-drivers/xlibre-xf86-input-egalax/Makefile b/x11-drivers/xlibre-xf86-input-egalax/Makefile
index c0dbf2918737..5c97a3260e34 100644
--- a/x11-drivers/xlibre-xf86-input-egalax/Makefile
+++ b/x11-drivers/xlibre-xf86-input-egalax/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-egalax
 PORTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-elographics/Makefile b/x11-drivers/xlibre-xf86-input-elographics/Makefile
index be5785e23aa6..f8795875c4b1 100644
--- a/x11-drivers/xlibre-xf86-input-elographics/Makefile
+++ b/x11-drivers/xlibre-xf86-input-elographics/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-elographics
 PORTVERSION=	25.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-evdev/Makefile b/x11-drivers/xlibre-xf86-input-evdev/Makefile
index 3f8724724cb6..9d02d020fc6c 100644
--- a/x11-drivers/xlibre-xf86-input-evdev/Makefile
+++ b/x11-drivers/xlibre-xf86-input-evdev/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-evdev
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-joystick/Makefile b/x11-drivers/xlibre-xf86-input-joystick/Makefile
index 7d9022d24840..7afe689b57c5 100644
--- a/x11-drivers/xlibre-xf86-input-joystick/Makefile
+++ b/x11-drivers/xlibre-xf86-input-joystick/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-joystick
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-keyboard/Makefile b/x11-drivers/xlibre-xf86-input-keyboard/Makefile
index 1fde475261b6..7150ac6397cd 100644
--- a/x11-drivers/xlibre-xf86-input-keyboard/Makefile
+++ b/x11-drivers/xlibre-xf86-input-keyboard/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-keyboard
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-libinput/Makefile b/x11-drivers/xlibre-xf86-input-libinput/Makefile
index 3b955c6dd367..28cf21e3fef8 100644
--- a/x11-drivers/xlibre-xf86-input-libinput/Makefile
+++ b/x11-drivers/xlibre-xf86-input-libinput/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-libinput
 PORTVERSION=	25.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-mouse/Makefile b/x11-drivers/xlibre-xf86-input-mouse/Makefile
index e531f76d4212..1e610d4e77c4 100644
--- a/x11-drivers/xlibre-xf86-input-mouse/Makefile
+++ b/x11-drivers/xlibre-xf86-input-mouse/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-mouse
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-synaptics/Makefile b/x11-drivers/xlibre-xf86-input-synaptics/Makefile
index ef03d34ca3a9..e8fad0806fad 100644
--- a/x11-drivers/xlibre-xf86-input-synaptics/Makefile
+++ b/x11-drivers/xlibre-xf86-input-synaptics/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-synaptics
 PORTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-vmmouse/Makefile b/x11-drivers/xlibre-xf86-input-vmmouse/Makefile
index 61a2869cc6e5..ccbb0d4a6056 100644
--- a/x11-drivers/xlibre-xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xlibre-xf86-input-vmmouse/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-vmmouse
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-void/Makefile b/x11-drivers/xlibre-xf86-input-void/Makefile
index d2814c247a5c..a0e2a3376254 100644
--- a/x11-drivers/xlibre-xf86-input-void/Makefile
+++ b/x11-drivers/xlibre-xf86-input-void/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-void
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-input-wacom/Makefile b/x11-drivers/xlibre-xf86-input-wacom/Makefile
index 23f8797e1dcc..351fa74c7096 100644
--- a/x11-drivers/xlibre-xf86-input-wacom/Makefile
+++ b/x11-drivers/xlibre-xf86-input-wacom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-input-wacom
 PORTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-amdgpu/Makefile b/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
index 3729b6a7b50e..74cd7c682f93 100644
--- a/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
+++ b/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-amdgpu
 PORTVERSION=	25.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-configure.ac b/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-configure.ac
deleted file mode 100644
index 2348d999fc0a..000000000000
--- a/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2026-06-07 07:50:51 UTC
-+++ configure.ac
-@@ -67,6 +67,10 @@ PKG_CHECK_MODULES(GBM, [gbm])
- PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.121])
- PKG_CHECK_MODULES(LIBDRM_AMDGPU, [libdrm_amdgpu >= 2.4.121])
- PKG_CHECK_MODULES(GBM, [gbm])
-+PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0], [LIBPCIACCESS=yes], [LIBPCIACCESS=no])
-+if test "x$LIBPCIACCESS" = xyes; then
-+	AC_DEFINE(HAVE_PCI_DEVICE_IS_BOOT_DISPLAY, 1, [libpciaccess support])
-+fi
- 
- # Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0 xproto fontsproto xf86driproto randrproto renderproto xextproto >= 7.0.99.1 $REQUIRED_MODULES])
diff --git a/x11-drivers/xlibre-xf86-video-ast/Makefile b/x11-drivers/xlibre-xf86-video-ast/Makefile
index a86604abc8d1..bbaf4ae3ad38 100644
--- a/x11-drivers/xlibre-xf86-video-ast/Makefile
+++ b/x11-drivers/xlibre-xf86-video-ast/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-ast
 PORTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-ati/Makefile b/x11-drivers/xlibre-xf86-video-ati/Makefile
index 24f177a14736..3b5c497b00fc 100644
--- a/x11-drivers/xlibre-xf86-video-ati/Makefile
+++ b/x11-drivers/xlibre-xf86-video-ati/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xlibre-xf86-video-ati
 PORTVERSION=	25.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-dummy/Makefile b/x11-drivers/xlibre-xf86-video-dummy/Makefile
index eee0373615ae..115ed232530f 100644
--- a/x11-drivers/xlibre-xf86-video-dummy/Makefile
+++ b/x11-drivers/xlibre-xf86-video-dummy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-dummy
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-intel/Makefile b/x11-drivers/xlibre-xf86-video-intel/Makefile
index ea07679cfa8c..8bcccc43660a 100644
--- a/x11-drivers/xlibre-xf86-video-intel/Makefile
+++ b/x11-drivers/xlibre-xf86-video-intel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xlibre-xf86-video-intel
-PORTVERSION=	25.0.1
-PORTREVISION=	4
+PORTVERSION=	25.0.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
@@ -21,8 +20,6 @@ USE_XORG=	pciaccess pixman x11 xcb xinerama xrandr xdamage xcursor xtst xfixes x
 CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no # XXX ports/242236
 TEST_TARGET=	check
 
-GH_TAGNAME=	4bbc49597c938cd0586e7bc0d722e10504ce11ac
-
 # XXX bug 214593: SNA crashes on pre-SandyBridge hardware
 MESON_ARGS+=-Ddefault-accel=uxa -Dbacklight-helper=false
 
diff --git a/x11-drivers/xlibre-xf86-video-intel/distinfo b/x11-drivers/xlibre-xf86-video-intel/distinfo
index 7324a87ec603..1c1dc56f9fbb 100644
--- a/x11-drivers/xlibre-xf86-video-intel/distinfo
+++ b/x11-drivers/xlibre-xf86-video-intel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1772487250
-SHA256 (xlibre/driver/X11Libre-xf86-video-intel-25.0.1-4bbc49597c938cd0586e7bc0d722e10504ce11ac_GH0.tar.gz) = 4b222d4392f5ff2db69e250f8b4143ea91b9370cfe4d4a2c9c308f98bd5d07b0
-SIZE (xlibre/driver/X11Libre-xf86-video-intel-25.0.1-4bbc49597c938cd0586e7bc0d722e10504ce11ac_GH0.tar.gz) = 1680008
+TIMESTAMP = 1781899503
+SHA256 (xlibre/driver/X11Libre-xf86-video-intel-25.0.2-xlibre-xf86-video-intel-25.0.2_GH0.tar.gz) = e4513cf871374cc5df4d0ae5dcd2787539c38801295ab5a9b3470cf0dd193a43
+SIZE (xlibre/driver/X11Libre-xf86-video-intel-25.0.2-xlibre-xf86-video-intel-25.0.2_GH0.tar.gz) = 1678350
diff --git a/x11-drivers/xlibre-xf86-video-intel/files/patch-meson.build b/x11-drivers/xlibre-xf86-video-intel/files/patch-meson.build
index 1e22b1ce6214..263813df15eb 100644
--- a/x11-drivers/xlibre-xf86-video-intel/files/patch-meson.build
+++ b/x11-drivers/xlibre-xf86-video-intel/files/patch-meson.build
@@ -1,22 +1,12 @@
---- meson.build.orig	2026-01-28 14:23:48 UTC
-+++ meson.build
-@@ -23,6 +23,10 @@ pciaccess = dependency('pciaccess', version : '>= 0.10
- pthreads = dependency('threads', required : true)
- pciaccess = dependency('pciaccess', version : '>= 0.10', required : true)
- 
-+if dependency('pciaccess').found()
-+    config.set('HAVE_PCI_DEVICE_IS_BOOT_DISPLAY',1)
-+endif
-+
- x11 = dependency('x11', required : false)
- xfixes = dependency('xfixes', required : false)
- png = dependency('libpng', required : false)
-@@ -88,8 +92,18 @@ endif
+--- meson.build.orig	2026-06-19 13:01:30.058617000 -0700
++++ meson.build	2026-06-19 13:03:32.482425000 -0700
+@@ -88,10 +88,20 @@
    error('xf86-video-intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package.')
  endif
  
 -libudev = dependency('libudev', required : false)
 -if libudev.found()
+-  config.set('HAVE_UDEV', 1)
 +libudev = dependency('libudev', required : get_option('udev') == 'true')
 +with_udev = false
 +if get_option('udev') == 'auto'
@@ -27,12 +17,14 @@
 +  endif
 +else
 +  with_udev = get_option('udev') == 'true'
-+endif
-+if with_udev
-   config.set('HAVE_UDEV', 1)
  endif
++if with_udev
++   config.set('HAVE_UDEV', 1)
++endif
  
-@@ -180,7 +194,7 @@ man_config.set('filemansuffix', '5')
+ cpuid_code = '''
+ #include <cpuid.h>
+@@ -180,7 +190,7 @@
  man_config = configuration_data()
  man_config.set('appmansuffix', '1')
  man_config.set('filemansuffix', '5')
diff --git a/x11-drivers/xlibre-xf86-video-mga/Makefile b/x11-drivers/xlibre-xf86-video-mga/Makefile
index 10db37801856..260a6543ea99 100644
--- a/x11-drivers/xlibre-xf86-video-mga/Makefile
+++ b/x11-drivers/xlibre-xf86-video-mga/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-mga
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-nv/Makefile b/x11-drivers/xlibre-xf86-video-nv/Makefile
index 3d52779c60ad..e759a315951a 100644
--- a/x11-drivers/xlibre-xf86-video-nv/Makefile
+++ b/x11-drivers/xlibre-xf86-video-nv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-nv
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-qxl/Makefile b/x11-drivers/xlibre-xf86-video-qxl/Makefile
index a6690bbaf178..25379dfa00a9 100644
--- a/x11-drivers/xlibre-xf86-video-qxl/Makefile
+++ b/x11-drivers/xlibre-xf86-video-qxl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-qxl
 DISTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-scfb/Makefile b/x11-drivers/xlibre-xf86-video-scfb/Makefile
index f06c1b3b2cf8..4950f03385c3 100644
--- a/x11-drivers/xlibre-xf86-video-scfb/Makefile
+++ b/x11-drivers/xlibre-xf86-video-scfb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-scfb
 PORTVERSION=	25.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-vesa/Makefile b/x11-drivers/xlibre-xf86-video-vesa/Makefile
index f6a5459c8fde..cedc6b33c1e0 100644
--- a/x11-drivers/xlibre-xf86-video-vesa/Makefile
+++ b/x11-drivers/xlibre-xf86-video-vesa/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	xlibre-xf86-video-vesa
 PORTVERSION=	25.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
 COMMENT=	XLibre vesa display driver
-WWW=		https://githhub.com/X11Libre/xf86-video-vesa
+WWW=		https://github.com/X11Libre/xf86-video-vesa
 
 ONLY_FOR_ARCHS=	amd64 i386
 
diff --git a/x11-drivers/xlibre-xf86-video-vmware/Makefile b/x11-drivers/xlibre-xf86-video-vmware/Makefile
index b219c7f96090..aac78de980f4 100644
--- a/x11-drivers/xlibre-xf86-video-vmware/Makefile
+++ b/x11-drivers/xlibre-xf86-video-vmware/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xlibre-xf86-video-vmware
 PORTVERSION=	25.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	xlibre@FreeBSD.org
diff --git a/x11-drivers/xlibre-xf86-video-vmware/files/patch-configure.ac b/x11-drivers/xlibre-xf86-video-vmware/files/patch-configure.ac
deleted file mode 100644
index 64146a82acf0..000000000000
--- a/x11-drivers/xlibre-xf86-video-vmware/files/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2026-06-07 07:56:02 UTC
-+++ configure.ac
-@@ -76,7 +76,10 @@ PKG_CHECK_MODULES(X11, x11 xext)
- 
- # Obtain compiler/linker options for the vmwarectrl client tool
- PKG_CHECK_MODULES(X11, x11 xext)
--PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-+PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0], [LIBPCIACCESS=yes], [LIBPCIACCESS=no])
-+if test "x$LIBPCIACCESS" = xyes; then
-+	AC_DEFINE(HAVE_PCI_DEVICE_IS_BOOT_DISPLAY, 1, [libpciaccess support])
-+fi
- 
- AC_SUBST([moduledir])
- 
diff --git a/x11-servers/xlibre-server/Makefile.version b/x11-servers/xlibre-server/Makefile.version
index 75a7b4db1491..2e36457f81e9 100644
--- a/x11-servers/xlibre-server/Makefile.version
+++ b/x11-servers/xlibre-server/Makefile.version
@@ -1,4 +1,4 @@
 XLIBRE_MJR_VER=25
-XLIBRE_MIN_VER=1.6
+XLIBRE_MIN_VER=1.7
 
 XLIBRE_VER=${XLIBRE_MJR_VER}.${XLIBRE_MIN_VER}
diff --git a/x11-servers/xlibre-server/distinfo b/x11-servers/xlibre-server/distinfo
index 89653992a37a..041255e6d715 100644
--- a/x11-servers/xlibre-server/distinfo
+++ b/x11-servers/xlibre-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1780682382
-SHA256 (xlibre/server/X11Libre-xserver-25.1.6-xlibre-xserver-25.1.6_GH0.tar.gz) = f03fe4a7b1a060ca5100b6e71537bcfe88a998ef9f7a3a8c094e3005d7203276
-SIZE (xlibre/server/X11Libre-xserver-25.1.6-xlibre-xserver-25.1.6_GH0.tar.gz) = 5496335
+TIMESTAMP = 1781894628
+SHA256 (xlibre/server/X11Libre-xserver-25.1.7-xlibre-xserver-25.1.7_GH0.tar.gz) = f1c93df3973e1ddc0aecf498666c8d308584728a9b5cd76551b53288c4ee9f7f
+SIZE (xlibre/server/X11Libre-xserver-25.1.7-xlibre-xserver-25.1.7_GH0.tar.gz) = 5495204
diff --git a/x11-servers/xlibre-server/files/patch-Xkb-revert b/x11-servers/xlibre-server/files/patch-Xkb-revert
deleted file mode 100644
index 8a1fec15bfba..000000000000
--- a/x11-servers/xlibre-server/files/patch-Xkb-revert
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git Xi/getkmap.c Xi/getkmap.c
-index 04d8cbeaf..3cc614711 100644
---- Xi/getkmap.c
-+++ Xi/getkmap.c
-@@ -59,7 +59,6 @@ SOFTWARE.
- #include "dix/request_priv.h"
- #include "dix/rpcbuf_priv.h"
- #include "Xi/handlers.h"
--#include "xkb/xkbsrv_priv.h"
- 
- #include "inputstr.h"           /* DeviceIntPtr      */
- #include "swaprep.h"
-diff --git hw/xquartz/quartzKeyboard.c hw/xquartz/quartzKeyboard.c
-index a26ea19c5..82b8d45b4 100644
---- hw/xquartz/quartzKeyboard.c
-+++ hw/xquartz/quartzKeyboard.c
-@@ -44,10 +44,6 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <sys/stat.h>
--#include <assert.h>
--#include <pthread.h>
--
--#include "xkb/xkbsrv_priv.h"
- 
- #include "quartz.h"
- #include "darwin.h"
-@@ -57,6 +53,9 @@
- 
- #include "X11Application.h"
- 
-+#include <assert.h>
-+#include <pthread.h>
-+
- #include "xkbsrv.h"
- #include "exevents.h"
- #include "X11/keysym.h"
-diff --git include/xkbsrv.h include/xkbsrv.h
-index 3604c86af..b06f57bef 100644
---- include/xkbsrv.h
-+++ include/xkbsrv.h
-@@ -197,6 +197,9 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
-                                       Bool      /* freeDesc */
-     );
- 
-+extern _X_EXPORT KeySymsPtr XkbGetCoreMap(DeviceIntPtr  /* keybd */
-+    );
-+
- extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
-                                             KeySymsPtr /* map */ ,
-                                             KeyCode /* firstKey */ ,
-@@ -210,6 +213,11 @@ extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
-                                            XkbControlsPtr       /* new */
-     );
- 
-+extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
-+                                       int /* key */ ,
-+                                       int      /* onoff */
-+    );
-+
- extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet *    /* rmlvo */
-     );
- 
-diff --git xkb/xkbsrv_priv.h xkb/xkbsrv_priv.h
-index 1b348471f..894f27eb2 100644
---- xkb/xkbsrv_priv.h
-+++ xkb/xkbsrv_priv.h
-@@ -303,8 +303,4 @@ int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
- void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
- void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
-                                   CARD32 newState);
--
--KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd);
--void XkbSetRepeatKeys(DeviceIntPtr pXDev, int key, int onoff);
--
- #endif /* _XSERVER_XKBSRV_PRIV_H_ */