commit 90a4964d47d4a787edba6c2a7c918064029c7f3a Author: Tim Biermann <tbier@posteo.de> Date: Tue Oct 5 00:17:33 2021 +0200 [notify] xkeyboard-config: -> 2.33; now uses meson, moved intltool to optional dependencies diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint index 12ad55db..ddfa9ee8 100644 --- a/xkeyboard-config/.footprint +++ b/xkeyboard-config/.footprint @@ -3,6 +3,7 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/X11/ drwxr-xr-x root/root usr/share/X11/xkb/ drwxr-xr-x root/root usr/share/X11/xkb/compat/ +-rw-r--r-- root/root usr/share/X11/xkb/compat/Makefile.in -rw-r--r-- root/root usr/share/X11/xkb/compat/accessx -rw-r--r-- root/root usr/share/X11/xkb/compat/basic -rw-r--r-- root/root usr/share/X11/xkb/compat/caps @@ -23,6 +24,7 @@ drwxr-xr-x root/root usr/share/X11/xkb/compat/ -rw-r--r-- root/root usr/share/X11/xkb/compat/xtest lrwxrwxrwx root/root usr/share/X11/xkb/compiled -> /var/lib/xkb drwxr-xr-x root/root usr/share/X11/xkb/geometry/ +-rw-r--r-- root/root usr/share/X11/xkb/geometry/Makefile.in -rw-r--r-- root/root usr/share/X11/xkb/geometry/amiga -rw-r--r-- root/root usr/share/X11/xkb/geometry/ataritt -rw-r--r-- root/root usr/share/X11/xkb/geometry/chicony @@ -56,6 +58,7 @@ drwxr-xr-x root/root usr/share/X11/xkb/geometry/sgi_vndr/ -rw-r--r-- root/root usr/share/X11/xkb/geometry/typematrix -rw-r--r-- root/root usr/share/X11/xkb/geometry/winbook drwxr-xr-x root/root usr/share/X11/xkb/keycodes/ +-rw-r--r-- root/root usr/share/X11/xkb/keycodes/Makefile.in -rw-r--r-- root/root usr/share/X11/xkb/keycodes/aliases -rw-r--r-- root/root usr/share/X11/xkb/keycodes/amiga -rw-r--r-- root/root usr/share/X11/xkb/keycodes/ataritt @@ -93,6 +96,7 @@ lrwxrwxrwx root/root usr/share/X11/xkb/rules/xorg -> base lrwxrwxrwx root/root usr/share/X11/xkb/rules/xorg.lst -> base.lst lrwxrwxrwx root/root usr/share/X11/xkb/rules/xorg.xml -> base.xml drwxr-xr-x root/root usr/share/X11/xkb/symbols/ +-rw-r--r-- root/root usr/share/X11/xkb/symbols/Makefile.in -rw-r--r-- root/root usr/share/X11/xkb/symbols/af -rw-r--r-- root/root usr/share/X11/xkb/symbols/al -rw-r--r-- root/root usr/share/X11/xkb/symbols/altwin @@ -300,6 +304,7 @@ drwxr-xr-x root/root usr/share/X11/xkb/symbols/xfree68_vndr/ -rw-r--r-- root/root usr/share/X11/xkb/symbols/xfree68_vndr/ataritt -rw-r--r-- root/root usr/share/X11/xkb/symbols/za drwxr-xr-x root/root usr/share/X11/xkb/types/ +-rw-r--r-- root/root usr/share/X11/xkb/types/Makefile.in -rw-r--r-- root/root usr/share/X11/xkb/types/basic -rw-r--r-- root/root usr/share/X11/xkb/types/cancel -rw-r--r-- root/root usr/share/X11/xkb/types/caps diff --git a/xkeyboard-config/.signature b/xkeyboard-config/.signature index 7ed1519b..d46830d9 100644 --- a/xkeyboard-config/.signature +++ b/xkeyboard-config/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndDsV/oYZsaJiz6rgSQKrRW+sfDmUDvLdNU320aGloUCnjMe8LB5XupQ/DQR7MML2uP14p6AHbRgWdD+3KXT84wc= -SHA256 (Pkgfile) = d745b9fcd726e1a13ea9f25e18fd02a48ba43a6d0134d7fe636a36f4d9ea3ddf -SHA256 (.footprint) = 3855bf69b305899dcb2ca2d9bb70eba57e0fc26eb6eed25a82541b31e180dc84 +RWTSGWF5Q7TndN2TSiehzoBqjlgZNvHLYNeQYqdepkzXv7HTTTEf6sght9KGqkwXjEUVOeIeA5dkRHoHLPKXWB2U8JmaIx9zVQM= +SHA256 (Pkgfile) = 8dbc4d29417c6aef6255b29cfdb6fa3b211a012002c05b3ba290ae3d39b9fde0 +SHA256 (.footprint) = 9ccbe06fbc08713ffb540cff0df2a8348304e0875f73d99468cc66aa9deab665 SHA256 (xkeyboard-config-2.33.tar.bz2) = 657fd790d6dcf781cd395de4cf726120a5b0f93ba91dfb2628bcc70ae8b1d3bc diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile index 1ba4539b..7f4e5e88 100644 --- a/xkeyboard-config/Pkgfile +++ b/xkeyboard-config/Pkgfile @@ -1,7 +1,8 @@ # Description: X keyboard configuration database # URL: https://cgit.freedesktop.org/xkeyboard-config/ # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: intltool xorg-xkbcomp libxslt +# Depends on: libxslt xorg-xkbcomp +# Optional: intltool name=xkeyboard-config version=2.33 @@ -9,17 +10,17 @@ release=1 source=(https://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2) build() { - cd $name-$version - - ./configure \ + meson setup $name-$version build \ --prefix=/usr \ - --disable-nls \ - --with-xkb-base=/usr/share/X11/xkb \ - --with-xkb-rules-symlink=xorg - - make -j1 - make DESTDIR=$PKG install + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D xorg-rules-symlinks=true + meson compile -C build + DESTDIR=$PKG meson install -C build ln -s /var/lib/xkb $PKG/usr/share/X11/xkb/compiled find $PKG -name README -delete + rm -r $PKG/usr/share/locale }