[135330] trunk/dports/x11/xorg-libxkbfile

[jeremyhu at macports.org]

Revision: 135330
          https://trac.macports.org/changeset/135330
Author:   jeremyhu at macports.org
Date:     2015-04-22 22:40:21 -0700 (Wed, 22 Apr 2015)
Log Message:
-----------
xorg-libxkbfile: Fix build with macports-clang-3.6

Modified Paths:
--------------
    trunk/dports/x11/xorg-libxkbfile/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-libxkbfile/files/
    trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch

Modified: trunk/dports/x11/xorg-libxkbfile/Portfile
===================================================================
--- trunk/dports/x11/xorg-libxkbfile/Portfile	2015-04-23 01:08:19 UTC (rev 135329)
+++ trunk/dports/x11/xorg-libxkbfile/Portfile	2015-04-23 05:40:21 UTC (rev 135330)
@@ -27,6 +27,10 @@
 	port:xorg-libX11 \
 	port:xorg-kbproto
 
+patch.pre_args -p1
+patchfiles \
+        0001-Remove-unnecessary-check.patch
+
 livecheck.type  regex
 livecheck.url   http://xorg.freedesktop.org/archive/individual/lib/?C=M&O=D
 livecheck.regex libxkbfile-(\\d+(?:\\.\\d+)*)

Added: trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch
===================================================================
--- trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-libxkbfile/files/0001-Remove-unnecessary-check.patch	2015-04-23 05:40:21 UTC (rev 135330)
@@ -0,0 +1,30 @@
+From 5fcfc1acd2620c786fb1b3b741d2a7cbee4445cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= <joerg at NetBSD.org>
+Date: Wed, 26 Nov 2014 14:33:38 +0100
+Subject: [PATCH] Remove unnecessary check.
+
+The vmods member of XkbNamesPtr is an array and thus never NULL.
+
+Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 9fa04388dcbb5bf205319569f540a62c03754688)
+---
+ src/cout.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cout.c b/src/cout.c
+index 399512f..ee0971e 100644
+--- a/src/cout.c
++++ b/src/cout.c
+@@ -45,7 +45,7 @@ WriteCHdrVMods(FILE *file,Display *dpy,XkbDescPtr xkb)
+ {
+ 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) {
+-- 
+2.3.5
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150422/06731360/attachment.html>