From cb958772b4084018bb87d8063d0b04fe13a06b49 Mon Sep 17 00:00:00 2001 From: redth Date: Tue, 1 Oct 2024 10:57:50 -0400 Subject: [PATCH 01/10] Update skia --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index e9d4ecc80e..a0451fbf26 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit e9d4ecc80e680cffd5595e56c8709a6231c79045 +Subproject commit a0451fbf262f3097fa3e9dc171061bcea36f6f57 From 8239610ceae993fb4f5240ac4741047c5db226d3 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 11:18:48 +0800 Subject: [PATCH 02/10] Update with the fix --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index a0451fbf26..c16e913577 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit a0451fbf262f3097fa3e9dc171061bcea36f6f57 +Subproject commit c16e913577083761d847146db7a04b8d3b3bf755 From 090bef2d3c3c5b5023c8d07d746d4dd379f2c85c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 14:08:07 +0800 Subject: [PATCH 03/10] Try bump this --- externals/depot_tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/depot_tools b/externals/depot_tools index f44f219157..ecad42cb6a 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit f44f219157806286070c06d4e46909f51013f379 +Subproject commit ecad42cb6a9b53bbe98f9a06d37dbfbaf7129881 From 53010c9fe3645705f6292f777e671b1bdc42a154 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 15:06:23 +0800 Subject: [PATCH 04/10] this maybe --- externals/depot_tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/depot_tools b/externals/depot_tools index ecad42cb6a..b808b1bcdd 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit ecad42cb6a9b53bbe98f9a06d37dbfbaf7129881 +Subproject commit b808b1bcdd79b344246e0147e98708b91b4573fa From 49ce1c7e668b652a212218ac400cbf93071fe2c1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 17:24:38 +0800 Subject: [PATCH 05/10] Use a newer debian and newer tools --- externals/depot_tools | 2 +- scripts/Docker/debian/amd64/Dockerfile | 2 +- scripts/Docker/debian/arm64v8/Dockerfile | 2 +- scripts/Docker/debian/clang-cross/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/externals/depot_tools b/externals/depot_tools index b808b1bcdd..ecad42cb6a 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit b808b1bcdd79b344246e0147e98708b91b4573fa +Subproject commit ecad42cb6a9b53bbe98f9a06d37dbfbaf7129881 diff --git a/scripts/Docker/debian/amd64/Dockerfile b/scripts/Docker/debian/amd64/Dockerfile index 561574e468..4b7a51144e 100644 --- a/scripts/Docker/debian/amd64/Dockerfile +++ b/scripts/Docker/debian/amd64/Dockerfile @@ -1,7 +1,7 @@ # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ] -FROM amd64/debian:10 +FROM amd64/debian:11 # Install the required packages RUN apt-get update \ diff --git a/scripts/Docker/debian/arm64v8/Dockerfile b/scripts/Docker/debian/arm64v8/Dockerfile index 51f7ba72fd..5a43b8592c 100644 --- a/scripts/Docker/debian/arm64v8/Dockerfile +++ b/scripts/Docker/debian/arm64v8/Dockerfile @@ -1,7 +1,7 @@ # Arguments: # DOTNET_SDK_VERSION - the version of dotnet for the Cake script [ 8.0 | * ] -FROM arm64v8/debian:10 +FROM arm64v8/debian:11 # Install the required packages RUN apt-get update \ diff --git a/scripts/Docker/debian/clang-cross/Dockerfile b/scripts/Docker/debian/clang-cross/Dockerfile index bf64a0fd53..2f7ba9eb5a 100644 --- a/scripts/Docker/debian/clang-cross/Dockerfile +++ b/scripts/Docker/debian/clang-cross/Dockerfile @@ -7,7 +7,7 @@ # FONTCONFIG_VERSION - the exact version of libfontconfig1 to use [ 2.13.1-2 | * ] ARG IMAGE_ARCH=amd64 -FROM ${IMAGE_ARCH}/debian:10 +FROM ${IMAGE_ARCH}/debian:11 # Install the required packages RUN apt-get update \ @@ -16,7 +16,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Install the cross-compilation GCC toolchain -ARG TOOLCHAIN_VERSION=8 +ARG TOOLCHAIN_VERSION=9 ARG TOOLCHAIN_ARCH=arm-linux-gnueabihf ARG TOOLCHAIN_ARCH_SHORT=armhf RUN apt-get update \ @@ -32,7 +32,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION} /usr/${TOOLCHA && sed -i "s/\/usr\/${TOOLCHAIN_ARCH}\/lib\///g" /usr/${TOOLCHAIN_ARCH}/lib/libc.so # Install the cross-compilation skia build dependencies (fontconfig) -ARG FONTCONFIG_VERSION=2.13.1-2 +ARG FONTCONFIG_VERSION=2.13.1-4.2 RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cd /skia-utils/libfontconfig1-dev \ && curl http://deb.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig1-dev.deb \ From 5d058c8d1852890fdf5e113a045e65061a94c565 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 18:39:50 +0800 Subject: [PATCH 06/10] need to look at the other one --- scripts/Docker/debian/clang-cross/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Docker/debian/clang-cross/Dockerfile b/scripts/Docker/debian/clang-cross/Dockerfile index 2f7ba9eb5a..fae67df454 100644 --- a/scripts/Docker/debian/clang-cross/Dockerfile +++ b/scripts/Docker/debian/clang-cross/Dockerfile @@ -32,7 +32,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION} /usr/${TOOLCHA && sed -i "s/\/usr\/${TOOLCHAIN_ARCH}\/lib\///g" /usr/${TOOLCHAIN_ARCH}/lib/libc.so # Install the cross-compilation skia build dependencies (fontconfig) -ARG FONTCONFIG_VERSION=2.13.1-4.2 +ARG FONTCONFIG_VERSION=2.13.1-2 RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cd /skia-utils/libfontconfig1-dev \ && curl http://deb.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig1-dev.deb \ From d727ce6350f4cab80b93261899d0d84c535f9f4a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 19:19:47 +0800 Subject: [PATCH 07/10] try this --- scripts/Docker/debian/clang-cross/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Docker/debian/clang-cross/Dockerfile b/scripts/Docker/debian/clang-cross/Dockerfile index fae67df454..cf5a355711 100644 --- a/scripts/Docker/debian/clang-cross/Dockerfile +++ b/scripts/Docker/debian/clang-cross/Dockerfile @@ -12,7 +12,7 @@ FROM ${IMAGE_ARCH}/debian:11 # Install the required packages RUN apt-get update \ && apt-get install -y \ - curl python3 git clang-13 ninja-build \ + curl python3 git clang-13 ninja-build xz-utils \ && rm -rf /var/lib/apt/lists/* # Install the cross-compilation GCC toolchain @@ -32,7 +32,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION} /usr/${TOOLCHA && sed -i "s/\/usr\/${TOOLCHAIN_ARCH}\/lib\///g" /usr/${TOOLCHAIN_ARCH}/lib/libc.so # Install the cross-compilation skia build dependencies (fontconfig) -ARG FONTCONFIG_VERSION=2.13.1-2 +ARG FONTCONFIG_VERSION=2.13.1-4.2 RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cd /skia-utils/libfontconfig1-dev \ && curl http://deb.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig1-dev.deb \ From 9093222ed2324d3f8e2c055b389ce054caff0968 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 19:34:25 +0800 Subject: [PATCH 08/10] older one for now --- scripts/Docker/debian/clang-cross/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Docker/debian/clang-cross/Dockerfile b/scripts/Docker/debian/clang-cross/Dockerfile index cf5a355711..fefaa6d40b 100644 --- a/scripts/Docker/debian/clang-cross/Dockerfile +++ b/scripts/Docker/debian/clang-cross/Dockerfile @@ -32,7 +32,7 @@ RUN ln -s /usr/${TOOLCHAIN_ARCH}/include/c++/${TOOLCHAIN_VERSION} /usr/${TOOLCHA && sed -i "s/\/usr\/${TOOLCHAIN_ARCH}\/lib\///g" /usr/${TOOLCHAIN_ARCH}/lib/libc.so # Install the cross-compilation skia build dependencies (fontconfig) -ARG FONTCONFIG_VERSION=2.13.1-4.2 +ARG FONTCONFIG_VERSION=2.13.1-2 RUN (mkdir -p /skia-utils/libfontconfig1-dev \ && cd /skia-utils/libfontconfig1-dev \ && curl http://deb.debian.org/debian/pool/main/f/fontconfig/libfontconfig1-dev_${FONTCONFIG_VERSION}_${TOOLCHAIN_ARCH_SHORT}.deb -L -o libfontconfig1-dev.deb \ From 88096a9710f318dc2a89989ea948082293de3d7e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 22:55:04 +0800 Subject: [PATCH 09/10] new xcode --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index f1bf049891..c178e3efe4 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -12,7 +12,7 @@ variables: BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn libkf5itemmodels5 libkf5kiowidgets5 libkchart2 MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - XCODE_VERSION: '15.4' + XCODE_VERSION: '16.0' XCODE_VERSION_NATIVE: '14.3.1' VISUAL_STUDIO_VERSION: '' DOTNET_VERSION: '8.0.304' From 78af08756f5f8e739c4953b7026348b2ace47a3e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Oct 2024 23:48:19 +0800 Subject: [PATCH 10/10] older things --- scripts/azure-pipelines-variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index c178e3efe4..4796fc2419 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -12,12 +12,12 @@ variables: BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn libkf5itemmodels5 libkf5kiowidgets5 libkchart2 MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - XCODE_VERSION: '16.0' + XCODE_VERSION: '15.4' XCODE_VERSION_NATIVE: '14.3.1' VISUAL_STUDIO_VERSION: '' DOTNET_VERSION: '8.0.304' DOTNET_VERSION_PREVIEW: '' - DOTNET_WORKLOAD_SOURCE: '' + DOTNET_WORKLOAD_SOURCE: 'https://github.com/dotnet/maui/releases/download/8.0.82/8.0.82.json' DOTNET_WORKLOAD_TIZEN: '8.0.149' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true