Page MenuHomeFreeBSD
Files F137858477

D42212.diff
No OneTemporary
Actions

D42212.diff
View Options

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
--- 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 @@
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 @@
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 <bsd.port.options.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
--- 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
--- /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
--- 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/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/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/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/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

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 27, 12:46 PM (3 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26255797
Default Alt Text
D42212.diff (4 KB)

Event Timeline