From nobody Mon Feb 05 12:01:19 2024 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 4TT4jD1BKJz59ny0; Mon, 5 Feb 2024 12:01:20 +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 4TT4jC6BG7z4lYs; Mon, 5 Feb 2024 12:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707134479; 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=+q36tUxyTIK9s1pujbWU/vfFbQ1Q6M+9zjRRPzdMW0g=; b=OV+trUBspFitnJaF/L866hY9/o3f9po7hl+QPkh7goek3xIH3MtJKFcigRnT1JhmF1BUZO bT7MIAiPtKv2z+X0FGhWTMf8XqpKxhnlZxcITinmZgJ9uxfTNR6zPiqTH5ntbbSNy3Lw6C 9mBRdH5+Bb83m/oQm7dskg8n/5ntWMrOPPKwPQcaoLLXcq28+Cjyf7jHjGFD8M2u+7kTLF FxWlcvwIcEEWjsxanboTXR4iyBilLAmCzZ9Kg9T5ReT+n+B4ts0KIfQykaUBXsL2L9ecMD +7KceykNNIpJzPFZvDDYbOqCZkr3XbpVBj/B2UdyruDDtV14FOCPR3FtVU3uRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707134479; 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=+q36tUxyTIK9s1pujbWU/vfFbQ1Q6M+9zjRRPzdMW0g=; b=YtoMSM6q9VcUTpU5H+52DqyPonfMjxPsQDigvjQd1AlYn115Sno6iBvuKB3JuDv6G9t2Vt mVmtyw0upXV8yPYdvKqyEgE0vroafHNtLrL9qhN1//Ch+kLjC/D1fNA+ZbcA+wDeQD8IfN XpqNN9n7bvVTB5H8SiPitkna3PNTrVydDe4ShJgOAfQF0oEtQWZuTXB0M4EsF13g0y3fmm 9ry9/M1fbWP2ItbIjWNWEFZsgRo/YGzhwMRyK3P1IkUyV3++N/yTP9W4lEOvJQ3862NGZE lkTCRN9ouYP9MdUplrFWhW70gOXaG6y8RG2rHIAmppj6EmndiYFAHHVZf45LVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707134479; a=rsa-sha256; cv=none; b=Q2Hx2K4seJZ7GIUhSV7mRxd8IGuWwH6HqovX+v8qIFLFvm+bFwLWyoEzRM0qPiorBwfjbm ggJGf/ZXbXSXe5Sk8F2PiD7P12i/se1i/+8obsTXUGd1kc316WiDfX976EYne0k1IkthCJ pKDtWKKTJe9c8bO9iVtMFra07AzWMNzCaLYDpo9FN22g1ZmP+QPGb/1nBhwpRGcnbc/h8n 42AJ5Cqjhv420Mgqt4MfeTJAv1PEWZNCjYKb7zUApBYK4na9Xai4EYPu5csIaBRiPxNo15 h/y3aFvdqCj+vb5jtAsCDAiVzkUq4W/z59EQDFE60owoTVMpdI+YzNVRt1GRVw== 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 4TT4jC5DtXzfbt; Mon, 5 Feb 2024 12:01:19 +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 415C1J25005982; Mon, 5 Feb 2024 12:01:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415C1JTT005979; Mon, 5 Feb 2024 12:01:19 GMT (envelope-from git) Date: Mon, 5 Feb 2024 12:01:19 GMT Message-Id: <202402051201.415C1JTT005979@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christos Margiolis Subject: git: 02040d57b0a4 - main - x11/xkeyboard-config: Update to 2.41 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: christos X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02040d57b0a4ed5484d7e6844d2db13ecdd70159 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/ports/commit/?id=02040d57b0a4ed5484d7e6844d2db13ecdd70159 commit 02040d57b0a4ed5484d7e6844d2db13ecdd70159 Author: Christos Margiolis AuthorDate: 2024-02-05 12:01:14 +0000 Commit: Christos Margiolis CommitDate: 2024-02-05 12:01:14 +0000 x11/xkeyboard-config: Update to 2.41 Version 2.41 now ships with the temporary patch introduced in e6f66fef02554459d756c1510fc74a52de40f049 ("x11/xkeyboard-config: Update to 2.40"). Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D43749 --- x11/xkeyboard-config/Makefile | 2 +- x11/xkeyboard-config/distinfo | 6 +++--- x11/xkeyboard-config/files/patch-nls | 25 ------------------------- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 0f75124106e4..37c36894f0fc 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,5 +1,5 @@ PORTNAME= xkeyboard-config -DISTVERSION= 2.40 +DISTVERSION= 2.41 PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= XORG/individual/data/${PORTNAME} diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index 8b118f8120e9..c96b62372210 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698603581 -SHA256 (xkeyboard-config-2.40.tar.xz) = 7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3 -SIZE (xkeyboard-config-2.40.tar.xz) = 893584 +TIMESTAMP = 1707131942 +SHA256 (xkeyboard-config-2.41.tar.xz) = f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f +SIZE (xkeyboard-config-2.41.tar.xz) = 898404 diff --git a/x11/xkeyboard-config/files/patch-nls b/x11/xkeyboard-config/files/patch-nls deleted file mode 100644 index 91455f5797d7..000000000000 --- a/x11/xkeyboard-config/files/patch-nls +++ /dev/null @@ -1,25 +0,0 @@ ---- meson_options.txt.orig 2023-10-05 22:26:07.000000000 +0300 -+++ meson_options.txt 2023-11-02 21:02:30.219251000 +0200 -@@ -10,3 +10,7 @@ - type: 'boolean', - value: false, - description: 'create "xorg" symlinks to the "base" rules files [default=false]') -+option('nls', -+ type: 'boolean', -+ value: true, -+ description: 'build with native language support (NLS) [default=true]') ---- po/meson.build.orig 2023-10-05 22:26:07.000000000 +0300 -+++ po/meson.build 2023-11-02 21:02:38.562084000 +0200 -@@ -1,5 +1,7 @@ --i18n = import('i18n') --i18n.gettext('xkeyboard-config', preset: 'glib', -- args: ['--keyword=_', -- '--keyword=N_', -- '--its=@0@/rules/xkb.its'.format(meson.source_root())]) -+if get_option('nls') -+ i18n = import('i18n') -+ i18n.gettext('xkeyboard-config', preset: 'glib', -+ args: ['--keyword=_', -+ '--keyword=N_', -+ '--its=@0@/rules/xkb.its'.format(meson.source_root())]) -+endif