[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
87/116: gnu: xf86-input-synaptics: Update to 1.8.1.
From: |
Mark H. Weaver |
Subject: |
87/116: gnu: xf86-input-synaptics: Update to 1.8.1. |
Date: |
Sat, 20 Dec 2014 04:38:51 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit 2750ee5b0d207d98236605b0d8ff8fe25109269a
Author: Mark H Weaver <address@hidden>
Date: Fri Dec 19 15:28:40 2014 -0500
gnu: xf86-input-synaptics: Update to 1.8.1.
* gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/xorg.scm (xf86-input-synaptics): Update to 1.8.1.
Remove patch. Add libevdev to inputs.
---
gnu-system.am | 1 -
.../patches/xf86-input-synaptics-glibc-2.20.patch | 63 --------------------
gnu/packages/xorg.scm | 9 +--
3 files changed, 4 insertions(+), 69 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 796262f..16993df 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -458,7 +458,6 @@ dist_patch_DATA =
\
gnu/packages/patches/vpnc-script.patch \
gnu/packages/patches/w3m-fix-compile.patch \
gnu/packages/patches/wmctrl-64-fix.patch \
- gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch \
gnu/packages/patches/xf86-video-openchrome-includes.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xmodmap-asprintf.patch
diff --git a/gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch
b/gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch
deleted file mode 100644
index 93263e1..0000000
--- a/gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Allow builds with libc 2.20.
-Patch from
<https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
-
-From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <address@hidden>
-Date: Fri, 29 Aug 2014 07:57:41 +1000
-Subject: Include xorg-server.h to fix build errors on newest glibc
-
-In file included from /usr/include/string.h:634:0,
- from /usr/include/xorg/os.h:53,
- from /usr/include/xorg/misc.h:115,
- from /usr/include/xorg/xf86str.h:37,
- from /usr/include/xorg/xf86Xinput.h:54,
- from synproto.h:36,
- from synproto.c:24:
-/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before
'__extension__'
- strndup(const char *str, size_t n);
-
-See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
-
-Signed-off-by: Peter Hutterer <address@hidden>
-
-Status: Backport
-
-Index: xf86-input-synaptics-1.8.0/src/eventcomm.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28
18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587
-0700
-@@ -27,6 +27,8 @@
- #ifndef _EVENTCOMM_H_
- #define _EVENTCOMM_H_
-
-+#include <xorg-server.h>
-+
- #include <linux/input.h>
- #include <linux/version.h>
- #include <xf86Xinput.h>
-Index: xf86-input-synaptics-1.8.0/src/ps2comm.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28
18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587
-0700
-@@ -22,6 +22,8 @@
- #ifndef _PS2COMM_H_
- #define _PS2COMM_H_
-
-+#include <xorg-server.h>
-+
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include "xf86_OSproc.h"
-Index: xf86-input-synaptics-1.8.0/src/synproto.h
-===================================================================
---- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28
18:40:28.628070587 -0700
-+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587
-0700
-@@ -31,6 +31,8 @@
- #include "config.h"
- #endif
-
-+#include <xorg-server.h>
-+
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <xf86Xinput.h>
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0125dfb..78fdc21 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2301,22 +2301,21 @@ devices, thus making direct access unnecessary.")
(define-public xf86-input-synaptics
(package
(name "xf86-input-synaptics")
- (version "1.6.1")
+ (version "1.8.1")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-"
+ "mirror://xorg/individual/driver/xf86-input-synaptics-"
version
".tar.bz2"))
(sha256
(base32
- "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"))
- (patches
- (list (search-patch "xf86-input-synaptics-glibc-2.20.patch")))))
+ "16phzd7yhl4wns957c35qz2nahmjvnlx05jf975s524qkvrdlkyp"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
("libxi" ,libxi)
+ ("libevdev" ,libevdev)
("mtdev" ,mtdev)
("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
- 77/116: gnu: xrefresh: Update to 1.0.5., (continued)
- 77/116: gnu: xrefresh: Update to 1.0.5., Mark H. Weaver, 2014/12/19
- 76/116: gnu: xrdb: Update to 1.1.0., Mark H. Weaver, 2014/12/19
- 80/116: gnu: xvinfo: Update to 1.1.2., Mark H. Weaver, 2014/12/19
- 78/116: gnu: xset: Update to 1.2.3., Mark H. Weaver, 2014/12/19
- 81/116: gnu: xwd: Update to 1.0.6., Mark H. Weaver, 2014/12/19
- 79/116: gnu: xsetroot: Update to 1.1.1., Mark H. Weaver, 2014/12/19
- 85/116: gnu: xf86-input-keyboard: Update to 1.8.0., Mark H. Weaver, 2014/12/19
- 84/116: gnu: xf86-input-joystick: Update to 1.6.2., Mark H. Weaver, 2014/12/19
- 82/116: gnu: xwininfo: Update to 1.1.3., Mark H. Weaver, 2014/12/19
- 83/116: gnu: xf86-input-evdev: Update to 2.8.4., Mark H. Weaver, 2014/12/19
- 87/116: gnu: xf86-input-synaptics: Update to 1.8.1.,
Mark H. Weaver <=
- 89/116: gnu: xf86-video-ati: Update to 7.5.0., Mark H. Weaver, 2014/12/19
- 88/116: gnu: xf86-video-ark: Update to 0.7.5., Mark H. Weaver, 2014/12/19
- 90/116: gnu: xf86-video-cirrus: Update to 1.5.2., Mark H. Weaver, 2014/12/19
- 91/116: gnu: xf86-video-fbdev: Update to 0.4.4., Mark H. Weaver, 2014/12/19
- 86/116: gnu: xf86-input-mouse: Update to 1.9.1., Mark H. Weaver, 2014/12/19
- 92/116: gnu: Resurrect xf86-video-geode and update to 2.11.16., Mark H. Weaver, 2014/12/19
- 93/116: gnu: xf86-video-ast: Add patch needed for upcoming xorg-server update., Mark H. Weaver, 2014/12/19
- 95/116: gnu: xf86-video-i128: Update to 1.3.6., Mark H. Weaver, 2014/12/19
- 96/116: gnu: xf86-video-intel: Update to 2.21.15., Mark H. Weaver, 2014/12/19
- 97/116: gnu: xf86-video-mach64: Update to 6.9.4., Mark H. Weaver, 2014/12/19