From nobody Fri Nov 10 16:55:54 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 4SRlMG3lHvz508Pt; Fri, 10 Nov 2023 16:55:54 +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 4SRlMG2nZfz3Z3H; Fri, 10 Nov 2023 16:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699635354; 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=g9pWWpYqkfqGDAUY1c34JSyVpcy43ix0SHLDOE/po+k=; b=RuNYy+mwi8j+o8A8Sth8WWRjsrVEPKmZYvghw0HVg9OKkmIq4Wz+RRWvTDZPQEmDpv0iVC MsrBLM4UjhlbakLDSXfOWQR9aSg/JIrnSbqDk2zE0lOvWD0ztT+NFhCORdYljH2bHkyis6 cBK15Li0uhiGcVSDQIKST4CFycw2z/+iaznSECY2dMa7UQ3xdamtiyMHn9I4lzOOFvulL4 olRjSvcH8elVEDcnzuRL9Q8SdlhgUd0Q7c3kQ/QKfeD0a+YVvUhBKPSvh4E0wmUyCUTEnq aBItRy8ZUXrOlqjbyyMlgnufaiyR/fAKeDesTzPMHTDyCtSwkexESws5HE4ujg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699635354; 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=g9pWWpYqkfqGDAUY1c34JSyVpcy43ix0SHLDOE/po+k=; b=gx0h/53uZ2p6DyjdYW4DK02bX6ZOxpCeo6z8/HQHLF+C4l/Q/tvbvKZt4FkTbKiMmsN4KD zgsEj8BUF0FKin+qG0VwflHXVT2N1ikVkppMcEGMvjevbemfn/+r1UlxhAIJR5fPKoIyUx JULJPssGVkDp06RGXWrS+A+4/B/dZBqP/0w4+l5BZTb+MsorxYiQDi+OvI0XYuwql3TVLB iPLmk84YH2QskzFgxgJR79OhqdtQJUKBDzBwR+q63KYLbTxgaTtGKmXNFWd3m2kaTrMR6N 6n8hBc8QwDZvj0L7x/vaVPAQnudBFkFDEL2poVKUvfz3+AEmljeYqWV6WBX15A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699635354; a=rsa-sha256; cv=none; b=QjnSWlizsKWU+N0wsf0vaA+ALaHfYXLBQTvxI9tlmgFoN1N3nnHtCXjGoVEN05bAZXaily DNuMekqCUv/UaQfpHKeqDju9AuoBT9xC1WstYo+CFwaACkeQk5OrnN5Cx1C0I8/D1cE+ar KdSYZztZCVTgESurjOg2WJPrSZZnH1f1Q57nI3Vz+o8K4YUFZuK9TiEistSXFeNwkhOJVt QtMeS0+WnJscSVttQl9gv4paxY6chm4Wphu6TJvId9R3tEKGLES6pqaidxDbfk5Bm7R4vG hIXkdJZsig+e+4gqWvde/Csqq8UU8fHNoV28P2s9FicqeTqNyt9PkCjtnWbueA== 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 4SRlMG1Xqmz15Zt; Fri, 10 Nov 2023 16:55:54 +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 3AAGtsge001104; Fri, 10 Nov 2023 16:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAGtsvr001101; Fri, 10 Nov 2023 16:55:54 GMT (envelope-from git) Date: Fri, 10 Nov 2023 16:55:54 GMT Message-Id: <202311101655.3AAGtsvr001101@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: e6f66fef0255 - main - x11/xkeyboard-config: Update to 2.40 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: e6f66fef02554459d756c1510fc74a52de40f049 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6f66fef02554459d756c1510fc74a52de40f049 commit e6f66fef02554459d756c1510fc74a52de40f049 Author: Christos Margiolis AuthorDate: 2023-11-10 16:55:11 +0000 Commit: Christos Margiolis CommitDate: 2023-11-10 16:55:11 +0000 x11/xkeyboard-config: Update to 2.40 Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D42212 --- x11/xkeyboard-config/Makefile | 15 +++++++-------- x11/xkeyboard-config/distinfo | 6 +++--- x11/xkeyboard-config/files/patch-nls | 25 +++++++++++++++++++++++++ x11/xkeyboard-config/pkg-plist | 5 ++--- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index d92c17abc89a..372591dace4d 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,5 +1,5 @@ PORTNAME= xkeyboard-config -DISTVERSION= 2.34 +DISTVERSION= 2.40 PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= XORG/individual/data/${PORTNAME} @@ -11,8 +11,8 @@ WWW= https://freedesktop.org/wiki/Software/XKeyboardConfig/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake gnome localbase pathfix perl5 python:build \ - shebangfix xorg-cat:data +USES= meson gnome localbase pathfix perl5 python:build \ + shebangfix tar:xz NO_ARCH= yes USE_GNOME= libxslt:build @@ -20,19 +20,18 @@ USE_PERL5= build SHEBANG_FILES= rules/merge.py \ rules/compat/map-variants.py -CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ - --with-xkb-rules-symlink=xorg +MESON_ARGS= -Dxkb-base=${PREFIX}/share/X11/xkb \ + -Dxorg-rules-symlinks=true OPTIONS_DEFINE= ETERSOFT NLS X11 OPTIONS_DEFAULT=X11 +NLS_USES= gettext-tools iconv +NLS_MESON_TRUE= nls ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext-tools iconv ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo X11_BUILD_DEPENDS= xkbcomp:x11/xkbcomp -X11_CONFIGURE_OFF= --disable-runtime-deps X11_DESC= XKB keyboard description compiler support .include diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index b1d4a4725744..8b118f8120e9 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635635692 -SHA256 (xorg/data/xkeyboard-config-2.34.tar.bz2) = b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce -SIZE (xorg/data/xkeyboard-config-2.34.tar.bz2) = 1763558 +TIMESTAMP = 1698603581 +SHA256 (xkeyboard-config-2.40.tar.xz) = 7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3 +SIZE (xkeyboard-config-2.40.tar.xz) = 893584 diff --git a/x11/xkeyboard-config/files/patch-nls b/x11/xkeyboard-config/files/patch-nls new file mode 100644 index 000000000000..91455f5797d7 --- /dev/null +++ b/x11/xkeyboard-config/files/patch-nls @@ -0,0 +1,25 @@ +--- 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 diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist index ec3b989ec82f..316139e5904d 100644 --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -1,4 +1,3 @@ -libdata/pkgconfig/xkeyboard-config.pc man/man7/xkeyboard-config.7.gz share/X11/xkb/compat/README share/X11/xkb/compat/accessx @@ -90,6 +89,7 @@ share/X11/xkb/symbols/af share/X11/xkb/symbols/al share/X11/xkb/symbols/altwin share/X11/xkb/symbols/am +share/X11/xkb/symbols/ancient share/X11/xkb/symbols/apl share/X11/xkb/symbols/ara share/X11/xkb/symbols/at @@ -99,6 +99,7 @@ share/X11/xkb/symbols/ba share/X11/xkb/symbols/bd share/X11/xkb/symbols/be share/X11/xkb/symbols/bg +share/X11/xkb/symbols/bqn share/X11/xkb/symbols/br share/X11/xkb/symbols/brai share/X11/xkb/symbols/bt @@ -153,7 +154,6 @@ share/X11/xkb/symbols/is share/X11/xkb/symbols/it share/X11/xkb/symbols/jolla_vndr/sbj share/X11/xkb/symbols/jp -share/X11/xkb/symbols/jv share/X11/xkb/symbols/ke share/X11/xkb/symbols/keypad share/X11/xkb/symbols/kg @@ -187,7 +187,6 @@ share/X11/xkb/symbols/macintosh_vndr/no share/X11/xkb/symbols/macintosh_vndr/pt share/X11/xkb/symbols/macintosh_vndr/se share/X11/xkb/symbols/macintosh_vndr/us -share/X11/xkb/symbols/mao share/X11/xkb/symbols/md share/X11/xkb/symbols/me share/X11/xkb/symbols/mk