From d17578ffa70582b7a174bf1cf12a6065b9474dd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 16 May 2023 09:17:03 -0400
Subject: [PATCH] packaging: fix build for Qt6 webengine
Fedora:
"WARNING: QtWebEngine won't be built. Python3 html5lib is missing."
Ubuntu 20.04:
Curl not found for nodejs
Change-Id: Ic35aee309f25be20a8934b5033e3fe3ea0a8b6c0
---
extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 | 3 ++-
extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04 | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
index f8c34aa54..568094ae7 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
@@ -98,7 +98,8 @@ RUN dnf install -y \
ninja-build \
clang \
cmake \
- fmt-devel
+ fmt-devel \
+ python3-html5lib
ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04 b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04
index 837d7e975..7c488680d 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_20.04
@@ -8,7 +8,8 @@ RUN apt-get update && \
devscripts \
equivs \
python-is-python3 \
- wget
+ wget \
+ curl
# nodejs
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
--
GitLab