guix-commits
[Top][All Lists]
Advanced

[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)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]