From 5ab70747a9eae37fc2bc9c2e0179f279d90c9f3e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 22 Nov 2021 08:56:50 +0530 Subject: [PATCH] X11extras does not exist on Qt 6 --- bypy/init_env.py | 2 +- bypy/sources.json | 8 -------- setup/arch-ci.sh | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/bypy/init_env.py b/bypy/init_env.py index 8aa9c27236..34d7665759 100644 --- a/bypy/init_env.py +++ b/bypy/init_env.py @@ -46,7 +46,7 @@ dlls = [ ] if islinux: - dlls += ['X11Extras', 'XcbQpa', 'WaylandClient', 'DBus'] + dlls += ['XcbQpa', 'WaylandClient', 'DBus'] elif ismacos: dlls += ['MacExtras', 'DBus'] elif iswindows: diff --git a/bypy/sources.json b/bypy/sources.json index 1203fc8d26..d16da8ad9a 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -476,14 +476,6 @@ } }, - { - "name": "qt-x11extras", - "os": "linux", - "hashes": { - "unix": "sha256:7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e" - } - }, - { "name": "qt-wayland", "os": "linux", diff --git a/setup/arch-ci.sh b/setup/arch-ci.sh index a7c00ffddb..29daddcf90 100755 --- a/setup/arch-ci.sh +++ b/setup/arch-ci.sh @@ -5,7 +5,7 @@ set -xe -pacman -S --noconfirm --needed base-devel sudo git sip pyqt-builder chmlib icu jxrlib hunspell libmtp libusb libwmf optipng podofo python-apsw python-beautifulsoup4 python-cssselect python-css-parser python-dateutil python-jeepney python-dnspython python-feedparser python-html2text python-html5-parser python-lxml python-markdown python-mechanize python-msgpack python-netifaces python-unrardll python-pillow python-psutil python-pygments python-pyqt6 python-regex python-zeroconf python-pyqt6-webengine qt6-x11extras qt6-svg qt6-imageformats udisks2 hyphen python-pychm python-pycryptodome speech-dispatcher python-sphinx python-urllib3 python-py7zr python-pip python-cchardet libstemmer +pacman -S --noconfirm --needed base-devel sudo git sip pyqt-builder chmlib icu jxrlib hunspell libmtp libusb libwmf optipng podofo python-apsw python-beautifulsoup4 python-cssselect python-css-parser python-dateutil python-jeepney python-dnspython python-feedparser python-html2text python-html5-parser python-lxml python-markdown python-mechanize python-msgpack python-netifaces python-unrardll python-pillow python-psutil python-pygments python-pyqt6 python-regex python-zeroconf python-pyqt6-webengine qt6-svg qt6-imageformats udisks2 hyphen python-pychm python-pycryptodome speech-dispatcher python-sphinx python-urllib3 python-py7zr python-pip python-cchardet libstemmer useradd -m ci chown -R ci:users $GITHUB_WORKSPACE