diff options
| author | wiedi <wiedi@pkgsrc.org> | 2016-12-01 20:54:51 +0000 |
|---|---|---|
| committer | wiedi <wiedi@pkgsrc.org> | 2016-12-01 20:54:51 +0000 |
| commit | d57ecfaa3e725990b5b09db2c1ed518a8d2fe251 (patch) | |
| tree | 288d621a6a0079e535e281bd120cbfd2afb5f598 | |
| parent | e63632facf2df3e0d63654740ae3c363c6b832ac (diff) | |
| download | pkgsrc-d57ecfaa3e725990b5b09db2c1ed518a8d2fe251.tar.gz | |
also rename the caller of popcount
| -rw-r--r-- | x11/libxkbcommon/distinfo | 3 | ||||
| -rw-r--r-- | x11/libxkbcommon/patches/patch-src_state.c | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo index f50ff092130..8f8e6c90fe5 100644 --- a/x11/libxkbcommon/distinfo +++ b/x11/libxkbcommon/distinfo @@ -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 --git a/x11/libxkbcommon/patches/patch-src_state.c b/x11/libxkbcommon/patches/patch-src_state.c new file mode 100644 index 00000000000..b679ebaa5d6 --- /dev/null +++ b/x11/libxkbcommon/patches/patch-src_state.c @@ -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; |