02/02: gnu: eudev: Update to 3.2.2.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 202342fdda708d8e4554e0514a58849584eddbd0
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 9 14:57:41 2017 +0200

    gnu: eudev: Update to 3.2.2.
    
    * gnu/packages/linux.scm (eudev): Update to 3.2.2.
    [source](patches): Remove "eudev-conflicting-declaration.patch".
    * gnu/packages/patches/eudev-conflicting-declaration.patch: Remove.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/linux.scm                             |  7 +++--
 .../patches/eudev-conflicting-declaration.patch    | 31 ----------------------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 2be36d3..d99c4d2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -570,7 +570,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch    \
   %D%/packages/patches/emacs-source-date-epoch.patch           \
   %D%/packages/patches/eudev-rules-directory.patch             \
-  %D%/packages/patches/eudev-conflicting-declaration.patch     \
   %D%/packages/patches/evilwm-lost-focus-bug.patch             \
   %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch        \
   %D%/packages/patches/fabric-tests.patch                      \
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e345c57..1a4e25d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1831,7 +1831,7 @@ from the module-init-tools project.")
   ;; The post-systemd fork, maintained by Gentoo.
   (package
     (name "eudev")
-    (version "3.2.1")
+    (version "3.2.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1839,9 +1839,8 @@ from the module-init-tools project.")
                     version ".tar.gz"))
               (sha256
                (base32
-                "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp"))
-              (patches (search-patches "eudev-rules-directory.patch"
-                                       
"eudev-conflicting-declaration.patch"))))
+                "0qqgbgpm5wdllk0s04pf80nwc8pr93xazwri1bylm1f15zn5ck1y"))
+              (patches (search-patches "eudev-rules-directory.patch"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch 
b/gnu/packages/patches/eudev-conflicting-declaration.patch
deleted file mode 100644
index f5399e2..0000000
--- a/gnu/packages/patches/eudev-conflicting-declaration.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build failure due to conflicting declaration of
-keyboard_lookup_key() in gperf-3.1:
-
-https://bugs.gentoo.org/show_bug.cgi?id=604864
-
-Patch copied from upstream source repository:
-
-https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60
-
-From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <address@hidden>
-Date: Thu, 5 Jan 2017 16:21:17 -0500
-Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1
-
-Signed-off-by: Anthony G. Basile <address@hidden>
----
- src/udev/udev-builtin-keyboard.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/udev/udev-builtin-keyboard.c 
b/src/udev/udev-builtin-keyboard.c
-index 73171c3..fad3520 100644
---- a/src/udev/udev-builtin-keyboard.c
-+++ b/src/udev/udev-builtin-keyboard.c
-@@ -28,7 +28,6 @@
- 
- #include "udev.h"
- 
--static const struct key *keyboard_lookup_key(const char *str, unsigned len);
- #include "keyboard-keys-from-name.h"
- #include "keyboard-keys-to-name.h"
-