Date: Tue, 3 Feb 2015 18:54:27 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378364 - head/x11/libxkbfile/files Message-ID: <201502031854.t13IsRhJ011809@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Feb 3 18:54:27 2015 New Revision: 378364 URL: https://svnweb.freebsd.org/changeset/ports/378364 QAT: https://qat.redports.org/buildarchive/r378364/ Log: Add patch from upstream to fix the build with clang 3.6. PR: 197184 Submitted by: amdmi3@ Obtained from: libxkbfile upstream Added: head/x11/libxkbfile/files/ head/x11/libxkbfile/files/patch-src_cout.c (contents, props changed) Added: head/x11/libxkbfile/files/patch-src_cout.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/libxkbfile/files/patch-src_cout.c Tue Feb 3 18:54:27 2015 (r378364) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502031854.t13IsRhJ011809>