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 926ED7A111 for ; Mon, 14 Nov 2016 14:08:19 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 09CDC85586; Mon, 14 Nov 2016 14:08:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8DB2B85571 for ; Mon, 14 Nov 2016 14:08:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nPqmL-GP2_Ck for ; Mon, 14 Nov 2016 14:08:18 +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 085DA84CFB for ; Mon, 14 Nov 2016 14:08:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F1C63FBA6; Mon, 14 Nov 2016 14:08:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_147913249782850" MIME-Version: 1.0 Date: Mon, 14 Nov 2016 14:08:17 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/libxkbcommon To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20161114140817.F1C63FBA6@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. --_----------=_147913249782850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Mon Nov 14 14:08:17 UTC 2016 Modified Files: pkgsrc/x11/libxkbcommon: Makefile distinfo Added Files: pkgsrc/x11/libxkbcommon/patches: patch-src_utils.h Log Message: Updated libxkbcommon to 0.7.0. libxkbcommon 0.7.0 - 2016-11-11 ================== - Added support for different "modes" of calculating consumed modifiers. The existing mode, based on the XKB standard, has proven to be unintuitive in various shortcut implementations. A new mode, based on the calculation used by the GTK toolkit, is added. This mode is less eager to declare a modifier as consumed. - Added a new interactive demo program using the Wayland protocol. See the PACKAGING file for the new (optional) test dependencies. - Fixed a compilation error on GNU Hurd. - New API: enum xkb_consumed_mode XKB_CONSUMED_MODE_XKB XKB_CONSUMED_MODE_GTK xkb_state_key_get_consumed_mods2 xkb_state_mod_index_is_consumed2 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/libxkbcommon/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libxkbcommon/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libxkbcommon/patches/patch-src_utils.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_147913249782850 Content-Disposition: inline Content-Length: 2434 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/libxkbcommon/Makefile diff -u pkgsrc/x11/libxkbcommon/Makefile:1.15 pkgsrc/x11/libxkbcommon/Makefile:1.16 --- pkgsrc/x11/libxkbcommon/Makefile:1.15 Thu Apr 14 12:44:32 2016 +++ pkgsrc/x11/libxkbcommon/Makefile Mon Nov 14 14:08:17 2016 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2016/04/14 12:44:32 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2016/11/14 14:08:17 wiz Exp $ -DISTNAME= libxkbcommon-0.6.1 +DISTNAME= libxkbcommon-0.7.0 CATEGORIES= x11 MASTER_SITES= http://xkbcommon.org/download/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/x11/libxkbcommon/distinfo diff -u pkgsrc/x11/libxkbcommon/distinfo:1.8 pkgsrc/x11/libxkbcommon/distinfo:1.9 --- pkgsrc/x11/libxkbcommon/distinfo:1.8 Thu Apr 14 12:44:32 2016 +++ pkgsrc/x11/libxkbcommon/distinfo Mon Nov 14 14:08:17 2016 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2016/04/14 12:44:32 wiz Exp $ +$NetBSD: distinfo,v 1.9 2016/11/14 14:08:17 wiz Exp $ -SHA1 (libxkbcommon-0.6.1.tar.xz) = 85175bd3baa2cb6207beb5ac980568b70e1a6a3d -RMD160 (libxkbcommon-0.6.1.tar.xz) = 296890c6eebaae9a76f705dbd2705579b8ba8055 -SHA512 (libxkbcommon-0.6.1.tar.xz) = 5eab309d711ef3f4ce6d98ddd72f7f67fb6374eeea5fa13d37019830847a48a100d5b61b0312787966020c85b180b3ee8a5fd8e7acd3a8a9220ca53dcc411370 -Size (libxkbcommon-0.6.1.tar.xz) = 722288 bytes +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_utils.h) = 8cd03c2cfe8aadbe8afe266c665c0befe885f4ff Added files: Index: pkgsrc/x11/libxkbcommon/patches/patch-src_utils.h diff -u /dev/null pkgsrc/x11/libxkbcommon/patches/patch-src_utils.h:1.1 --- /dev/null Mon Nov 14 14:08:17 2016 +++ pkgsrc/x11/libxkbcommon/patches/patch-src_utils.h Mon Nov 14 14:08:17 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_utils.h,v 1.1 2016/11/14 14:08:17 wiz Exp $ + +Fix conflict with NetBSD's popcount. +https://github.com/xkbcommon/libxkbcommon/issues/41 + +--- src/utils.h.orig 2016-10-31 11:19:02.000000000 +0000 ++++ src/utils.h +@@ -179,7 +179,7 @@ msb_pos(uint32_t mask) + } + + static inline int +-popcount(uint32_t x) ++popcountu(uint32_t x) + { + int count; + #if defined(HAVE___BUILTIN_POPCOUNT) --_----------=_147913249782850--