From nobody Tue Oct 17 13:32:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w0B6MTxz4xWdw; Tue, 17 Oct 2023 13:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w0B5THbz3D27; Tue, 17 Oct 2023 13:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H12quMMWb1PpPa6OhN0jiHOjkfpD6tLMZ2jBIyn1F80=; b=s8LFk6je6PTGnEhM0SKtZ1cJzqsArIyKpYRcBjJQ+IooTCPUlWFLoD8oOwwOIoJYtjyZQh Y9e2nnvrBogsUTAvrxCa6Ykf/5i2ihNj4uiCnjP7FSFn03v2rsmvXbfHux6zqzYjIXZgEN 00NZa6HYaZGtaQYTSCoQcf6Q61uyEAw2bzbzugKTAAAWhmljVnQR8/QO3XAdT3bHihqSkQ necRtwODZ44ZgiLZyweGwhlVVSZRCJvqoigVGU84OrPxqGf6BXMki/qxZWx/TLQrsmEjp7 6x0bzS2pxWqiz/oT3JFvOy900d6jYrCuVGiOKAHaaTx6een7mLiosJcxgHpGfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549578; a=rsa-sha256; cv=none; b=VmX7FrmklFeYjQeBKU4uAo+JY/G3QKF5jYVmazziP41OzPYYuTw6IGGnBCdODjeLDCfAVx WyscNvHI4QPOhXdwBQB3Y65hOI3oaqcAYXhsHiJJmSLeGhwiQoHhNW9I5lZXnEIASZCah3 qRDw9mZ0bKZHBABalha0AMZllmZeGsiR2Gzjn946hbA88sboqA4cwDHjqviHFSMgsFu5RT b58enHXg2rbfxtzfx6wMaEDr9xH7CsWvJhMv9aqpEtlZMoMVzOgApuwnQkUS7sXL9hgbJ5 Pu7q0RrgDZVjpjyro+3bEdmHCbGJxnWurFJf7E5knXVoJLznO2X66PBspmUQxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H12quMMWb1PpPa6OhN0jiHOjkfpD6tLMZ2jBIyn1F80=; b=lAn2ZdfeCDOeAmCQXvs0KfwtyVULr1jDmKSXlAIpYkZ181XtXRzAEkFHQgFcnjLmyoAYsW uKMZPpcol6CU7efzYzLqpAyJrDoEvoroG9Io7FQVEgWlS6CrPKQ2dv7zMlDM8QG3cwPWxy OYkgTZL2QPu4TtsD1ncwUUfVtdv7Aw/L/i52XLKGHnGeLe+8JcGRZmaS4+WfOxvNADk7li gkXbM80bib7J39FObH4ieiHy9mO7bRSwum2+uiQAmbg0VhPtImh2hAbjOYlpPOnVMhloo/ fQSgDX/9pjpD+YkcHoiTWXnt9tsMtf6QBROmPcBgtstf3WXG+ADLch4ym4X3yA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w0B4X3Bz9qq; Tue, 17 Oct 2023 13:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDWwbZ094647; Tue, 17 Oct 2023 13:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDWw0G094644; Tue, 17 Oct 2023 13:32:58 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:32:58 GMT Message-Id: <202310171332.39HDWw0G094644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 6154950f6c9c - main - x11/libxkbcommon: update to 1.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6154950f6c9cfff4b45d830b5241c9d91fc3ec75 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6154950f6c9cfff4b45d830b5241c9d91fc3ec75 commit 6154950f6c9cfff4b45d830b5241c9d91fc3ec75 Author: Jan Beich AuthorDate: 2023-10-08 20:46:48 +0000 Commit: Jan Beich CommitDate: 2023-10-17 13:32:03 +0000 x11/libxkbcommon: update to 1.6.0 Changes: https://lists.freedesktop.org/archives/wayland-devel/2023-October/043121.html PR: 274373 Exp-run by: antoine Approved by: manu --- .../files/patch-src_gui_platform_unix_qxkbcommon.cpp | 13 +++++++++++++ ...patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp | 13 +++++++++++++ x11/libxkbcommon/Makefile | 2 +- x11/libxkbcommon/distinfo | 6 +++--- x11/libxkbcommon/pkg-plist | 1 + 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp new file mode 100644 index 000000000000..c437e8d69127 --- /dev/null +++ b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp @@ -0,0 +1,13 @@ +--- src/gui/platform/unix/qxkbcommon.cpp.orig 2023-09-21 19:24:26 UTC ++++ src/gui/platform/unix/qxkbcommon.cpp +@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, + + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. diff --git a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp new file mode 100644 index 000000000000..7b6fa29aaaa0 --- /dev/null +++ b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp @@ -0,0 +1,13 @@ +--- src/platformsupport/input/xkbcommon/qxkbcommon.cpp.orig 2023-09-06 08:28:54 UTC ++++ src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -274,10 +274,6 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, + + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile index 48f9f9dcd443..d3ce4abd1f06 100644 --- a/x11/libxkbcommon/Makefile +++ b/x11/libxkbcommon/Makefile @@ -1,5 +1,5 @@ PORTNAME= libxkbcommon -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= x11 MASTER_SITES= https://xkbcommon.org/download/ diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo index 38ea44e8393c..6bb837d1f481 100644 --- a/x11/libxkbcommon/distinfo +++ b/x11/libxkbcommon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672687410 -SHA256 (libxkbcommon-1.5.0.tar.xz) = 560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017 -SIZE (libxkbcommon-1.5.0.tar.xz) = 472700 +TIMESTAMP = 1696798008 +SHA256 (libxkbcommon-1.6.0.tar.xz) = 0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b +SIZE (libxkbcommon-1.6.0.tar.xz) = 510456 diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist index e004f90d0247..49e58fa81021 100644 --- a/x11/libxkbcommon/pkg-plist +++ b/x11/libxkbcommon/pkg-plist @@ -31,3 +31,4 @@ man/man1/xkbcli-how-to-type.1.gz %%X11%%man/man1/xkbcli-interactive-x11.1.gz man/man1/xkbcli-list.1.gz man/man1/xkbcli.1.gz +share/bash-completion/completions/xkbcli