commit 81313d5534c7426429f6ad4ea28c4fd95d9fbf5b Author: Danny Rawlins <contact@romster.me> Date: Mon Feb 14 09:01:21 2022 +1100 xkeyboard-config: 2.34 -> 2.35.1 diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint index ddfa9ee8..b84180b8 100644 --- a/xkeyboard-config/.footprint +++ b/xkeyboard-config/.footprint @@ -3,7 +3,6 @@ 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 @@ -22,9 +21,7 @@ drwxr-xr-x root/root usr/share/X11/xkb/compat/ -rw-r--r-- root/root usr/share/X11/xkb/compat/pc98 -rw-r--r-- root/root usr/share/X11/xkb/compat/xfree86 -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 @@ -58,7 +55,6 @@ 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 @@ -96,7 +92,6 @@ 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 @@ -304,7 +299,6 @@ 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 @@ -322,3 +316,6 @@ drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/xkeyboard-config.7.gz drwxr-xr-x root/root usr/share/pkgconfig/ -rw-r--r-- root/root usr/share/pkgconfig/xkeyboard-config.pc +drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/lib/ +drwxr-xr-x root/root var/lib/xkb/ diff --git a/xkeyboard-config/.signature b/xkeyboard-config/.signature index 15b166c6..1d6299a1 100644 --- a/xkeyboard-config/.signature +++ b/xkeyboard-config/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndH1kTu0gFxZlQ28/HZx0U/qCtBj7fpC7HBLn/eQXpL5afomBFShY2fhg4Lv0rQSN+aO6SUecfm3pJcbCZGezFAI= -SHA256 (Pkgfile) = 8190a78d8fd530d2aee54c219aa33deb6061e510909e0fcb6bb31c8d18479c3f -SHA256 (.footprint) = 9ccbe06fbc08713ffb540cff0df2a8348304e0875f73d99468cc66aa9deab665 -SHA256 (xkeyboard-config-2.34.tar.bz2) = b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce +RWTSGWF5Q7TndP2ixVTXgXvQmrgl5M56x3O4dTlCHXAxVdEm0B9SuH5k+3uXGRKXkHU76ZwIFUNlV2VgHudxs7Tn7o4JCL5AhAI= +SHA256 (Pkgfile) = 78bc227087fde446cae40a5d887ce4d819009daad6e9f9c0ba8702c40b9d628e +SHA256 (.footprint) = 78657e7aa1a694098edb1f2837f93d41c0437f8bd17987bd68b9f6bb80704257 +SHA256 (xkeyboard-config-2.35.1.tar.xz) = 18ce50ff0c74ae6093062bce1aeab3d363913ea35162fe271f8a0ce399de85cc diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile index 623ef97d..0252248a 100644 --- a/xkeyboard-config/Pkgfile +++ b/xkeyboard-config/Pkgfile @@ -5,22 +5,25 @@ # Optional: intltool name=xkeyboard-config -version=2.34 +version=2.35.1 release=1 -source=(https://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2) +source=(https://www.x.org/releases/individual/data/$name/$name-$version.tar.xz) build() { meson setup $name-$version build \ --prefix=/usr \ - --buildtype=plain \ + --buildtype plain \ --wrap-mode nodownload \ -D b_lto=true \ -D b_pie=true \ + -D xkb-base="/usr/share/X11/xkb" \ + -D compat-rules=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 + install -m755 -d $PKG/var/lib/xkb find $PKG -name README -delete rm -r $PKG/usr/share/locale }