summaryrefslogtreecommitdiff
path: root/x11/libxkbcommon
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-01-22 13:14:46 +0000
committerwiz <wiz@pkgsrc.org>2017-01-22 13:14:46 +0000
commit448977ad92201d9747d48c1291ab0dccd5979902 (patch)
tree1c5042a37aa9d8e061bb0d9e171b13c87b77f39d /x11/libxkbcommon
parentd4a4eca2bd0a90f7319433390c32112e9931e440 (diff)
downloadpkgsrc-448977ad92201d9747d48c1291ab0dccd5979902.tar.gz
Updated libxkbcommon to 0.7.1.
libxkbcommon 0.7.1 - 2017-01-18 ================== - Fixed various reported problems when the current locale is tr_TR.UTF-8. The function xkb_keysym_from_name() used to perform case-insensitive string comparisons in a locale-dependent way, but required it to to work as in the C/ASCII locale (the so called "Turkish i problem"). The function is now no longer affected by the current locale. - Fixed compilation in NetBSD.
Diffstat (limited to 'x11/libxkbcommon')
-rw-r--r--x11/libxkbcommon/Makefile4
-rw-r--r--x11/libxkbcommon/distinfo12
-rw-r--r--x11/libxkbcommon/patches/patch-src_state.c16
-rw-r--r--x11/libxkbcommon/patches/patch-src_utils.h16
4 files changed, 7 insertions, 41 deletions
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 9475e955866..c3dbf8f1f5c 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2016/11/14 14:08:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/22 13:14:46 wiz Exp $
-DISTNAME= libxkbcommon-0.7.0
+DISTNAME= libxkbcommon-0.7.1
CATEGORIES= x11
MASTER_SITES= http://xkbcommon.org/download/
EXTRACT_SUFX= .tar.xz
diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
index 8f8e6c90fe5..3c70249b608 100644
--- a/x11/libxkbcommon/distinfo
+++ b/x11/libxkbcommon/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2016/12/01 20:54:51 wiedi Exp $
+$NetBSD: distinfo,v 1.11 2017/01/22 13:14:46 wiz 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
+SHA1 (libxkbcommon-0.7.1.tar.xz) = 6c0007a0206cd8bc1fa68f50aa86627d669282a2
+RMD160 (libxkbcommon-0.7.1.tar.xz) = f9b185768306a1f103ea81118276b770261d4b95
+SHA512 (libxkbcommon-0.7.1.tar.xz) = 9f209214d5d7f9334cabb2cd7e0d9b9b0392c1fae06b60e92a03398875399fe48754b543389f78b8b06dd28a86dfd440720e534bae309ca8ef882eb874dce4e1
+Size (libxkbcommon-0.7.1.tar.xz) = 622384 bytes
diff --git a/x11/libxkbcommon/patches/patch-src_state.c b/x11/libxkbcommon/patches/patch-src_state.c
deleted file mode 100644
index b679ebaa5d6..00000000000
--- a/x11/libxkbcommon/patches/patch-src_state.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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;
diff --git a/x11/libxkbcommon/patches/patch-src_utils.h b/x11/libxkbcommon/patches/patch-src_utils.h
deleted file mode 100644
index 1e9e819cbe4..00000000000
--- a/x11/libxkbcommon/patches/patch-src_utils.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$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)