diff options
Diffstat (limited to 'source/x')
-rwxr-xr-x | source/x/ibus-table/ibus-table.SlackBuild | 2 | ||||
-rw-r--r-- | source/x/x11/build/xorg-server | 2 | ||||
-rw-r--r-- | source/x/x11/configure/xorg-server | 4 | ||||
-rwxr-xr-x | source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source/x/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild index 1c56294b0..08ca1dc1d 100755 --- a/source/x/ibus-table/ibus-table.SlackBuild +++ b/source/x/ibus-table/ibus-table.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-table VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server index 0cfbf0888..00750edc0 100644 --- a/source/x/x11/build/xorg-server +++ b/source/x/x11/build/xorg-server @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index e4458a728..e3426aa21 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -63,9 +63,9 @@ CFLAGS="$SLKCFLAGS" \ --with-int10=x86emu \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ - --with-os-name="Slackware 15.0" \ + --with-os-name="Slackware 15.1" \ --with-os-vendor="Slackware Linux Project" \ - --with-xkb-path=/etc/X11/xkb \ + --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --enable-config-udev \ --disable-config-hal \ diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild index 11c7061ff..1e94a6a43 100755 --- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xorg-server-xwayland SRCNAM=xwayland VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Default font paths to be used by the X server: DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" @@ -100,6 +100,7 @@ meson setup \ -Dxwayland_eglstream=true \ -Ddefault_font_path="${DEF_FONTPATH}" \ -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ + -Dxkb_dir=/usr/share/X11/xkb \ -Dxkb_output_dir=/var/lib/xkb \ -Dvendor_name="Slackware Linux Project" \ -Dxdmcp=false \ |