From b572f8c0ed52bb6ef84f60fe56ebd8eb0fb6ceeb Mon Sep 17 00:00:00 2001 From: "Peter P. Lupo" Date: Thu, 18 Jun 2026 00:48:52 -0400 Subject: [PATCH 1/3] Port core to Qt 6.11.1 Signed-off-by: Peter P. Lupo --- .docker/core-wasm.bake.Dockerfile | 2 +- .../raster/Metafile/test/DisplayingXML/CCustomView.cpp | 2 +- vcpkg.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.docker/core-wasm.bake.Dockerfile b/.docker/core-wasm.bake.Dockerfile index af457bc4b6..9ae64aa27d 100644 --- a/.docker/core-wasm.bake.Dockerfile +++ b/.docker/core-wasm.bake.Dockerfile @@ -20,7 +20,7 @@ FROM ghcr.io/euro-office/emsdk:5.0.4 AS core-wasm # hash wasm has one dependency in sdkjs which we must copy here (TODO: fix this) COPY sdkjs/common/stringserialize.js /sdkjs/common/stringserialize.js - ARG CACHE_BUST=5 + ARG CACHE_BUST=6 RUN --mount=type=cache,id=wasm-build-cache-${CACHE_BUST},target=/build-cache-wasm \ --mount=type=bind,source=${NUGET_SOURCE_PATH},target=/nuget-cache,rw <delta(); + double delta = event->angleDelta().y(); double sf = 1.0 + delta / 1000; scale(sf, sf); } diff --git a/vcpkg.json b/vcpkg.json index 6874dd14b3..12e2a01cfe 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -8,6 +8,7 @@ "tests": { "description": "Dependencies for building the C++ unit tests", "dependencies": [ + "cef", "gtest" ] } From 59c0ca514c6509615ee6235c9ef2c0238e8a159a Mon Sep 17 00:00:00 2001 From: "Peter P. Lupo" Date: Fri, 19 Jun 2026 00:17:11 -0400 Subject: [PATCH 2/3] Compilation Warning Fixes: * Resolved `-Wreorder` compiler warnings in `MsBinaryFile/DocFile/OpenXmlPackage.h` by aligning the member initializer list with the class declaration order. Signed-off-by: Peter P. Lupo --- .docker/core.bake.Dockerfile | 1 + Common/3dParty/cef/portfile.cmake | 2 +- MsBinaryFile/DocFile/OpenXmlPackage.h | 6 +++--- vcpkg.json | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.docker/core.bake.Dockerfile b/.docker/core.bake.Dockerfile index 667ebf1edb..41d7d70f16 100644 --- a/.docker/core.bake.Dockerfile +++ b/.docker/core.bake.Dockerfile @@ -147,6 +147,7 @@ FROM core-base AS core -DVCPKG_MANIFEST_MODE=ON \ -DVCPKG_MANIFEST_DIR=/core \ -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_OVERLAY_PORTS=/core/Common/3dParty \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS_RELEASE="-O3 -w" \ -DCMAKE_C_FLAGS_RELEASE="-O3 -w" \ diff --git a/Common/3dParty/cef/portfile.cmake b/Common/3dParty/cef/portfile.cmake index 1b1dfda6f5..88086474b3 100644 --- a/Common/3dParty/cef/portfile.cmake +++ b/Common/3dParty/cef/portfile.cmake @@ -1,4 +1,4 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../../common.cmake") +set(VCPKG_BINARY_REMOTE "https://cloud.nextcloud.com/public.php/dav/files/n9KYBcFYyLLCgEw") # 1. Setup hashes for each architecture (Vcpkg requires these) set(CEF_HASH "NOTFOUND") diff --git a/MsBinaryFile/DocFile/OpenXmlPackage.h b/MsBinaryFile/DocFile/OpenXmlPackage.h index fae9794952..b5f95ed75d 100644 --- a/MsBinaryFile/DocFile/OpenXmlPackage.h +++ b/MsBinaryFile/DocFile/OpenXmlPackage.h @@ -1,4 +1,4 @@ -/* +/* * (c) Copyright Ascensio System SIA 2010-2023 * * This program is a free software product. You can redistribute it and/or @@ -60,12 +60,12 @@ namespace DocFileFormat } RelationshipsFile( const std::wstring& fileName ): - RelID(0), FileName( fileName ) + FileName( fileName ), RelID(0) { } RelationshipsFile( int relID, const std::wstring& fileName, const std::vector& relationships ): - RelID(relID), FileName( fileName ), Relationships( relationships ) + FileName( fileName ), Relationships( relationships ), RelID(relID) { } }; diff --git a/vcpkg.json b/vcpkg.json index 12e2a01cfe..46661c7873 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -8,9 +8,15 @@ "tests": { "description": "Dependencies for building the C++ unit tests", "dependencies": [ - "cef", "gtest" ] + }, + "desktop-editors": { + "description": "Dependencies for building the desktop editors", + "dependencies": [ + "cef", + "vulkan" + ] } }, "overrides": [ From 17f52154f47a013c940d8f6a49e02f33592a8dea Mon Sep 17 00:00:00 2001 From: "Peter P. Lupo" Date: Mon, 22 Jun 2026 02:57:36 -0400 Subject: [PATCH 3/3] fix: add -Wno-enum-constexpr-conversion to V8 build flags Signed-off-by: Peter P. Lupo --- Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch b/Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch index ee09ba6e03..2211764d8d 100644 --- a/Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch +++ b/Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch @@ -7,7 +7,7 @@ index a8618452794..4ab368a4149 100644 defines = [] cflags = [] + if (!is_win) { -+ cflags += ["-include", "cstdint"] ++ cflags += ["-include", "cstdint", "-Wno-enum-constexpr-conversion"] + } ldflags = []