gnu: xmodmap: Update to 1.0.10.

* gnu/packages/patches/xmodmap-asprintf.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/xorg.scm (xmodmap): Update to 1.0.10.
[source](patches): Remove.
[home-page]: Set to source repository.
This commit is contained in:
Marius Bakke 2019-02-20 16:18:21 +01:00
parent c7f5c3ea20
commit 2bf5097784
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 4 additions and 20 deletions

View File

@ -1345,8 +1345,7 @@ dist_patch_DATA = \
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \
%D%/packages/patches/xinetd-fix-fd-leak.patch \
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch
%D%/packages/patches/xinetd-CVE-2013-4342.patch
MISC_DISTRO_FILES = \
%D%/packages/ld-wrapper.in

View File

@ -1,14 +0,0 @@
This patch allows the 'asprintf' declaration to be visible, by
including <config.h>, which defines _GNU_SOURCE.
--- xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:25.000000000 +0100
+++ xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:27.000000000 +0100
@@ -26,6 +26,7 @@ from The Open Group.
*/
+#include <config.h>
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <stdio.h>

View File

@ -4061,7 +4061,7 @@ containing one glyph per cell.")
(define-public xmodmap
(package
(name "xmodmap")
(version "1.0.9")
(version "1.0.10")
(source
(origin
(method url-fetch)
@ -4071,15 +4071,14 @@ containing one glyph per cell.")
".tar.bz2"))
(sha256
(base32
"0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"))
(patches (search-patches "xmodmap-asprintf.patch"))))
"0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"))))
(build-system gnu-build-system)
(inputs
`(("xorgproto" ,xorgproto)
("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
(home-page "https://gitlab.freedesktop.org/xorg/app/xmodmap")
(synopsis "Modify keymaps and button mappings on X server")
(description
"Xmodmap is used to display and edit the keyboard modifier map and