diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-02-11 01:09:45 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2022-02-11 07:43:07 +0100 |
| commit | 9d6917b0f3f61a3ef670811612645967e5719534 (patch) | |
| tree | 757f84269dc8e285f8ba75d0b999ac05d35b96b6 /source/x | |
| parent | 517fb1766fff7e6ac07541c3477c475295f05961 (diff) | |
| download | current-9d6917b0f3f61a3ef670811612645967e5719534.tar.gz | |
Fri Feb 11 01:09:45 UTC 202220220211010945
x/xkeyboard-config-2.35.1-noarch-2.txz: Rebuilt.
Perhaps upstream didn't mean to move these files (or perhaps we should have
recompiled everything that looks for these), but they did switch to meson,
and the 'xkb-base' option to set the data directory doesn't work. Anyway,
I've placed a symlink at /etc/X11/xkb and that fixes the problem.
Thanks to Petri Kaukasoina and LuckyCyborg.
Diffstat (limited to 'source/x')
| -rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 2 | ||||
| -rw-r--r-- | source/x/x11/build/xkeyboard-config | 2 | ||||
| -rw-r--r-- | source/x/x11/configure/xkeyboard-config | 30 | ||||
| -rw-r--r-- | source/x/x11/make/xkeyboard-config | 5 | ||||
| -rw-r--r-- | source/x/x11/post-install/xkeyboard-config.post-install | 13 |
5 files changed, 27 insertions, 25 deletions
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 10cc1467..4328c788 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} BUILD_DEMOS=${BUILD_DEMOS:-YES} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config index d00491fd..0cfbf088 100644 --- a/source/x/x11/build/xkeyboard-config +++ b/source/x/x11/build/xkeyboard-config @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/configure/xkeyboard-config b/source/x/x11/configure/xkeyboard-config index a5e05d6b..fc2a5f14 100644 --- a/source/x/x11/configure/xkeyboard-config +++ b/source/x/x11/configure/xkeyboard-config @@ -1,13 +1,19 @@ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-static \ - --enable-xkbcomp-symlink \ - --enable-compat-rules \ - --with-xkb-base=/etc/X11/xkb \ - --with-xkb-rules-symlink=xfree86,xorg \ - --build=$ARCH-slackware-linux + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir /usr/libexec \ + --bindir /usr/bin \ + --sbindir /usr/sbin \ + --includedir /usr/include \ + --datadir /usr/share \ + --mandir /usr/man \ + --sysconfdir /etc \ + --localstatedir /var \ + --buildtype=release \ + -Dcompat-rules=true \ + -Dxorg-rules-symlinks=true \ + .. || exit 1 diff --git a/source/x/x11/make/xkeyboard-config b/source/x/x11/make/xkeyboard-config new file mode 100644 index 00000000..635ee83d --- /dev/null +++ b/source/x/x11/make/xkeyboard-config @@ -0,0 +1,5 @@ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. diff --git a/source/x/x11/post-install/xkeyboard-config.post-install b/source/x/x11/post-install/xkeyboard-config.post-install index 8446f064..92c64723 100644 --- a/source/x/x11/post-install/xkeyboard-config.post-install +++ b/source/x/x11/post-install/xkeyboard-config.post-install @@ -1,11 +1,2 @@ -# Move things into /etc/X11 that are supposed to be there: -#mkdir -p $PKG/etc/X11 -#rm -rf $PKG/etc/X11/xkb -#mv $PKG/usr/share/X11/xkb $PKG/etc/X11 -mkdir -p $PKG/usr/share/X11 -( cd $PKG/usr/share/X11 ; ln -sf ../../../etc/X11/xkb . ) -#( cd $PKG/etc/X11/xkb/rules -# ln -sf base.lst xorg.lst -# ln -sf base.xml xorg.xml -# ln -sf base xorg -#) +mkdir -p $PKG/etc/X11 +( cd $PKG/etc/X11 ; ln -sf ../../usr/share/X11/xkb . ) |