mirror
/
qutebrowser
mirror of https://github.com/qutebrowser/qutebrowser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup dockerfile template for qt6 configurations 

The merge resolution I did in 2d66466194 was a bit hasty. Hopefully
all supported configurations should work now.
This commit is contained in:
toofar 2022-11-20 16:15:06 +13:00
parent 2d66466194
commit ca667d6429
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/dev/ci/docker/Dockerfile.j2
View File

@ -10,13 +10,16 @@ RUN pacman -Suyy --noconfirm \
{% if qt6 %}
qt6-base \
qt6-declarative \
{% if webengine %}qt6-webengine python-pyqt6-webengine{% else %}{{ 1/0 }}{% endif %} \
{% if webengine %}
qt6-webengine python-pyqt6-webengine \
{% else %}{{ 1/0 }}{% endif %}
python-pyqt6 \
{% else %}
qt5-base \
qt5-declarative \
{% if webengine %}
qt5-webengine python-pyqtwebengine \
{% endif %}
python-pyqt5 \
{% endif %}
xorg-xinit \
@ -32,10 +35,15 @@ RUN pacman -U --noconfirm \
https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst
{% endif %}
{% if webengine %}
RUN python3 -c "from PyQt5 import QtWebEngineCore, QtWebEngineWidgets"
{% if qt6 %}
{% set pyqt_module = 'PyQt6' %}
{% else %}
RUN python3 -c "from PyQt5 import QtWebKit, QtWebKitWidgets"
{% set pyqt_module = 'PyQt5' %}
{% endif %}
{% if webengine %}
RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
{% else %}
RUN python3 -c "from {{ pyqt_module }} import QtWebKit, QtWebKitWidgets"
{% endif %}
RUN useradd user -u 1001 && \