3 files changed, 4 insertions, 80 deletions

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_ */