summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author Matteo Bernardini2022-10-01 10:43:52 +0200
committer Matteo Bernardini2022-10-01 10:43:52 +0200
commita6f3fbde79ed2a0d4da959882fa1a6047ae1e7b4 (patch)
tree2d529722003ba97adabd6a46be24530eff640b27 /system
parent1bbfcb24994b4f85d5525c6a462e1110099ea32e (diff)
downloadslackbuilds-a6f3fbde79ed2a0d4da959882fa1a6047ae1e7b4.tar.gz
20221001.1 global branch merge.current-20221001.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/conky/conky.SlackBuild2
-rw-r--r--system/osinfo-db-tools/osinfo-db-tools.SlackBuild4
-rw-r--r--system/osinfo-db-tools/osinfo-db-tools.info6
-rw-r--r--system/osinfo-db/osinfo-db.SlackBuild4
-rw-r--r--system/osinfo-db/osinfo-db.info6
-rw-r--r--system/qemu/qemu.SlackBuild2
-rw-r--r--system/qemu/qemu.info6
-rw-r--r--system/vice/psiddrv.h.prebuilt.3.428
-rw-r--r--system/vice/vice.SlackBuild18
-rw-r--r--system/vice/vice.info8
-rw-r--r--system/virt-manager/Add-Slackware-to-OS-choices.patch11
-rw-r--r--system/virt-manager/virt-manager.SlackBuild2
-rw-r--r--system/virt-manager/virt-manager.info6
-rw-r--r--system/xf86-video-qxl/buildfix.diff101
-rw-r--r--system/xf86-video-qxl/xf86-video-qxl.SlackBuild3
15 files changed, 135 insertions, 72 deletions
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index a720da9f62..a1717efe36 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -107,7 +107,7 @@ cd build
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DDOC_PATH=/usr/doc/$PRGNAM-$VERSION \
- -DMAINTAINER_MODE=ON \
+ -DMAINTAINER_MODE=OFF \
-DBUILD_DOCS=ON \
-DBUILD_XDBE=ON \
-DBUILD_AUDACIOUS=$audacious \
diff --git a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
index 96f3f7b6c5..1418e79bc9 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
+++ b/system/osinfo-db-tools/osinfo-db-tools.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for osinfo-db-tools
-# Copyright 2016-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=osinfo-db-tools
-VERSION=${VERSION:-1.9.0}
+VERSION=${VERSION:-1.10.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/system/osinfo-db-tools/osinfo-db-tools.info b/system/osinfo-db-tools/osinfo-db-tools.info
index c2ed3c03d1..ad699ecdc1 100644
--- a/system/osinfo-db-tools/osinfo-db-tools.info
+++ b/system/osinfo-db-tools/osinfo-db-tools.info
@@ -1,8 +1,8 @@
PRGNAM="osinfo-db-tools"
-VERSION="1.9.0"
+VERSION="1.10.0"
HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz"
-MD5SUM="99374514e84ef223c9d9db0463982a1b"
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-tools-1.10.0.tar.xz"
+MD5SUM="f0c83772ce612b5d0befb77a8d6f309b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/osinfo-db/osinfo-db.SlackBuild b/system/osinfo-db/osinfo-db.SlackBuild
index e2ef246535..df13c66bdb 100644
--- a/system/osinfo-db/osinfo-db.SlackBuild
+++ b/system/osinfo-db/osinfo-db.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for osinfo-db
-# Copyright 2016-2021 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2016-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=osinfo-db
-VERSION=${VERSION:-20211216}
+VERSION=${VERSION:-20220727}
SLVERSION=${SLVERSION:-20220214}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/osinfo-db/osinfo-db.info b/system/osinfo-db/osinfo-db.info
index 9e4b47bb02..3a0bb17fbe 100644
--- a/system/osinfo-db/osinfo-db.info
+++ b/system/osinfo-db/osinfo-db.info
@@ -1,9 +1,9 @@
PRGNAM="osinfo-db"
-VERSION="20211216"
+VERSION="20220727"
HOMEPAGE="http://libosinfo.org"
-DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20211216.tar.xz \
+DOWNLOAD="https://releases.pagure.org/libosinfo/osinfo-db-20220727.tar.xz \
https://harrier.slackbuilds.org/misc/osinfo-db-slackware-20220214.tar.xz"
-MD5SUM="1a67c27f8d0f922f479876d973cc1fc3 \
+MD5SUM="e3babe02a25748eaab0b7a37c9ed18ba \
65ed4d991bdab6ab00bc34bcbb5d16ff"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild
index 763c04d248..24e6133870 100644
--- a/system/qemu/qemu.SlackBuild
+++ b/system/qemu/qemu.SlackBuild
@@ -30,7 +30,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=qemu
-VERSION=${VERSION:-6.2.0}
+VERSION=${VERSION:-7.1.0}
SRCVER=$(echo $VERSION | tr _ - )
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info
index ee823d3477..19276021da 100644
--- a/system/qemu/qemu.info
+++ b/system/qemu/qemu.info
@@ -1,8 +1,8 @@
PRGNAM="qemu"
-VERSION="6.2.0"
+VERSION="7.1.0"
HOMEPAGE="https://www.qemu.org"
-DOWNLOAD="https://download.qemu.org/qemu-6.2.0.tar.xz"
-MD5SUM="a077669ce58b6ee07ec355e54aad25be"
+DOWNLOAD="https://download.qemu.org/qemu-7.1.0.tar.xz"
+MD5SUM="3be5458a9171b4ec5220c65d5d52bdcf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/vice/psiddrv.h.prebuilt.3.4 b/system/vice/psiddrv.h.prebuilt.3.4
deleted file mode 100644
index c1820907b8..0000000000
--- a/system/vice/psiddrv.h.prebuilt.3.4
+++ /dev/null
@@ -1,28 +0,0 @@
- 0x01, 0x00, 0x6f, 0x36, 0x35, 0x00, 0x03, 0x00, 0x00, 0x10, 0x35, 0x01, 0x00, 0x04, 0x00, 0x00,
- 0x00, 0x40, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x70, 0x73, 0x69, 0x64,
- 0x64, 0x72, 0x76, 0x2e, 0x6f, 0x36, 0x35, 0x00, 0x1c, 0x03, 0x44, 0x61, 0x67, 0x20, 0x4c, 0x65,
- 0x6d, 0x20, 0x3c, 0x72, 0x65, 0x73, 0x69, 0x64, 0x40, 0x6e, 0x69, 0x6d, 0x72, 0x6f, 0x64, 0x2e,
- 0x6e, 0x6f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x2b,
- 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x2b, 0x11, 0x31, 0x11,
- 0xa9, 0x00, 0x8d, 0x1a, 0xd0, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xa9, 0x7f, 0x8d, 0x0d, 0xdc,
- 0x8d, 0x0d, 0xdd, 0xad, 0x0d, 0xdc, 0xad, 0x0d, 0xdd, 0xa2, 0x08, 0xbd, 0x0c, 0x10, 0x9d, 0x00,
- 0x80, 0xca, 0x10, 0xf7, 0xad, 0x18, 0x10, 0xc9, 0x03, 0x90, 0x14, 0xd0, 0x07, 0xad, 0x17, 0x10,
- 0xc9, 0x1a, 0x90, 0x0b, 0xa2, 0x05, 0xbd, 0x25, 0x10, 0x9d, 0x14, 0x03, 0xca, 0x10, 0xf7, 0xa9,
- 0x1b, 0xa2, 0x00, 0x8d, 0x11, 0xd0, 0x8e, 0x12, 0xd0, 0xad, 0x21, 0x10, 0xf0, 0x06, 0xa9, 0x25,
- 0xa2, 0x40, 0xd0, 0x04, 0xa9, 0x95, 0xa2, 0x42, 0x8d, 0x04, 0xdc, 0x8e, 0x05, 0xdc, 0xa9, 0x0f,
- 0x8d, 0x18, 0xd4, 0xac, 0x15, 0x10, 0x88, 0xcc, 0x16, 0x10, 0x90, 0x02, 0xa0, 0x00, 0x98, 0x48,
- 0xad, 0x1c, 0x10, 0xf0, 0x27, 0xae, 0x1c, 0x10, 0x20, 0xf9, 0x10, 0x8d, 0x24, 0x10, 0xc0, 0x20,
- 0x90, 0x02, 0xa0, 0x1f, 0xa9, 0x00, 0xaa, 0x38, 0x2a, 0x90, 0x02, 0x2a, 0xe8, 0x88, 0x10, 0xf8,
- 0x3d, 0x1d, 0x10, 0xd0, 0x07, 0xa9, 0x81, 0x8d, 0x1a, 0xd0, 0xd0, 0x0a, 0xa9, 0x81, 0xa2, 0x01,
- 0x8d, 0x0d, 0xdc, 0x8e, 0x0e, 0xdc, 0xa9, 0x2f, 0x85, 0x00, 0xad, 0x1a, 0x10, 0xae, 0x23, 0x10,
- 0x20, 0xf9, 0x10, 0x85, 0x01, 0x68, 0xaa, 0xa8, 0x20, 0xf3, 0x10, 0xad, 0x1c, 0x10, 0xf0, 0x04,
- 0xa9, 0x36, 0x85, 0x01, 0x58, 0x4c, 0xf0, 0x10, 0x6c, 0x19, 0x10, 0x6c, 0x1b, 0x10, 0xc9, 0xe0,
- 0x90, 0x03, 0xa9, 0x35, 0x60, 0xc9, 0xd0, 0x90, 0x03, 0xa9, 0x34, 0x60, 0xe0, 0xa0, 0x90, 0x03,
- 0xa9, 0x36, 0x60, 0xa9, 0x37, 0x60, 0xad, 0x1c, 0x10, 0xf0, 0x0c, 0xad, 0x24, 0x10, 0x85, 0x01,
- 0x20, 0xf6, 0x10, 0xa9, 0x36, 0x85, 0x01, 0xad, 0x19, 0xd0, 0x8d, 0x19, 0xd0, 0xad, 0x0d, 0xdc,
- 0x68, 0xa8, 0x68, 0xaa, 0x68, 0x40, 0x2c, 0x0d, 0xdd, 0x40, 0x00, 0x00, 0x0b, 0x82, 0x1b, 0x82,
- 0x02, 0x82, 0x02, 0x82, 0x1e, 0x82, 0x09, 0x82, 0x09, 0x82, 0x09, 0x82, 0x13, 0x82, 0x1a, 0x82,
- 0x04, 0x82, 0x09, 0x82, 0x05, 0x82, 0x03, 0x82, 0x03, 0x82, 0x15, 0x82, 0x1a, 0x82, 0x03, 0x82,
- 0x03, 0x82, 0x08, 0x82, 0x03, 0x82, 0x0a, 0x82, 0x03, 0x82, 0x03, 0x82, 0x1b, 0x82, 0x05, 0x82,
- 0x05, 0x82, 0x00, 0x00, 0x00, 0x00,
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index 119d5c76a4..513d1fe457 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -37,7 +37,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=vice
-VERSION=${VERSION:-3.5}
+VERSION=${VERSION:-3.6.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -129,7 +129,7 @@ config() {
# dynamic about this header, it's just a small chunk of 6502 object
# code as a C array, and for a given version of vice it'll always be
# the same code. It didn't change between vice 3.4 and 3.5, either.
- cat $CWD/psiddrv.h.prebuilt.3.4 > src/c64/psiddrv.h
+ #cat $CWD/psiddrv.h.prebuilt.3.4 > src/c64/psiddrv.h
# 20210809 bkw: in 3.5, upstream added dos2unix as a required dep,
# but it's *only used* if you run "make dist" or "make dist-gzip",
@@ -231,14 +231,14 @@ install -m0644 src/arch/gtk3/data/unix/vice*directory \
# Documentation. vice.pdf has already been installed to the doc dir.
# Generate info, plaintext, and HTML versions here. The text doc is
# harder to navigate, but easier to grep, so it's worth having IMO.
-makeinfo doc/$PRGNAM.texi
-mkdir -p $PKG/usr/info
-mv $PRGNAM.info* $PKG/usr/info
+#makeinfo doc/$PRGNAM.texi
+#mkdir -p $PKG/usr/info
+#mv $PRGNAM.info* $PKG/usr/info
-makeinfo --plaintext doc/$PRGNAM.texi > $PKGDOC/$PRGNAM.txt
+#makeinfo --plaintext doc/$PRGNAM.texi > $PKGDOC/$PRGNAM.txt
-( cd doc ; texi2any --html $PRGNAM.texi )
-cp -a doc/$PRGNAM $PKGDOC/html
+#( cd doc ; texi2any --html $PRGNAM.texi )
+#cp -a doc/$PRGNAM $PKGDOC/html
# 20210810 bkw: as of 3.5, upstream dropped the man pages. I'm
# including the man pages from 3.4 in the 3.5 package. Edited them
@@ -251,7 +251,7 @@ for i in $CWD/man/*.?; do
-e "s,@PDFDOC@,$DOCDIR/$PRGNAM.pdf," \
< $i > $PKG/usr/man/man1/$( basename $i )
done
-gzip -9 $PKG/usr/man/man?/*.? $PKG/usr/info/*
+gzip -9 $PKG/usr/man/man?/*.?
for i in x64 x64sc xscpu64 x64dtv x128 xvic xpet xplus4 xcbm2 xcbm5x0; do
ln -s vice.1.gz $PKG/usr/man/man1/$i.1.gz
done
diff --git a/system/vice/vice.info b/system/vice/vice.info
index adbff1facd..0b744adf92 100644
--- a/system/vice/vice.info
+++ b/system/vice/vice.info
@@ -1,10 +1,10 @@
PRGNAM="vice"
-VERSION="3.5"
+VERSION="3.6.1"
HOMEPAGE="https://vice-emu.sourceforge.io"
-DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.5.tar.gz"
-MD5SUM="23904beb4d251006373f11e99310971c"
+DOWNLOAD="https://downloads.sourceforge.net/project/vice-emu/releases/vice-3.6.1.tar.gz"
+MD5SUM="7fd18d68b3c802658e0a577e9196b448"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="xa"
MAINTAINER="B. Watson"
EMAIL="urchlay@slackware.uk"
diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch
index 0a5260206f..6b5ccd1a9d 100644
--- a/system/virt-manager/Add-Slackware-to-OS-choices.patch
+++ b/system/virt-manager/Add-Slackware-to-OS-choices.patch
@@ -49,14 +49,3 @@ diff -Nur virt-manager-2.2.0.orig/virtinst/install/urldetect.py virt-manager-2.2
class _SuseDistro(_RHELDistro):
PRETTY_NAME = None
_suse_regex = []
-diff -Nur virt-manager-2.2.0.orig/virtinst/osdict.py virt-manager-2.2.0/virtinst/osdict.py
---- virt-manager-2.2.0.orig/virtinst/osdict.py 2019-06-17 00:20:11.000000000 -0500
-+++ virt-manager-2.2.0/virtinst/osdict.py 2019-07-03 02:11:59.208399622 -0500
-@@ -146,6 +146,7 @@
- "rhel5": "rhel5.0",
- "rhel6": "rhel6.0",
- "rhel7": "rhel7.0",
-+ "slackware": "slackware14.2",
- "ubuntuhardy": "ubuntu8.04",
- "ubuntuintrepid": "ubuntu8.10",
- "ubuntujaunty": "ubuntu9.04",
diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild
index 9514fa6914..047e03eed7 100644
--- a/system/virt-manager/virt-manager.SlackBuild
+++ b/system/virt-manager/virt-manager.SlackBuild
@@ -9,7 +9,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=virt-manager
-VERSION=${VERSION:-3.2.0}
+VERSION=${VERSION:-4.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info
index 5f496889a2..033d35106b 100644
--- a/system/virt-manager/virt-manager.info
+++ b/system/virt-manager/virt-manager.info
@@ -1,8 +1,8 @@
PRGNAM="virt-manager"
-VERSION="3.2.0"
+VERSION="4.1.0"
HOMEPAGE="http://virt-manager.org/"
-DOWNLOAD="https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
-MD5SUM="a87507223c32d15eb12e1754404061dc"
+DOWNLOAD="https://virt-manager.org/download/sources/virt-manager/virt-manager-4.1.0.tar.gz"
+MD5SUM="8bf86bcc7e43a956ff94ebdaf4d7d399"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libosinfo libvirt-glib libvirt-python gtk-vnc spice-gtk"
diff --git a/system/xf86-video-qxl/buildfix.diff b/system/xf86-video-qxl/buildfix.diff
new file mode 100644
index 0000000000..d1a8d7e6f2
--- /dev/null
+++ b/system/xf86-video-qxl/buildfix.diff
@@ -0,0 +1,101 @@
+From 4b083ede3c4a827a84295ff223e34ee3c2e581b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Sat, 28 Aug 2021 15:38:40 +0200
+Subject: [PATCH] Fix a build error with Xorg master
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use xf86ReturnOptValBool() in get_bool_option() instead of
+options[option_index].value.bool to fix a compiler error with
+current Xorg xserver master branch.
+
+Also use xf86GetOptValInteger() in get_int_option() and
+xf86GetOptValString() in get_str_option() for consistency.
+
+The change causes a slight performance drop during option parsing
+because the passed-in index_value is no longer used as an index
+into the options array.
+
+Instead, it's used as a token now for the standard option getter
+functions which works since the index_value to the get_*_option()
+functions are identical to the value of options[n].token in the
+passed-in OptionInfoRec array.
+
+Also rename "int option_index" to "int token" for clarity in all
+three functions.
+
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+---
+ src/qxl_option_helpers.c | 13 +++++++------
+ src/qxl_option_helpers.h | 6 +++---
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c
+index 2aba677..7707b7c 100644
+--- a/src/qxl_option_helpers.c
++++ b/src/qxl_option_helpers.c
+@@ -10,31 +10,32 @@
+
+ #include "qxl_option_helpers.h"
+
+-int get_int_option(OptionInfoPtr options, int option_index,
++int get_int_option(OptionInfoPtr options, int token,
+ const char *env_name)
+ {
++ int value;
+ if (env_name && getenv(env_name)) {
+ return atoi(getenv(env_name));
+ }
+- return options[option_index].value.num;
++ return xf86GetOptValInteger(options, token, &value) ? value : 0;
+ }
+
+-const char *get_str_option(OptionInfoPtr options, int option_index,
++const char *get_str_option(OptionInfoPtr options, int token,
+ const char *env_name)
+ {
+ if (getenv(env_name)) {
+ return getenv(env_name);
+ }
+- return options[option_index].value.str;
++ return xf86GetOptValString(options, token);
+ }
+
+-int get_bool_option(OptionInfoPtr options, int option_index,
++int get_bool_option(OptionInfoPtr options, int token,
+ const char *env_name)
+ {
+ const char* value = getenv(env_name);
+
+ if (!value) {
+- return options[option_index].value.bool;
++ return xf86ReturnOptValBool(options, token, FALSE);
+ }
+ if (strcmp(value, "0") == 0 ||
+ strcasecmp(value, "off") == 0 ||
+diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h
+index 7c54c72..66d0a17 100644
+--- a/src/qxl_option_helpers.h
++++ b/src/qxl_option_helpers.h
+@@ -4,13 +4,13 @@
+ #include <xf86Crtc.h>
+ #include <xf86Opt.h>
+
+-int get_int_option(OptionInfoPtr options, int option_index,
++int get_int_option(OptionInfoPtr options, int token,
+ const char *env_name);
+
+-const char *get_str_option(OptionInfoPtr options, int option_index,
++const char *get_str_option(OptionInfoPtr options, int token,
+ const char *env_name);
+
+-int get_bool_option(OptionInfoPtr options, int option_index,
++int get_bool_option(OptionInfoPtr options, int token,
+ const char *env_name);
+
+ #endif // OPTION_HELPERS_H
+--
+GitLab
+
diff --git a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
index f507d7f199..8f9b695f2e 100644
--- a/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
+++ b/system/xf86-video-qxl/xf86-video-qxl.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Slackware build script for xf86-video-qxl
-# Copyright 2012-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2012-2022 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -85,6 +85,7 @@ find -L . \
-exec chmod 644 {} \;
patch -p1 < $CWD/libdrm.patch
+patch -p1 < $CWD/buildfix.diff
# autogen.sh can be used in place of configure
CFLAGS="$SLKCFLAGS" \