summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to 'source/x')
-rw-r--r--source/x/x11/build/libXaw3d2
-rw-r--r--source/x/x11/build/xf86-input-mouse2
-rw-r--r--source/x/x11/patch/xf86-input-mouse.patch2
-rw-r--r--source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch42
4 files changed, 2 insertions, 46 deletions
diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d
index b8626c4c..d00491fd 100644
--- a/source/x/x11/build/libXaw3d
+++ b/source/x/x11/build/libXaw3d
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/xf86-input-mouse
+++ b/source/x/x11/build/xf86-input-mouse
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/patch/xf86-input-mouse.patch b/source/x/x11/patch/xf86-input-mouse.patch
deleted file mode 100644
index e54c5190..00000000
--- a/source/x/x11/patch/xf86-input-mouse.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch.gz \
- | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch b/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
deleted file mode 100644
index 5726c50a..00000000
--- a/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 16 Feb 2017 09:21:21 -0500
-Subject: Adapt to removal of xf86GetOS
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/mouse.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/mouse.c b/src/mouse.c
-index dae98aa..40d97a9 100644
---- a/src/mouse.c
-+++ b/src/mouse.c
-@@ -794,7 +794,6 @@ InitProtocols(void)
- {
- int classes;
- int i;
-- const char *osname = NULL;
-
- if (osInfo)
- return TRUE;
-@@ -821,11 +820,11 @@ InitProtocols(void)
- mouseProtocols[i].id = PROT_UNSUP;
-
- /* NetBSD uses PROT_BM for "PS/2". */
-- xf86GetOS(&osname, NULL, NULL, NULL);
-- if (osname && xf86NameCmp(osname, "netbsd") == 0)
-- for (i = 0; mouseProtocols[i].name; i++)
-- if (mouseProtocols[i].id == PROT_PS2)
-- mouseProtocols[i].id = PROT_BM;
-+#if defined(__NetBSD__)
-+ for (i = 0; mouseProtocols[i].name; i++)
-+ if (mouseProtocols[i].id == PROT_PS2)
-+ mouseProtocols[i].id = PROT_BM;
-+#endif
-
- return TRUE;
- }
---
-cgit v1.1
-