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.master
parent
c7f5c3ea20
commit
2bf5097784
|
@ -1345,8 +1345,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
|
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
|
||||||
%D%/packages/patches/xfce4-settings-defaults.patch \
|
%D%/packages/patches/xfce4-settings-defaults.patch \
|
||||||
%D%/packages/patches/xinetd-fix-fd-leak.patch \
|
%D%/packages/patches/xinetd-fix-fd-leak.patch \
|
||||||
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
|
%D%/packages/patches/xinetd-CVE-2013-4342.patch
|
||||||
%D%/packages/patches/xmodmap-asprintf.patch
|
|
||||||
|
|
||||||
MISC_DISTRO_FILES = \
|
MISC_DISTRO_FILES = \
|
||||||
%D%/packages/ld-wrapper.in
|
%D%/packages/ld-wrapper.in
|
||||||
|
|
|
@ -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>
|
|
|
@ -4061,7 +4061,7 @@ containing one glyph per cell.")
|
||||||
(define-public xmodmap
|
(define-public xmodmap
|
||||||
(package
|
(package
|
||||||
(name "xmodmap")
|
(name "xmodmap")
|
||||||
(version "1.0.9")
|
(version "1.0.10")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -4071,15 +4071,14 @@ containing one glyph per cell.")
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p"))
|
"0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"))))
|
||||||
(patches (search-patches "xmodmap-asprintf.patch"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(("xorgproto" ,xorgproto)
|
`(("xorgproto" ,xorgproto)
|
||||||
("libx11" ,libx11)))
|
("libx11" ,libx11)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("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")
|
(synopsis "Modify keymaps and button mappings on X server")
|
||||||
(description
|
(description
|
||||||
"Xmodmap is used to display and edit the keyboard modifier map and
|
"Xmodmap is used to display and edit the keyboard modifier map and
|
||||||
|
|
Loading…
Reference in New Issue