From edd17cd7c39bd7a7922f5136549d23c890071dec Mon Sep 17 00:00:00 2001
From: Alexey Nagaev <aleksei.nagaev@onlyoffice.com>
Date: Wed, 13 Aug 2025 21:28:33 +0300
Subject: [PATCH 1/4] Fix for win_arm64

---
 Common/base.pri | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Common/base.pri b/Common/base.pri
index edc6698a55..01b9740239 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -109,6 +109,10 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): {
 	CONFIG += core_win_32
 }
 
+win32-arm64-msvc2017 {
+    CONFIG += core_win_arm64
+}
+
 linux-clang-libc++ {
     CONFIG += core_linux
 	CONFIG += core_linux_64
@@ -285,6 +289,9 @@ core_win_32 {
 core_win_64 {
 	CORE_BUILDS_PLATFORM_PREFIX = win_64
 }
+core_win_arm64 {
+    CORE_BUILDS_PLATFORM_PREFIX = win_arm64
+}
 core_linux_32 {
 	CORE_BUILDS_PLATFORM_PREFIX = linux_32
 }

From 9e60a7e3abb662d75b425123763e0c896fc0b013 Mon Sep 17 00:00:00 2001
From: Alexey Nagaev <aleksei.nagaev@onlyoffice.com>
Date: Thu, 14 Aug 2025 17:58:05 +0300
Subject: [PATCH 2/4] Fix build for boost

---
 Common/3dParty/boost/boost.pri | 1 +
 Common/base.pri                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Common/3dParty/boost/boost.pri b/Common/3dParty/boost/boost.pri
index 7d6f30de2d..880aa99421 100644
--- a/Common/3dParty/boost/boost.pri
+++ b/Common/3dParty/boost/boost.pri
@@ -32,6 +32,7 @@ core_windows {
     VS_ARCH=x64
     core_debug:VS_DEBUG=gd-
     core_win_32:VS_ARCH=x32
+    core_win_arm64:VS_ARCH=a64
     vs2019:VS_VERSION=142
 
     BOOST_POSTFIX = -vc$${VS_VERSION}-mt-$${VS_DEBUG}$${VS_ARCH}-1_72
diff --git a/Common/base.pri b/Common/base.pri
index 01b9740239..c800ef3474 100644
--- a/Common/base.pri
+++ b/Common/base.pri
@@ -110,6 +110,7 @@ win32:!contains(QMAKE_TARGET.arch, x86_64): {
 }
 
 win32-arm64-msvc2017 {
+    CONFIG -= core_win_32
     CONFIG += core_win_arm64
 }
 

From 4223f9c265c99416fbef7c829a80b10c5c9c0aee Mon Sep 17 00:00:00 2001
From: Alexey Nagaev <aleksei.nagaev@onlyoffice.com>
Date: Thu, 14 Aug 2025 18:23:18 +0300
Subject: [PATCH 3/4] Change major ver of icu

---
 Common/3dParty/icu/icu.pri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common/3dParty/icu/icu.pri b/Common/3dParty/icu/icu.pri
index c5ae929f8a..2ca098bbc9 100644
--- a/Common/3dParty/icu/icu.pri
+++ b/Common/3dParty/icu/icu.pri
@@ -1,4 +1,4 @@
-ICU_MAJOR_VER = 58
+ICU_MAJOR_VER = 74
 
 core_windows {
     exists($$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/icu) {

From 5b12d7fff3dad27a304e314816edcd45f03e8df8 Mon Sep 17 00:00:00 2001
From: Alexey Nagaev <aleksei.nagaev@onlyoffice.com>
Date: Thu, 14 Aug 2025 22:23:52 +0300
Subject: [PATCH 4/4] Fix boost build

---
 Common/3dParty/boost/boost.pri | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Common/3dParty/boost/boost.pri b/Common/3dParty/boost/boost.pri
index 880aa99421..d2641185d6 100644
--- a/Common/3dParty/boost/boost.pri
+++ b/Common/3dParty/boost/boost.pri
@@ -26,6 +26,10 @@ bundle_xcframeworks {
     }
 }
 
+core_win_arm64 {
+    DEFINES += MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=0
+}
+
 core_windows {
     VS_VERSION=140
     VS_DEBUG=