Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 676237A329 for ; Thu, 1 Dec 2016 20:54:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 19C3F85610; Thu, 1 Dec 2016 20:54:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9E58D85607 for ; Thu, 1 Dec 2016 20:54:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2Am2WwkF1ZbW for ; Thu, 1 Dec 2016 20:54:52 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 318CA84D04 for ; Thu, 1 Dec 2016 20:54:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 27EEDFBA6; Thu, 1 Dec 2016 20:54:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1480625692104580" MIME-Version: 1.0 Date: Thu, 1 Dec 2016 20:54:52 +0000 From: "Sebastian Wiedenroth" Subject: CVS commit: pkgsrc/x11/libxkbcommon To: pkgsrc-changes@NetBSD.org Reply-To: wiedi@netbsd.org X-Mailer: log_accum Message-Id: <20161201205452.27EEDFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1480625692104580 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiedi Date: Thu Dec 1 20:54:52 UTC 2016 Modified Files: pkgsrc/x11/libxkbcommon: distinfo Added Files: pkgsrc/x11/libxkbcommon/patches: patch-src_state.c Log Message: also rename the caller of popcount To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libxkbcommon/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libxkbcommon/patches/patch-src_state.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1480625692104580 Content-Disposition: inline Content-Length: 1837 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/libxkbcommon/distinfo diff -u pkgsrc/x11/libxkbcommon/distinfo:1.9 pkgsrc/x11/libxkbcommon/distinfo:1.10 --- pkgsrc/x11/libxkbcommon/distinfo:1.9 Mon Nov 14 14:08:17 2016 +++ pkgsrc/x11/libxkbcommon/distinfo Thu Dec 1 20:54:51 2016 @@ -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 Added files: Index: pkgsrc/x11/libxkbcommon/patches/patch-src_state.c diff -u /dev/null pkgsrc/x11/libxkbcommon/patches/patch-src_state.c:1.1 --- /dev/null Thu Dec 1 20:54:52 2016 +++ pkgsrc/x11/libxkbcommon/patches/patch-src_state.c Thu Dec 1 20:54:52 2016 @@ -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; --_----------=_1480625692104580--