git: 02040d57b0a4 - main - x11/xkeyboard-config: Update to 2.41

From: Christos Margiolis <christos_at_FreeBSD.org>
Date: Mon, 05 Feb 2024 12:01:19 UTC
The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/ports/commit/?id=02040d57b0a4ed5484d7e6844d2db13ecdd70159

commit 02040d57b0a4ed5484d7e6844d2db13ecdd70159
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-02-05 12:01:14 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
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