[pkgsrc/trunk]: pkgsrc/x11/libxkbcommon also rename the caller of popcount

[wiedi <wiedi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f191d73fdcee
branches:  trunk
changeset: 355435:f191d73fdcee
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Thu Dec 01 20:54:51 2016 +0000

description:
also rename the caller of popcount

diffstat:

 x11/libxkbcommon/distinfo                  |   3 ++-
 x11/libxkbcommon/patches/patch-src_state.c |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 60bf7acf3243 -r f191d73fdcee x11/libxkbcommon/distinfo
--- a/x11/libxkbcommon/distinfo Thu Dec 01 18:34:57 2016 +0000
+++ b/x11/libxkbcommon/distinfo Thu Dec 01 20:54:51 2016 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2016/11/14 14:08:17 wiz Exp $
+$NetBSD: distinfo,v 1.10 2016/12/01 20:54:51 wiedi Exp $
 
 SHA1 (libxkbcommon-0.7.0.tar.xz) = 48e4df32bac36a265444da8252a15bb256b122b7
 RMD160 (libxkbcommon-0.7.0.tar.xz) = 04628f523e0280ac5e7387db65d24f56e299c26a
 SHA512 (libxkbcommon-0.7.0.tar.xz) = 0610f4e4d177d5323e6513f90cb3c29cd07bb1680c9d09770411e8b01e64b7fcf77c8a05cf24ce3035ee08435e95619f21cf283f842cc96511a31fe3a194dc70
 Size (libxkbcommon-0.7.0.tar.xz) = 621980 bytes
+SHA1 (patch-src_state.c) = ceda6527b6b5213b956dd397a42680b7c8a4e2fa
 SHA1 (patch-src_utils.h) = 8cd03c2cfe8aadbe8afe266c665c0befe885f4ff
diff -r 60bf7acf3243 -r f191d73fdcee x11/libxkbcommon/patches/patch-src_state.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libxkbcommon/patches/patch-src_state.c        Thu Dec 01 20:54:51 2016 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_state.c,v 1.1 2016/12/01 20:54:52 wiedi Exp $
+
+Fix conflict with NetBSD's popcount.
+https://github.com/xkbcommon/libxkbcommon/issues/41
+
+--- src/state.c.orig   2016-10-31 11:19:02.000000000 +0000
++++ src/state.c
+@@ -1359,7 +1359,7 @@ key_get_consumed(struct xkb_state *state
+             if (XkbLevelsSameSyms(level, no_mods_level))
+                 continue;
+ 
+-            if (entry == matching_entry || popcount(entry->mods.mask) == 1)
++            if (entry == matching_entry || popcountu(entry->mods.mask) == 1)
+                 consumed |= entry->mods.mask & ~entry->preserve.mask;
+         }
+         break;