cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11/xkeyboard-config: Update to 2.29

Browse Source 
Update xkeyboard-config to 2.29
Upstream has switched to use python to generate certan things during build,
add a build dependency on on python3.5+.
Change MASTER_SITES to actually work now that XORG_CAT is no more, this
should fix fetch.  Previously it pulled from distcache.
Try to fix the optional etersoft symbols patch.
This commit is contained in:
Niclas Zeising 2020-04-01 15:25:35 +00:00
parent d8234661cd
commit 4814f2d895
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=530221
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/xkeyboard-config/Makefile
View File

@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= xkeyboard-config
PORTVERSION= 2.27
PORTVERSION= 2.29
CATEGORIES= x11
MASTER_SITES= XORG/individual/${XORG_CAT}/${PORTNAME}
MASTER_SITES= XORG/individual/data/${PORTNAME}
MAINTAINER= x11@FreeBSD.org
COMMENT= X Keyboard Configuration Database
@ -13,11 +13,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= xkbcomp:x11/xkbcomp
USES= gmake gnome localbase pathfix perl5 xorg-cat:data
USES= gmake gnome localbase pathfix perl5 python:3.5+,build \
shebangfix xorg-cat:data
NO_ARCH= yes
USE_GNOME= libxslt:build
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
@ -37,10 +40,6 @@ PLIST_SUB+= NLS=""
#PLIST_SUB+= NLS="@comment "
#.endif
post-patch:
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
${WRKSRC}/rules/merge.sh
post-install:
@${MKDIR} ${STAGEDIR}/var/lib/xkb
@${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled

6
x11/xkeyboard-config/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1560370074
SHA256 (xorg/data/xkeyboard-config-2.27.tar.bz2) = 690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f
SIZE (xorg/data/xkeyboard-config-2.27.tar.bz2) = 1664454
TIMESTAMP = 1585258061
SHA256 (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802
SIZE (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1707176

3
x11/xkeyboard-config/files/etersoft-patch-symbols-typo
View File

@ -12,11 +12,12 @@ Description (in Russian) and the picture of keyboard layout:
--- symbols/typo.orig 2015-04-05 00:48:56.000000000 +0200
+++ symbols/typo 2015-10-17 14:23:59.906594000 +0200
@@ -29,7 +29,10 @@
@@ -29,8 +29,10 @@
key <AD03> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // "e"
key <AD04> { [ NoSymbol, NoSymbol, registered, NoSymbol ] }; // "r"
key <AD05> { [ NoSymbol, NoSymbol, trademark, NoSymbol ] }; // "t"
- key <AD06> { [ NoSymbol, NoSymbol, yen, NoSymbol ] }; // "y"
- key <AD07> { [ NoSymbol, NoSymbol, U20B4, NoSymbol ] }; // "u"
+ key <AD06> { [ NoSymbol, NoSymbol, U0463, U0462 ] };
+ key <AD07> { [ NoSymbol, NoSymbol, U0475, U0474 ] };
+ key <AD08> { [ NoSymbol, NoSymbol, U0456, U0406 ] };

3
x11/xkeyboard-config/pkg-plist
View File

@ -8,6 +8,7 @@ share/X11/xkb/compat/complete
share/X11/xkb/compat/iso9995
share/X11/xkb/compat/japan
share/X11/xkb/compat/ledcaps
share/X11/xkb/compat/ledcompose
share/X11/xkb/compat/lednum
share/X11/xkb/compat/ledscroll
share/X11/xkb/compat/level5
@ -80,7 +81,6 @@ share/X11/xkb/rules/evdev
share/X11/xkb/rules/evdev.extras.xml
share/X11/xkb/rules/evdev.lst
share/X11/xkb/rules/evdev.xml
share/X11/xkb/rules/xkb.its
share/X11/xkb/rules/xfree98
share/X11/xkb/rules/xkb.dtd
share/X11/xkb/rules/xorg
@ -152,6 +152,7 @@ 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