Skip to content

Feature/wayland support #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pplupo wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feature/wayland support #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b572f8c
Port core to Qt 6.11.1
pplupo Jun 18, 2026
59c0ca5
Compilation Warning Fixes:
pplupo Jun 19, 2026
17f5215
fix: add -Wno-enum-constexpr-conversion to V8 build flags
pplupo Jun 22, 2026
91050aa
Merge upstream/main into feature/wayland-migration
pplupo Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .docker/core-wasm.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions .docker/core.bake.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion Common/3dParty/cef/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Common/3dParty/v8/tools/8.9/x64-linux-dynamic/buildgn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index a8618452794..4ab368a4149 100644
defines = []
cflags = []
+ if (!is_win) {
+ cflags += ["-include", "cstdint"]
+ cflags += ["-include", "cstdint", "-Wno-enum-constexpr-conversion"]
+ }
ldflags = []

Expand Down
2 changes: 1 addition & 1 deletion DesktopEditor/raster/Metafile/test/DisplayingXML/CCustomView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
6 changes: 3 additions & 3 deletions MsBinaryFile/DocFile/OpenXmlPackage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* (c) Copyright Ascensio System SIA 2010-2023
*
* This program is a free software product. You can redistribute it and/or
Expand Down Expand Up @@ -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<Relationship>& relationships ):
RelID(relID), FileName( fileName ), Relationships( relationships )
FileName( fileName ), Relationships( relationships ), RelID(relID)
{
}
};
Expand Down
7 changes: 7 additions & 0 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
"dependencies": [
"gtest"
]
},
"desktop-editors": {
"description": "Dependencies for building the desktop editors",
"dependencies": [
"cef",

@rikled rikled Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cef is now pulled via Common/3dParty/cef/nc-build.py from official spotify host. So it can be removed here.

"vulkan"
]
}
},
"overrides": [
Expand Down