From c139952685aac82166041f2948823cedf583a543 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Tue, 1 Oct 2024 22:38:44 +0200
Subject: [PATCH 1/2] Fixing changing PySide versions in TOML files
---
build.sh | 4 ++--
pyside2/linux/Dockerfile | 2 +-
pyside2/wine/Dockerfile | 2 +-
pyside6/linux/Dockerfile | 2 +-
pyside6/wine/Dockerfile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index 6be01dc..2ac9e3d 100644
--- a/build.sh
+++ b/build.sh
@@ -103,8 +103,8 @@ build_pyside() {
latest_tag="$(from-toml-dict "$cfg" "$build.settings" | get-value-of TAG | pass-argument VERSION "${major}-latest")"
build_args="$(from-toml-dict "$cfg" "$build.docker-args" | to-docker-args "$repo" "$version")"
box-green "Building image $repo:$tag..."
- echo "> docker build -t $repo:$tag $build_args $directory/${build}"
- docker build -t "$repo:$tag" $build_args "$directory/${build}"
+ echo "> docker build -t $repo:$tag $build_args --build-arg PYSIDE_VERSION=$version $directory/${build}"
+ docker build -t "$repo:$tag" $build_args --build-arg PYSIDE_VERSION="$version" "$directory/${build}"
# Tag as latest
if [ "$latest" != "false" ]; then
docker tag "$repo:$tag" "$repo:$latest_tag"
diff --git a/pyside2/linux/Dockerfile b/pyside2/linux/Dockerfile
index f35432b..5d35c10 100644
--- a/pyside2/linux/Dockerfile
+++ b/pyside2/linux/Dockerfile
@@ -14,7 +14,7 @@ FROM ubuntu:jammy
# Jammy uses python3.10 and not 3.12, which is not compatible with PySide2.
ARG DEBIAN_FRONTEND=noninteractive
-ARG PYSIDE_VERSION=5.15.2.1
+ARG PYSIDE_VERSION
ENV TZ=Europe/Paris
RUN apt-get update
diff --git a/pyside2/wine/Dockerfile b/pyside2/wine/Dockerfile
index d8ceaf1..aa31bd2 100644
--- a/pyside2/wine/Dockerfile
+++ b/pyside2/wine/Dockerfile
@@ -12,7 +12,7 @@
FROM ubuntu:noble
-ARG PYSIDE_VERSION=5.15.2.1
+ARG PYSIDE_VERSION
# Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
# Upstream hasn't been updated for a while.
diff --git a/pyside6/linux/Dockerfile b/pyside6/linux/Dockerfile
index f7446ad..37bef04 100644
--- a/pyside6/linux/Dockerfile
+++ b/pyside6/linux/Dockerfile
@@ -12,7 +12,7 @@
FROM ubuntu:noble
ARG DEBIAN_FRONTEND=noninteractive
-ARG PYSIDE_VERSION=6.7.2
+ARG PYSIDE_VERSION
ENV TZ=Europe/Paris
RUN apt-get update
diff --git a/pyside6/wine/Dockerfile b/pyside6/wine/Dockerfile
index 03e84c0..a5fe7c8 100644
--- a/pyside6/wine/Dockerfile
+++ b/pyside6/wine/Dockerfile
@@ -12,7 +12,7 @@
FROM ubuntu:noble
-ARG PYSIDE_VERSION=6.7.2
+ARG PYSIDE_VERSION
# Adapted from https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
# Upstream hasn't been updated for a while.
From 702c8eb241047cbdc6bd2bad027ea28868379f41 Mon Sep 17 00:00:00 2001
From: Ad5001 <mail@ad5001.eu>
Date: Tue, 1 Oct 2024 22:39:05 +0200
Subject: [PATCH 2/2] Updating PySide6 to v6.7.3
---
pyside6/config.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyside6/config.toml b/pyside6/config.toml
index 0e123ec..aae9be6 100644
--- a/pyside6/config.toml
+++ b/pyside6/config.toml
@@ -11,7 +11,7 @@
#
MAJOR_VERSION="6"
-PYSIDE_VERSION="6.7.2"
+PYSIDE_VERSION="6.7.3"
BUILDS="linux wine linux-latex"
[linux.settings]