diff --git a/.docker/core-wasm.bake.Dockerfile b/.docker/core-wasm.bake.Dockerfile index 520e561364..9fbc4abac3 100644 --- a/.docker/core-wasm.bake.Dockerfile +++ b/.docker/core-wasm.bake.Dockerfile @@ -21,6 +21,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 + RUN --mount=type=cache,id=wasm-build-cache-${CACHE_BUST},target=/build-cache-wasm \ --mount=type=cache,id=wasm-ccache,target=/ccache \ --mount=type=cache,id=wasm-em-cache,target=/em-cache \ diff --git a/.docker/core.bake.Dockerfile b/.docker/core.bake.Dockerfile index cf83b59691..1a8160cf80 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/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 = [] diff --git a/DesktopEditor/raster/Metafile/test/DisplayingXML/CCustomView.cpp b/DesktopEditor/raster/Metafile/test/DisplayingXML/CCustomView.cpp index e5fcb2b414..b0570ce696 100644 --- a/DesktopEditor/raster/Metafile/test/DisplayingXML/CCustomView.cpp +++ b/DesktopEditor/raster/Metafile/test/DisplayingXML/CCustomView.cpp @@ -70,7 +70,7 @@ void CCustomView::Clear() void CCustomView::wheelEvent(QWheelEvent *event) { - double delta = event->delta(); + double delta = event->angleDelta().y(); double sf = 1.0 + delta / 1000; scale(sf, sf); } 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 6874dd14b3..46661c7873 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -10,6 +10,13 @@ "dependencies": [ "gtest" ] + }, + "desktop-editors": { + "description": "Dependencies for building the desktop editors", + "dependencies": [ + "cef", + "vulkan" + ] } }, "overrides": [