diff options
| author | kwm <kwm@FreeBSD.org> | 2015-02-04 02:54:27 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2015-02-04 02:54:27 +0800 |
| commit | 3d3f4428065ee9a6fb43315861f5b4ab9f719459 (patch) | |
| tree | 77376f89d383420c5b61bf2bdccce0f0b62ad51f /x11/libxkbfile | |
| parent | c13d1cb6c9e9fd15f0385b05a1b0b1791d947f5b (diff) | |
| download | freebsd-ports-gnome-3d3f4428065ee9a6fb43315861f5b4ab9f719459.tar.gz freebsd-ports-gnome-3d3f4428065ee9a6fb43315861f5b4ab9f719459.tar.zst freebsd-ports-gnome-3d3f4428065ee9a6fb43315861f5b4ab9f719459.zip | |
Add patch from upstream to fix the build with clang 3.6.
PR: 197184
Submitted by: amdmi3@
Obtained from: libxkbfile upstream
Diffstat (limited to 'x11/libxkbfile')
| -rw-r--r-- | x11/libxkbfile/files/patch-src_cout.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/x11/libxkbfile/files/patch-src_cout.c b/x11/libxkbfile/files/patch-src_cout.c new file mode 100644 index 000000000000..e87deb6e9583 --- /dev/null +++ b/x11/libxkbfile/files/patch-src_cout.c @@ -0,0 +1,21 @@ +From 9fa04388dcbb5bf205319569f540a62c03754688 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= <joerg@NetBSD.org> +Date: Wed, 26 Nov 2014 14:33:38 +0100 +Subject: Remove unnecessary check. + +The vmods member of XkbNamesPtr is an array and thus never NULL. + +Signed-off-by: Thomas Klausner <wiz@NetBSD.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +--- src/cout.c.orig 2012-03-08 05:37:23.000000000 +0100 ++++ src/cout.c 2015-02-03 19:45:53.373211000 +0100 +@@ -45,7 +45,7 @@ WriteCHdrVMods(FILE *file,Display *dpy,X + { + register int i,nOut; + +- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods)) ++ if ((!xkb)||(!xkb->names)) + return False; + for (i=nOut=0;i<XkbNumVirtualMods;i++) { + if (xkb->names->vmods[i]!=None) { |