From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: core-updates: Fix eudev build failure Date: Sat, 25 Feb 2017 22:06:54 -0500 Message-ID: <20170226030654.GA16338@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Pd0ReVV5GZGQvF3a" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chpAt-0006AJ-DI for guix-devel@gnu.org; Sat, 25 Feb 2017 22:07:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chpAo-0005QL-FE for guix-devel@gnu.org; Sat, 25 Feb 2017 22:07:03 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:59353) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chpAo-0005Q3-7q for guix-devel@gnu.org; Sat, 25 Feb 2017 22:06:58 -0500 Received: from localhost (m9e5a36d0.tmodns.net [208.54.90.158]) by mail.messagingengine.com (Postfix) with ESMTPA id 7FA9824526 for ; Sat, 25 Feb 2017 22:06:56 -0500 (EST) Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --Pd0ReVV5GZGQvF3a Content-Type: multipart/mixed; boundary="6c2NcOVqGQ03X4Wi" Content-Disposition: inline --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The update is not necessary to fix the build failure, but we might as well update if we are rebuilding eudev anyways. --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-eudev-Update-to-3.2.1.patch" Content-Transfer-Encoding: quoted-printable =46rom 65c2a3f8edb1d8ef9dd32889acf833e5561329fa Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 25 Feb 2017 21:45:44 -0500 Subject: [PATCH 1/2] gnu: eudev: Update to 3.2.1. * gnu/packages/linux.scm (eudev): Update to 3.2.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 03b7e295d..b3fd9d260 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1732,7 +1732,7 @@ from the module-init-tools project.") ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append @@ -1740,7 +1740,7 @@ from the module-init-tools project.") version ".tar.gz")) (sha256 (base32 - "099w62ncq78nxpxizf910mx18hc8x4qvzw3azjd00fir89wmyjnq")) + "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp")) (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (native-inputs --=20 2.11.1 --6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-eudev-Fix-build-failure-caused-by-conflicting-fu.patch" Content-Transfer-Encoding: quoted-printable =46rom da6db68dae4bb2573ee75f304c7d61b5b88089e4 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 25 Feb 2017 21:59:09 -0500 Subject: [PATCH 2/2] gnu: eudev: Fix build failure caused by conflicting function type declaration. * gnu/packages/patches/eudev-conflicting-declaration.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (eudev)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 ++- .../patches/eudev-conflicting-declaration.patch | 31 ++++++++++++++++++= ++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/eudev-conflicting-declaration.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3623bbb49..6f7bed9d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -541,6 +541,7 @@ dist_patch_DATA =3D \ %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/fastcap-mulGlobal.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b3fd9d260..fe72f98b7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1741,7 +1741,8 @@ from the module-init-tools project.") (sha256 (base32 "06gyyl90n85x8i7lfhns514y1kg1ians13l467admyzy3kjxkqsp")) - (patches (search-patches "eudev-rules-directory.patch")))) + (patches (search-patches "eudev-rules-directory.patch" + "eudev-conflicting-declaration.patc= h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/eudev-conflicting-declaration.patch b/gnu= /packages/patches/eudev-conflicting-declaration.patch new file mode 100644 index 000000000..f5399e20d --- /dev/null +++ b/gnu/packages/patches/eudev-conflicting-declaration.patch @@ -0,0 +1,31 @@ +Fix build failure due to conflicting declaration of +keyboard_lookup_key() in gperf-3.1: + +https://bugs.gentoo.org/show_bug.cgi?id=3D604864 + +Patch copied from upstream source repository: + +https://github.com/gentoo/eudev/commit/5bab4d8de0dcbb8e2e7d4d5125b4aea1652= a0d60 + +From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" +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 +--- + 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-keyb= oard.c +index 73171c3..fad3520 100644 +--- a/src/udev/udev-builtin-keyboard.c ++++ b/src/udev/udev-builtin-keyboard.c +@@ -28,7 +28,6 @@ +=20 + #include "udev.h" +=20 +-static const struct key *keyboard_lookup_key(const char *str, unsigned le= n); + #include "keyboard-keys-from-name.h" + #include "keyboard-keys-to-name.h" +=20 --=20 2.11.1 --6c2NcOVqGQ03X4Wi-- --Pd0ReVV5GZGQvF3a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAliyRkoACgkQJkb6MLrK fwixFA//ZehpV+A0e3ApL4eITWZ4iqBfrb9vGMrgV4E98ttOvrAyyRsoMasVsLQB C81AHQ78lj4kFTpjouXZhKLFtrL6Yc3Msckp9eBk83tY3I5VYhbKlUOARuxgql45 2qlWy+1y8fpw17YlUp/84OIExUJfTuY3okYBjbr1a/JrEqMlchQ0hx4npjhkFviv w9XkIZWO5lZYZoosJbpGstprF4bU09zcqbRoDkt6pYllipsQjDaEHxewcUL1BmyS o2eGRI+a+4BSMGClMlvtEmaFVr0Ue01hlExVF3pSwjUOQiNIZ/EFXfresyik+eFb 63wC08JS01xRwK37RcJsG7naxDNw2lnpWpbK6eeZVnutFsp3aqHketLkdujBCFvy 6art5wpCVxKYU4OD/70P1BGERafSTMmfAWLdXNmdG7ZwcRXf3nabf9o8nTl1z7wp wqtqGQ8Ac9kekjqUH/vmLKSVV+5zThHWtFN45z7t83xmdmS6/Fg7aDcqMcftU9yD XnDm1lVp2zVLPEoAjMy9VlCu261XQlIqFWGWFgTTrOGad/oKlIRUEihOoKKzAsl0 jhO/mt4x4mpcgx3XOzuZX8WW3eQQl0/3SjbFOHt9zvsrq0+OeVl5CKy3kK8My1Qz GkD2Sm00qTP6Fq2Q2UCwypkaaYrMHCFLB8xLoJFmKfu2QSJSPlU= =Vkap -----END PGP SIGNATURE----- --Pd0ReVV5GZGQvF3a--