diff options
Diffstat (limited to 'www/onlyoffice-documentserver/files')
52 files changed, 507 insertions, 224 deletions
diff --git a/www/onlyoffice-documentserver/files/ds-adminpanel.conf b/www/onlyoffice-documentserver/files/ds-adminpanel.conf new file mode 100644 index 000000000000..23bb8bc1102a --- /dev/null +++ b/www/onlyoffice-documentserver/files/ds-adminpanel.conf @@ -0,0 +1,13 @@ +[program:adminpanel] +command=%%LOCALBASE%%/www/onlyoffice/documentserver/server/AdminPanel/server/adminpanel +directory=%%LOCALBASE%%/www/onlyoffice/documentserver/server/AdminPanel +user=onlyoffice +environment=NODE_ENV=production-freebsd,NODE_CONFIG_DIR=%%LOCALBASE%%/etc/onlyoffice/documentserver,NODE_DISABLE_COLORS=1 +stdout_logfile=/var/log/onlyoffice/documentserver/adminpanel/out.log +stdout_logfile_backups=0 +stdout_logfile_maxbytes=0 +stderr_logfile=/var/log/onlyoffice/documentserver/adminpanel/err.log +stderr_logfile_backups=0 +stderr_logfile_maxbytes=0 +autostart=true +autorestart=true diff --git a/www/onlyoffice-documentserver/files/ds.conf b/www/onlyoffice-documentserver/files/ds.conf index 307d2ea5c60f..943446672724 100644 --- a/www/onlyoffice-documentserver/files/ds.conf +++ b/www/onlyoffice-documentserver/files/ds.conf @@ -1,2 +1,2 @@ [group:ds]
-programs=docservice,converter,metrics
+programs=docservice,converter,metrics,adminpanel diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js index 488a4adcbd28..83880f6f2aa0 100644 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js @@ -1,6 +1,6 @@ ---- yao-pkg/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js.orig 2024-01-25 21:40:25.773587000 +0100 -+++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js 2024-01-25 21:41:12.907517000 +0100 -@@ -99,12 +99,6 @@ function getConfigureArgs(major, targetPlatform) { +--- yao-pkg/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js.orig 2025-10-18 21:16:20 UTC ++++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js +@@ -100,12 +100,6 @@ function getConfigureArgs(major, targetPlatform, targetArch) { if (targetPlatform === 'linuxstatic') { args.push('--fully-static'); } @@ -13,26 +13,19 @@ // production binaries do NOT take NODE_OPTIONS from end-users args.push('--without-node-options'); // The dtrace and etw support was removed in https://github.com/nodejs/node/commit/aa3a572e6bee116cde69508dc29478b40f40551a -@@ -115,7 +109,14 @@ function getConfigureArgs(major, targetPlatform) { - // bundled npm package manager +@@ -117,7 +111,14 @@ function getConfigureArgs(major, targetPlatform, targetArch) { args.push('--without-npm'); // Small ICU -- args.push('--with-intl=small-icu'); -+ args.push('--with-intl=system-icu'); -+ args.push('--shared-openssl'); -+ args.push('--openssl-use-def-ca-store'); -+ args.push('--shared-brotli'); -+ args.push('--shared-cares'); -+ args.push('--shared-libuv'); -+ args.push('--shared-nghttp2'); -+ args.push('--shared-zlib'); + if (system_1.hostPlatform !== 'win' || major < 24) { +- args.push('--with-intl=small-icu'); ++ args.push('--with-intl=system-icu'); ++ args.push('--shared-openssl'); ++ args.push('--openssl-use-def-ca-store'); ++ args.push('--shared-brotli'); ++ args.push('--shared-cares'); ++ args.push('--shared-libuv'); ++ args.push('--shared-nghttp2'); ++ args.push('--shared-zlib'); + } // Workaround for nodejs/node#39313 // All supported macOS versions have zlib as a system library - if (targetPlatform === 'macos') { -@@ -433,4 +434,4 @@ exports.default = build; - }); - } - exports.default = build; --//# sourceMappingURL=build.js.map -\ No newline at end of file -+//# sourceMappingURL=build.js.map diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.5.cpp.patch index 0940e6667edd..486b43f41365 100644 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.5.cpp.patch @@ -1,8 +1,8 @@ -https://github.com/yao-pkg/pkg-fetch/raw/refs/tags/v3.5.24/patches/node.v20.19.4.cpp.patch +https://github.com/yao-pkg/pkg-fetch/raw/refs/tags/v3.5.29/patches/node.v20.19.5.cpp.patch + local FreeBSD patches ---- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.4.cpp.patch -+++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.4.cpp.patch +--- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.5.cpp.patch ++++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.5.cpp.patch @@ -600,3 +600,186 @@ index 2655b9e694..1d951571c7 100644 'cflags_cc!': [ '-fno-rtti' ], }], diff --git a/www/onlyoffice-documentserver/files/npm b/www/onlyoffice-documentserver/files/npm index 63b3d2d821f1..303b86ba9102 100644 --- a/www/onlyoffice-documentserver/files/npm +++ b/www/onlyoffice-documentserver/files/npm @@ -1,3 +1,3 @@ #!/bin/sh -exec %%LOCALBASE%%/bin/npm --offline --nodedir=%%LOCALBASE%% "$@" -#exec %%LOCALBASE%%/bin/npm --nodedir=%%LOCALBASE%% "$@" +exec %%LOCALBASE%%/bin/npm --offline "$@" +#exec %%LOCALBASE%%/bin/npm "$@" diff --git a/www/onlyoffice-documentserver/files/package-lock.json b/www/onlyoffice-documentserver/files/package-lock.json index 59035f286384..f73338dc1b33 100644 --- a/www/onlyoffice-documentserver/files/package-lock.json +++ b/www/onlyoffice-documentserver/files/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@yao-pkg/pkg": "^6.6.0" + "@yao-pkg/pkg": "^6.9.0" } }, "node_modules/@babel/generator": { @@ -118,15 +118,15 @@ } }, "node_modules/@yao-pkg/pkg": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@yao-pkg/pkg/-/pkg-6.6.0.tgz", - "integrity": "sha512-3/oiaSm7fS0Fc7dzp22r9B7vFaguGhO9vERgEReRYj2EUzdi5ssyYhe1uYJG4ec/dmo2GG6RRHOUAT8savl79Q==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@yao-pkg/pkg/-/pkg-6.9.0.tgz", + "integrity": "sha512-8K4P5ZRPtOIneylzmCgTWTNwxOuzju+ds/wSDli8EokmAYCG/Flr/NliFjfZ8I9t//FcG1Di7rBldyjEhPtKvQ==", "license": "MIT", "dependencies": { "@babel/generator": "^7.23.0", "@babel/parser": "^7.23.0", "@babel/types": "^7.23.0", - "@yao-pkg/pkg-fetch": "3.5.24", + "@yao-pkg/pkg-fetch": "3.5.29", "into-stream": "^6.0.0", "minimist": "^1.2.6", "multistream": "^4.1.0", @@ -147,9 +147,9 @@ } }, "node_modules/@yao-pkg/pkg-fetch": { - "version": "3.5.24", - "resolved": "https://registry.npmjs.org/@yao-pkg/pkg-fetch/-/pkg-fetch-3.5.24.tgz", - "integrity": "sha512-FPESCH1uXCYui6jeDp2aayWuFHR39w+uU1r88nI6JWRvPYOU64cHPUV/p6GSFoQdpna7ip92HnrZKbBC60l0gA==", + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@yao-pkg/pkg-fetch/-/pkg-fetch-3.5.29.tgz", + "integrity": "sha512-Kpfpx9/XBkOZ/Nb41ybBGO+IaD9lu9svFxwqNt2xN0zwkxIQbaWU2gS5kOzkKPFlk2WUHoqtTkaDyYRARSOkkg==", "license": "MIT", "dependencies": { "https-proxy-agent": "^5.0.0", @@ -157,13 +157,38 @@ "picocolors": "^1.1.0", "progress": "^2.0.3", "semver": "^7.3.5", - "tar-fs": "^2.1.1", + "tar-fs": "^3.1.1", "yargs": "^16.2.0" }, "bin": { "pkg-fetch": "lib-es5/bin.js" } }, + "node_modules/@yao-pkg/pkg-fetch/node_modules/tar-fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz", + "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==", + "license": "MIT", + "dependencies": { + "pump": "^3.0.0", + "tar-stream": "^3.1.5" + }, + "optionalDependencies": { + "bare-fs": "^4.0.1", + "bare-path": "^3.0.0" + } + }, + "node_modules/@yao-pkg/pkg-fetch/node_modules/tar-stream": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz", + "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==", + "license": "MIT", + "dependencies": { + "b4a": "^1.6.4", + "fast-fifo": "^1.2.0", + "streamx": "^2.15.0" + } + }, "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -200,6 +225,111 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/b4a": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz", + "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==", + "license": "Apache-2.0", + "peerDependencies": { + "react-native-b4a": "*" + }, + "peerDependenciesMeta": { + "react-native-b4a": { + "optional": true + } + } + }, + "node_modules/bare-events": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.0.tgz", + "integrity": "sha512-AOhh6Bg5QmFIXdViHbMc2tLDsBIRxdkIaIddPslJF9Z5De3APBScuqGP2uThXnIpqFrgoxMNC6km7uXNIMLHXA==", + "license": "Apache-2.0", + "peerDependencies": { + "bare-abort-controller": "*" + }, + "peerDependenciesMeta": { + "bare-abort-controller": { + "optional": true + } + } + }, + "node_modules/bare-fs": { + "version": "4.4.11", + "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.4.11.tgz", + "integrity": "sha512-Bejmm9zRMvMTRoHS+2adgmXw1ANZnCNx+B5dgZpGwlP1E3x6Yuxea8RToddHUbWtVV0iUMWqsgZr8+jcgUI2SA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bare-events": "^2.5.4", + "bare-path": "^3.0.0", + "bare-stream": "^2.6.4", + "bare-url": "^2.2.2", + "fast-fifo": "^1.3.2" + }, + "engines": { + "bare": ">=1.16.0" + }, + "peerDependencies": { + "bare-buffer": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + } + } + }, + "node_modules/bare-os": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.2.tgz", + "integrity": "sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==", + "license": "Apache-2.0", + "optional": true, + "engines": { + "bare": ">=1.14.0" + } + }, + "node_modules/bare-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", + "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bare-os": "^3.0.1" + } + }, + "node_modules/bare-stream": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.7.0.tgz", + "integrity": "sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "streamx": "^2.21.0" + }, + "peerDependencies": { + "bare-buffer": "*", + "bare-events": "*" + }, + "peerDependenciesMeta": { + "bare-buffer": { + "optional": true + }, + "bare-events": { + "optional": true + } + } + }, + "node_modules/bare-url": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.0.tgz", + "integrity": "sha512-c+RCqMSZbkz97Mw1LWR0gcOqwK82oyYKfLoHJ8k13ybi1+I80ffdDzUy0TdAburdrR/kI0/VuN8YgEnJqX+Nyw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "bare-path": "^3.0.0" + } + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -311,9 +441,9 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -389,6 +519,15 @@ "node": ">=6" } }, + "node_modules/events-universal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", + "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", + "license": "Apache-2.0", + "dependencies": { + "bare-events": "^2.7.0" + } + }, "node_modules/expand-template": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", @@ -397,6 +536,12 @@ "node": ">=6" } }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "license": "MIT" + }, "node_modules/fdir": { "version": "6.4.4", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", @@ -777,6 +922,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -959,6 +1105,17 @@ "readable-stream": "^2.1.4" } }, + "node_modules/streamx": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", + "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", + "license": "MIT", + "dependencies": { + "events-universal": "^1.0.0", + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -1087,6 +1244,15 @@ "node": ">=18" } }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, "node_modules/tinyglobby": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", diff --git a/www/onlyoffice-documentserver/files/package.json b/www/onlyoffice-documentserver/files/package.json index 9251e320859a..e012fc0f3ff0 100644 --- a/www/onlyoffice-documentserver/files/package.json +++ b/www/onlyoffice-documentserver/files/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "@yao-pkg/pkg": "^6.6.0" + "@yao-pkg/pkg": "^6.9.0" } } diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_configure.py b/www/onlyoffice-documentserver/files/patch-build__tools_configure.py index 8ba1ee336b65..6fcd6155d413 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_configure.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_configure.py @@ -1,11 +1,11 @@ --- build_tools/configure.py.orig 2021-12-08 10:18:20 UTC +++ build_tools/configure.py -@@ -14,7 +14,7 @@ parser.add_option("--clean", action="store", type="str +@@ -14,7 +14,7 @@ parser.add_option("--module", action="store", type="string", dest="module", default="builder", help="defines what modules to build. You can specify several of them, e.g. --module 'core desktop builder server mobile'") parser.add_option("--develop", action="store", type="string", dest="develop", default="0", help="defines develop mode") parser.add_option("--beta", action="store", type="string", dest="beta", default="0", help="defines beta mode") --parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]") -+parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'freebsd_64', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'freebsd': freebsd_64;'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]") +-parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'win_arm64', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]") ++parser.add_option("--platform", action="store", type="string", dest="platform", default="native", help="defines the destination platform for your build ['win_64', 'win_32', 'win_64_xp', 'win_32_xp', 'win_arm64', 'freebsd_64', 'linux_64', 'linux_32', 'mac_64', 'ios', 'android_arm64_v8a', 'android_armv7', 'android_x86', 'android_x86_64'; combinations: 'native': your current system (windows/linux/mac only); 'all': all available systems; 'windows': win_64 win_32 win_64_xp win_32_xp; 'freebsd': freebsd_64; 'linux': linux_64 linux_32; 'mac': mac_64; 'android': android_arm64_v8a android_armv7 android_x86 android_x86_64]") parser.add_option("--config", action="store", type="string", dest="config", default="", help="provides ability to specify additional parameters for qmake") parser.add_option("--qt-dir", action="store", type="string", dest="qt-dir", default="", help="defines qmake directory path. qmake can be found in qt-dir/compiler/bin directory") parser.add_option("--qt-dir-xp", action="store", type="string", dest="qt-dir-xp", default="", help="defines qmake directory path for Windows XP. qmake can be found in 'qt-dir/compiler/bin directory") diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py index 74dddee61746..663e31269b43 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py @@ -1,8 +1,11 @@ ---- build_tools/scripts/build_server.py.orig 2025-06-11 12:56:35 UTC +--- build_tools/scripts/build_server.py.orig 2025-10-15 14:25:47 UTC +++ build_tools/scripts/build_server.py -@@ -41,6 +41,10 @@ def make(): +@@ -39,8 +39,12 @@ + base.copy_file(custom_public_key, server_dir + '/Common/sources') + #node22 packaging has issue https://github.com/yao-pkg/pkg/issues/87 - pkg_target = "node20" +- pkg_target = "node20" ++ pkg_target = "node%%PKGFETCH_NODE_MAJOR_VERSION%%" + if ("freebsd" == base.host_platform()): + pkg_target += "-freebsd" @@ -11,18 +14,19 @@ if ("linux" == base.host_platform()): pkg_target += "-linux" if (-1 != config.option("platform").find("linux_arm64")): -@@ -49,14 +53,15 @@ def make(): +@@ -49,15 +53,15 @@ if ("windows" == base.host_platform()): pkg_target += "-win" - base.cmd_in_dir(server_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"]) - base.cmd_in_dir(server_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"]) - base.cmd_in_dir(server_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"]) +- base.cmd_in_dir(server_dir + "/AdminPanel/server", "pkg", [".", "-t", pkg_target, "-o", "adminpanel"]) + base.cmd_in_dir(server_dir + "/DocService", pkgBin, [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"]) + base.cmd_in_dir(server_dir + "/FileConverter", pkgBin, [".", "-t", pkg_target, "-o", "converter"]) + base.cmd_in_dir(server_dir + "/Metrics", pkgBin, [".", "-t", pkg_target, "-o", "metrics"]) ++ base.cmd_in_dir(server_dir + "/AdminPanel/server", pkgBin, [".", "-t", pkg_target, "-o", "adminpanel"]) -+ example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs" base.delete_dir(example_dir + "/node_modules") base.cmd_in_dir(example_dir, "npm", ["ci"]) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_config.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_config.py index b73624d0e414..ce1e656f0a3f 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_config.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_config.py @@ -1,14 +1,14 @@ ---- build_tools/scripts/config.py.orig 2022-04-29 20:25:52 UTC +--- build_tools/scripts/config.py.orig 2025-10-15 14:25:47 UTC +++ build_tools/scripts/config.py -@@ -26,6 +26,7 @@ def parse(): +@@ -26,6 +26,7 @@ global platforms - platforms = ["win_64", "win_32", "win_64_xp", "win_32_xp", + platforms = ["win_64", "win_32", "win_64_xp", "win_32_xp", "win_arm64", "linux_64", "linux_32", "linux_arm64", + "freebsd_64", "mac_64", "mac_arm64", "ios", "android_arm64_v8a", "android_armv7", "android_x86", "android_x86_64"] -@@ -39,6 +40,8 @@ def parse(): +@@ -39,6 +40,8 @@ options["platform"] += " win_64 win_32" elif ("linux" == host_platform): options["platform"] += " linux_64 linux_32" @@ -17,7 +17,7 @@ else: options["platform"] += " mac_64" -@@ -50,6 +53,8 @@ def parse(): +@@ -50,6 +53,8 @@ options["platform"] += (" win_" + bits) elif ("linux" == host_platform): options["platform"] += (" linux_" + bits) @@ -26,10 +26,10 @@ else: options["platform"] += (" mac_" + bits) -@@ -112,6 +117,9 @@ def check_compiler(platform): - if (0 == platform.find("win")): - compiler["compiler"] = "msvc" + options["vs-version"] - compiler["compiler_64"] = "msvc" + options["vs-version"] + "_64" +@@ -176,6 +181,9 @@ + if (0 == platform.find("win_arm")): + compiler["compiler"] = "msvc" + options["vs-version"] + "_arm" + compiler["compiler_64"] = "msvc" + options["vs-version"] + "_arm64" + elif (0 == platform.find("freebsd")): + compiler["compiler"] = "clang" + compiler["compiler_64"] = "clang_64" diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py index c1fbe9c44b38..ee700eb9883e 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py @@ -1,6 +1,6 @@ ---- build_tools/scripts/core_common/make_common.py.orig 2025-06-11 12:56:35 UTC +--- build_tools/scripts/core_common/make_common.py.orig 2025-10-15 14:25:47 UTC +++ build_tools/scripts/core_common/make_common.py -@@ -8,21 +8,21 @@ import config +@@ -8,24 +8,24 @@ import base import glob @@ -22,14 +22,18 @@ +#import hunspell import glew import harfbuzz + import oo_brotli -import hyphen -import googletest +#import hyphen +#import googletest import libvlc +-import heif ++#import heif def check_android_ndk_macos_arm(dir): -@@ -38,19 +38,19 @@ def make(): + if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"): +@@ -40,21 +40,21 @@ if base.is_dir(toolchain): check_android_ndk_macos_arm(toolchain + "/prebuilt") @@ -54,6 +58,9 @@ - googletest.make() +# hyphen.make() +# googletest.make() + oo_brotli.make() +- heif.make() ++# heif.make() if config.check_option("build-libvlc", "1"): libvlc.make() diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py index fc7d27d3fabf..74b86c964128 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py @@ -1,5 +1,5 @@ ---- build_tools/scripts/core_common/modules/iwork.py.orig 2025-03-08 16:01:52.467009000 +0100 -+++ build_tools/scripts/core_common/modules/iwork.py 2025-03-08 16:19:57.046228000 +0100 +--- build_tools/scripts/core_common/modules/iwork.py.orig 2025-08-05 15:06:08 UTC ++++ build_tools/scripts/core_common/modules/iwork.py @@ -30,9 +30,9 @@ def make(use_gperf = True): if use_gperf: cmd_args.append("--gperf") diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py index b2204a037714..2b9632e8092f 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py @@ -1,14 +1,14 @@ ---- build_tools/scripts/core_common/modules/v8.py.orig 2024-02-07 10:44:24.000000000 +0100 -+++ build_tools/scripts/core_common/modules/v8.py 2024-03-01 10:40:07.626578000 +0100 -@@ -9,6 +9,7 @@ def clean(): +--- build_tools/scripts/core_common/modules/v8.py.orig 2025-08-05 15:06:08 UTC ++++ build_tools/scripts/core_common/modules/v8.py +@@ -9,6 +9,7 @@ import subprocess import v8_89 def clean(): + return if base.is_dir("depot_tools"): - base.delete_dir_with_access_error("depot_tools"); + base.delete_dir_with_access_error("depot_tools") base.delete_dir("depot_tools") -@@ -26,6 +27,8 @@ def is_main_platform(): +@@ -26,6 +27,8 @@ def clean(): def is_main_platform(): if (config.check_option("platform", "win_64") or config.check_option("platform", "win_32")): return True @@ -44,7 +44,7 @@ if not base.is_dir("v8"): @@ -121,8 +109,8 @@ def make(): base.delete_dir_with_access_error("v8/buildtools/win") - base.cmd("git", ["config", "--system", "core.longpaths", "true"]) + base.cmd("git", ["config", "--system", "core.longpaths", "true"], True) base.cmd("gclient", ["sync", "--force"], True) - else: - base.cmd("gclient", ["sync"], True) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py index 187eb0d78e41..431b315c60e8 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py @@ -1,13 +1,13 @@ ---- build_tools/scripts/core_common/modules/v8_89.py.orig 2024-02-07 10:44:24.000000000 +0100 -+++ build_tools/scripts/core_common/modules/v8_89.py 2024-03-01 10:42:06.847661000 +0100 -@@ -115,46 +115,7 @@ def make(): +--- build_tools/scripts/core_common/modules/v8_89.py.orig 2025-10-15 14:25:47 UTC ++++ build_tools/scripts/core_common/modules/v8_89.py +@@ -150,57 +150,6 @@ base.cmd("git", ["config", "--global", "http.postBuffer", "157286400"], True) os.chdir(base_dir) - if not base.is_dir("depot_tools"): - base.cmd("git", ["clone", "https://chromium.googlesource.com/chromium/tools/depot_tools.git"]) - change_bootstrap() - +- - os.environ["PATH"] = base_dir + "/depot_tools" + os.pathsep + os.environ["PATH"] - - if ("windows" == base.host_platform()): @@ -30,8 +30,19 @@ - - if ("windows" == base.host_platform()): - base.replaceInFile("v8/build/config/win/BUILD.gn", ":static_crt", ":dynamic_crt") +- +- # fix for new depot_tools and vs2019, as VC folder contains a folder with a symbol in the name +- # sorting is done by increasing version, so 0 is a dummy value +- replace_src = " def to_int_if_int(x):\n try:\n return int(x)\n except ValueError:\n return x" +- replace_dst = " def to_int_if_int(x):\n try:\n return int(x)\n except ValueError:\n return 0" +- base.replaceInFile("v8/build/vs_toolchain.py", replace_src, replace_dst) +- +- - if not base.is_file("v8/src/base/platform/wrappers.cc"): - base.writeFile("v8/src/base/platform/wrappers.cc", "#include \"src/base/platform/wrappers.h\"\n") +- +- if config.check_option("platform", "win_arm64"): +- base.replaceInFile("v8/build/toolchain/win/setup_toolchain.py", "SDK_VERSION = \'10.0.26100.0\'", "SDK_VERSION = \'10.0.22621.0\'") - else: - base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "") - @@ -47,9 +58,9 @@ os.chdir("v8") gn_args = ["v8_static_library=true", -@@ -163,6 +124,11 @@ def make(): +@@ -208,6 +157,11 @@ + "v8_monolithic=true", "v8_use_external_startup_data=false", - "use_custom_libcxx=false", "treat_warnings_as_errors=false"] + + if config.check_option("platform", "freebsd_64"): @@ -58,4 +69,4 @@ + if config.check_option("platform", "linux_64"): - base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")]) + if config.option("sysroot") != "": diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_deploy__server.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_deploy__server.py index da3baf40b273..127bd662f1dc 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_deploy__server.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_deploy__server.py @@ -1,17 +1,17 @@ ---- build_tools/scripts/deploy_server.py.orig 2021-11-16 07:07:24 UTC +--- build_tools/scripts/deploy_server.py.orig 2025-10-15 14:25:47 UTC +++ build_tools/scripts/deploy_server.py -@@ -92,7 +92,7 @@ def make(): - base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/icudt58.dll", converter_dir + "/icudt58.dll") - base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/icuuc58.dll", converter_dir + "/icuuc58.dll") +@@ -102,7 +102,7 @@ + base.generate_doctrenderer_config(converter_dir + "/DoctRenderer.config", "../../../", "server", "", "../../../dictionaries") -- if (0 == platform.find("linux")): -+ if (0 == platform.find("linux") and 0 != platform.find('freebsd')): - base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/libicudata.so.58", converter_dir + "/libicudata.so.58") - base.copy_file(core_dir + "/Common/3dParty/icu/" + platform + "/build/libicuuc.so.58", converter_dir + "/libicuuc.so.58") + # icu +- base.deploy_icu(core_dir, converter_dir, platform) ++# base.deploy_icu(core_dir, converter_dir, platform) -@@ -119,9 +121,13 @@ def make(): - base.copy_sdkjs_plugins(js_dir + "/sdkjs-plugins", False, True) - base.copy_sdkjs_plugins_server(js_dir + "/sdkjs-plugins", False, True) + base.copy_v8_files(core_dir, converter_dir, platform) + +@@ -136,9 +136,13 @@ + else: + base.generate_sdkjs_plugin_list(js_dir + "/sdkjs-plugins/plugin-list-default.json") base.create_dir(js_dir + "/sdkjs-plugins/v1") - base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.js", js_dir + "/sdkjs-plugins/v1/plugins.js") - base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins-ui.js", js_dir + "/sdkjs-plugins/v1/plugins-ui.js") @@ -24,5 +24,5 @@ + base.copy_file(plugins_dir + "/v1/plugins.css", js_dir + "/sdkjs-plugins/v1/plugins.css") + base.support_old_versions_plugins(js_dir + "/sdkjs-plugins") - + # tools diff --git a/www/onlyoffice-documentserver/files/patch-clang19 b/www/onlyoffice-documentserver/files/patch-clang19 index a17acc4bf5f9..b095611d738d 100644 --- a/www/onlyoffice-documentserver/files/patch-clang19 +++ b/www/onlyoffice-documentserver/files/patch-clang19 @@ -21,9 +21,7 @@ Date: 2023-08-17T13:50:11-07:00 Auto-Submit: Andrey Kosyakov <caseq@chromium.org> Cr-Commit-Position: refs/heads/main@{#89559} -diff --git deps/v8/src/inspector/string-16.cc deps/v8/src/inspector/string-16.cc -index a8b786a8166..6df9963e970 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc +--- core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc @@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); @@ -34,7 +32,7 @@ index a8b786a8166..6df9963e970 100644 bool* ok = nullptr) { std::vector<char> buffer; buffer.reserve(length + 1); -@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, size_t length, +@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, s String16::String16(const UChar* characters, size_t size) : m_impl(characters, size) {} @@ -43,21 +41,18 @@ index a8b786a8166..6df9963e970 100644 String16::String16(const UChar* characters) : m_impl(characters) {} -@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UChar* stringStart, size_t length) { +@@ -231,6 +233,10 @@ String16 String16::fromUTF16LE(const UChar* stringStar + // No need to do anything on little endian machines. + return String16(stringStart, length); #endif // V8_TARGET_BIG_ENDIAN - } - -+String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { -+ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length); +} + - std::string String16::utf8() const { - return UTF16ToUTF8(m_impl.data(), m_impl.size()); ++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { ++ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length); } - -diff --git deps/v8/src/inspector/string-16.h deps/v8/src/inspector/string-16.h -index 1678ffb2e1e..d9f6c466ab1 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/string-16.h + + std::string String16::utf8() const { +--- core/Common/3dParty/v8_89/v8/src/inspector/string-16.h.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/string-16.h @@ -6,6 +6,7 @@ #define V8_INSPECTOR_STRING_16_H_ @@ -67,7 +62,7 @@ index 1678ffb2e1e..d9f6c466ab1 100644 #include <cctype> #include <climits> #include <cstring> -@@ -17,7 +18,7 @@ namespace v8_inspector { +@@ -17,7 +18,7 @@ namespace v8_inspector { @@ -104,10 +99,7 @@ index 1678ffb2e1e..d9f6c466ab1 100644 size_t length); std::size_t hash() const { - -diff --git deps/v8/src/inspector/v8-string-conversions.cc deps/v8/src/inspector/v8-string-conversions.cc -index 0c75e66b972..8cf19be816c 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc +--- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc @@ -12,7 +12,7 @@ @@ -118,7 +110,7 @@ index 0c75e66b972..8cf19be816c 100644 using UChar32 = uint32_t; bool isASCII(UChar c) { return !(c & ~0x7F); } -@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* stringStart, size_t length) { +@@ -389,7 +389,7 @@ std::string UTF16ToUTF8(const UChar* stringStart, size std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { if (!stringStart || !length) return std::basic_string<UChar>(); @@ -127,7 +119,7 @@ index 0c75e66b972..8cf19be816c 100644 UChar* bufferStart = buffer.data(); UChar* bufferCurrent = bufferStart; -@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { +@@ -398,7 +398,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* strin reinterpret_cast<const char*>(stringStart + length), &bufferCurrent, bufferCurrent + buffer.size(), nullptr, true) != conversionOK) @@ -136,9 +128,7 @@ index 0c75e66b972..8cf19be816c 100644 size_t utf16Length = bufferCurrent - bufferStart; return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length); } -diff --git deps/v8/src/inspector/v8-string-conversions.h deps/v8/src/inspector/v8-string-conversions.h -index eb33c6816a5..1126255dac2 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h +--- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h @@ -5,13 +5,15 @@ #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ @@ -158,7 +148,7 @@ index eb33c6816a5..1126255dac2 100644 } // namespace v8_inspector #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ ---- core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc +--- core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc @@ -11,13 +11,16 @@ namespace v8_crdtp { diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp index 3ee3b46a22d5..1ff708a7590b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp @@ -1,5 +1,5 @@ ---- core/Apple/IWork.cpp.orig 2025-03-08 16:26:16.590289000 +0100 -+++ core/Apple/IWork.cpp 2025-03-08 16:45:14.932729000 +0100 +--- core/Apple/IWork.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/Apple/IWork.cpp @@ -6,7 +6,8 @@ #include <libodfgen/OdtGenerator.hxx> #include <libodfgen/OdsGenerator.hxx> diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro index 49dbd6d80585..ae16f66a185b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro @@ -1,6 +1,6 @@ ---- core/Apple/IWork.pro.orig 2025-03-08 16:31:03.447633000 +0100 -+++ core/Apple/IWork.pro 2025-03-08 17:07:58.170674000 +0100 -@@ -10,6 +10,14 @@ DEFINES += IWORK_USE_DYNAMIC_LIBRARY +--- core/Apple/IWork.pro.orig 2025-08-02 18:33:34 UTC ++++ core/Apple/IWork.pro +@@ -10,6 +10,14 @@ CONFIG += plugin DEFINES += IWORK_USE_DYNAMIC_LIBRARY @@ -15,7 +15,7 @@ CORE_ROOT_DIR = $$PWD/.. PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) -@@ -38,8 +46,8 @@ include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri +@@ -38,8 +46,8 @@ include($$PWD/../DesktopEditor/xml/build/qt/libxml2.pr include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri) # TEST diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx index 0d72b10783f3..47c1e5bbbbd7 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx @@ -1,5 +1,5 @@ ---- core/Apple/StringDocumentHandler.hxx.orig 2025-07-21 00:30:34.163412000 +0000 -+++ core/Apple/StringDocumentHandler.hxx 2025-07-21 03:02:42.802399000 +0000 +--- core/Apple/StringDocumentHandler.hxx.orig 2025-08-08 19:00:43 UTC ++++ core/Apple/StringDocumentHandler.hxx @@ -0,0 +1,154 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* writerperfect diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py new file mode 100644 index 000000000000..5313593d9366 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py @@ -0,0 +1,11 @@ +--- core/Common/3dParty/brotli/make.py.orig 2025-08-02 18:33:34 UTC ++++ core/Common/3dParty/brotli/make.py +@@ -10,7 +10,7 @@ def clear_module(): + base.delete_dir_with_access_error("brotli") + return + +-base.check_module_version("1", clear_module) ++#base.check_module_version("1", clear_module) + + # fetch harfbuzz + if not base.is_dir("brotli"): diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_heif_heif.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_heif_heif.pri new file mode 100644 index 000000000000..865919c71b1e --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_heif_heif.pri @@ -0,0 +1,21 @@ +--- core/Common/3dParty/heif/heif.pri.orig 2025-10-13 15:33:25 UTC ++++ core/Common/3dParty/heif/heif.pri +@@ -7,9 +7,15 @@ + + HEIF_BUILD_PATH = $$PWD/libheif/build/$$HEIF_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX + +-INCLUDEPATH += \ +- $$PWD/libheif/libheif/api \ +- $$HEIF_BUILD_PATH # for heif_version.h ++#INCLUDEPATH += \ ++# $$PWD/libheif/libheif/api \ ++# $$HEIF_BUILD_PATH # for heif_version.h ++ ++core_freebsd { ++ INCLUDEPATH += %%LOCALBASE%%/include/libheif ++ ++ LIBS += %%LOCALBASE%%/lib/libheif.so ++ } + + core_windows { + core_debug { diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_icu_icu.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_icu_icu.pri index bdb28f03a010..ee0aacc776a2 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_icu_icu.pri +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_icu_icu.pri @@ -1,16 +1,16 @@ ---- core/Common/3dParty/icu/icu.pri.orig 2021-09-30 12:13:32 UTC +--- core/Common/3dParty/icu/icu.pri.orig 2025-10-13 15:33:25 UTC +++ core/Common/3dParty/icu/icu.pri -@@ -8,6 +8,13 @@ core_windows { - } +@@ -25,6 +25,13 @@ + LIBS += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.$$ICU_MAJOR_VER + } - LIBS += -L$$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build -licuuc -+} -+ +core_freebsd { + INCLUDEPATH += %%LOCALBASE%%/include + + LIBS += %%LOCALBASE%%/lib/libicuuc.so + LIBS += %%LOCALBASE%%/lib/libicudata.so - } ++} ++ + core_mac { + INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/include - core_linux { diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri index dc322326cf8e..0d407de32790 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri @@ -1,13 +1,13 @@ ---- core/Common/3dParty/openssl/openssl.pri.orig 2023-06-14 14:31:26.960051000 +0200 -+++ core/Common/3dParty/openssl/openssl.pri 2023-06-14 14:31:00.960232000 +0200 +--- core/Common/3dParty/openssl/openssl.pri.orig 2025-08-02 18:33:34 UTC ++++ core/Common/3dParty/openssl/openssl.pri @@ -32,8 +32,8 @@ core_windows { LIBS += $$OPENSSL_LIBS_DIRECTORY/libssl.lib LIBS += $$OPENSSL_LIBS_DIRECTORY/libcrypto.lib } else { - LIBS += $$OPENSSL_LIBS_DIRECTORY/libssl.a - LIBS += $$OPENSSL_LIBS_DIRECTORY/libcrypto.a -+ LIBS += %%LOCALBASE%%/lib/libssl.a -+ LIBS += %%LOCALBASE%%/lib/libcrypto.a ++ LIBS += %%OPENSSL_LIB%%/libssl.so ++ LIBS += %%OPENSSL_LIB%%/libcrypto.so } INCLUDEPATH += $$OPENSSL_LIBS_DIRECTORY/../include diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn index 179516c183f5..c58ca9dcf1f7 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn @@ -1,7 +1,7 @@ Fix build with llvm16 ---- core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn.orig 2023-07-17 10:46:22.246271000 +0200 -+++ core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn 2023-07-17 10:46:59.136940000 +0200 +--- core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn.orig 2022-05-13 11:39:36 UTC ++++ core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn @@ -38,5 +38,6 @@ config("extra_warnings") { "-Wstring-conversion", diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn index cf77653a481b..42e4830a4c7a 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig 2022-04-04 20:12:27 UTC +--- core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig 2022-05-13 11:39:36 UTC +++ core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn @@ -132,7 +132,7 @@ declare_args() { # @@ -27,7 +27,18 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ -@@ -799,7 +799,7 @@ config("compiler_cpu_abi") { +@@ -785,10 +785,6 @@ config("compiler_cpu_abi") { + ] + } + } else if (current_cpu == "arm") { +- if (is_clang && !is_android && !is_nacl) { +- cflags += [ "--target=arm-linux-gnueabihf" ] +- ldflags += [ "--target=arm-linux-gnueabihf" ] +- } + if (!is_nacl) { + cflags += [ + "-march=$arm_arch", +@@ -799,7 +795,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -36,7 +47,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1149,7 +1149,7 @@ config("compiler_deterministic") { +@@ -1149,7 +1145,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -45,7 +56,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1177,7 +1177,7 @@ config("clang_revision") { +@@ -1177,7 +1173,7 @@ config("clang_revision") { } config("clang_revision") { @@ -54,7 +65,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1526,7 +1526,7 @@ config("default_warnings") { +@@ -1526,7 +1522,7 @@ config("default_warnings") { "-Wno-undefined-var-template", ] @@ -63,7 +74,7 @@ # TODO(thakis): https://crbug.com/617318 # Currently goma can not handle case sensitiveness for windows well. cflags += [ "-Wno-nonportable-include-path" ] -@@ -1780,7 +1780,7 @@ config("thin_archive") { +@@ -1780,7 +1776,7 @@ config("thin_archive") { config("thin_archive") { # The macOS and iOS default linker ld64 does not support reading thin # archives. @@ -72,7 +83,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2321,11 +2321,11 @@ config("symbols") { +@@ -2321,11 +2317,11 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h index 156b89cc28f9..2a60db707302 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h @@ -1,5 +1,5 @@ ---- core/Common/3dParty/v8_89/v8/src/base/macros.h.orig 2021-04-12 21:00:33.000000000 +0000 -+++ core/Common/3dParty/v8_89/v8/src/base/macros.h 2025-06-20 09:42:18.838769000 +0000 +--- core/Common/3dParty/v8_89/v8/src/base/macros.h.orig 2021-04-12 21:00:33 UTC ++++ core/Common/3dParty/v8_89/v8/src/base/macros.h @@ -203,7 +203,8 @@ // base::is_trivially_copyable will differ for these cases. template <typename T> diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn index 6cc129f1398e..121d7547862b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn @@ -1,5 +1,5 @@ ---- core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn.orig 2022-05-13 18:53:22.198863000 +0200 -+++ core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn 2022-05-13 18:53:05.169357000 +0200 +--- core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn.orig 2022-05-13 20:53:22 UTC ++++ core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn @@ -15,12 +15,13 @@ source_set("gmock") { "include/gmock/gmock-matchers.h", "include/gmock/gmock.h", diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp index 8677840d1541..b227bfc3e1fa 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp @@ -45,7 +45,7 @@ BYTE* pUtf8 = NULL; LONG lLen = 0; NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strSrc.c_str(), strSrc.length(), pUtf8, lLen, false); -@@ -495,14 +495,14 @@ namespace NSDirectory +@@ -495,7 +495,7 @@ namespace NSDirectory } #if defined(_WIN32) || defined (_WIN64) if (deleteRoot) RemoveDirectoryW(strDirectory.c_str()); @@ -54,11 +54,3 @@ BYTE* pUtf8 = NULL; LONG lLen = 0; NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strDirectory.c_str(), strDirectory.length(), pUtf8, lLen, false); - rmdir((char*)pUtf8); - delete [] pUtf8; - -- if (deleteRoot = false)CreateDirectory(strDirectory); -+ if (deleteRoot == false)CreateDirectory(strDirectory); - #elif MAC - BYTE* pUtf8 = NULL; - LONG lLen = 0; diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri index fff991f7c095..a04a6f66f14c 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri @@ -1,6 +1,6 @@ ---- ./core/DesktopEditor/doctrenderer/doctrenderer.pri.orig 2025-03-07 15:39:12.468049000 +0100 -+++ ./core/DesktopEditor/doctrenderer/doctrenderer.pri 2025-03-07 15:38:54.771039000 +0100 -@@ -22,6 +22,10 @@ core_android:DEFINES += DISABLE_MEMORY_LIMITATION +--- core/DesktopEditor/doctrenderer/doctrenderer.pri.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/doctrenderer/doctrenderer.pri +@@ -22,6 +22,10 @@ ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, ker #CONFIG += v8_version_60 core_android:DEFINES += DISABLE_MEMORY_LIMITATION diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp index c0d1ba12e105..c3be6a05a0db 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/doctrenderer/hash.cpp.orig 2023-06-14 12:14:26.656325000 +0200 -+++ core/DesktopEditor/doctrenderer/hash.cpp 2023-06-14 14:23:39.149523000 +0200 +--- core/DesktopEditor/doctrenderer/hash.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/doctrenderer/hash.cpp @@ -4,12 +4,12 @@ #include "../common/Base64.h" #endif diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp index c87f8a976e29..41272dabf360 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/fontengine/TextShaper.cpp.orig 2022-09-27 21:25:17.640269000 +0200 -+++ core/DesktopEditor/fontengine/TextShaper.cpp 2022-09-27 21:21:12.793630000 +0200 +--- core/DesktopEditor/fontengine/TextShaper.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/fontengine/TextShaper.cpp @@ -649,9 +649,9 @@ namespace NSShaper #ifdef SUPPORT_HARFBUZZ_SHAPER diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp index b25ccec02bb0..7600e5857aae 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp @@ -1,6 +1,6 @@ ---- core/DesktopEditor/fontengine/js/cpp/text.cpp.orig 2022-09-27 21:25:17.640548000 +0200 -+++ core/DesktopEditor/fontengine/js/cpp/text.cpp 2022-09-27 21:22:11.216341000 +0200 -@@ -532,9 +532,9 @@ WASM_EXPORT unsigned char* ASC_FT_Get_Glyph_Render_Buf +--- core/DesktopEditor/fontengine/js/cpp/text.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/fontengine/js/cpp/text.cpp +@@ -558,9 +558,9 @@ WASM_EXPORT unsigned char* ASC_FT_Get_Glyph_Render_Buf // ------------------------------------------------------------ // HARFBUZZ diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h index a8b84e99b90a..aa02570df4ef 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h @@ -1,5 +1,5 @@ ---- core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h.orig 2022-09-27 21:25:17.639848000 +0200 -+++ core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h 2022-09-27 21:21:29.147465000 +0200 +--- core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h @@ -25,9 +25,9 @@ #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp index 0388d97191e9..2274a7dc29a9 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/pluginsmanager/main.cpp.orig 2023-06-19 10:50:14.262222000 +0200 -+++ core/DesktopEditor/pluginsmanager/main.cpp 2023-06-19 10:50:48.083404000 +0200 +--- core/DesktopEditor/pluginsmanager/main.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/pluginsmanager/main.cpp @@ -52,7 +52,7 @@ #undef GetTempPath #endif diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_raster_heif_heif.h b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_raster_heif_heif.h new file mode 100644 index 000000000000..573372e4c31d --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_raster_heif_heif.h @@ -0,0 +1,9 @@ +--- core/DesktopEditor/raster/heif/heif.h.orig 2025-10-13 15:33:25 UTC ++++ core/DesktopEditor/raster/heif/heif.h +@@ -1,5 +1,5 @@ + #include "../BgraFrame.h" +-#include "../../Common/3dParty/heif/libheif/libheif/api/libheif/heif.h" ++#include <heif.h> + #include "../../UnicodeConverter/UnicodeConverter.h" + + namespace NSHeif { diff --git a/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h b/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h index 93c92cc9fcba..9e69da74cb0a 100644 --- a/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h +++ b/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h @@ -1,5 +1,5 @@ ---- core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h.orig 2023-01-27 21:00:04.000000000 +0100 -+++ core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h 2023-02-13 11:18:01.384933000 +0100 +--- core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h.orig 2025-08-02 18:33:34 UTC ++++ core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h @@ -31,7 +31,7 @@ */ #pragma once diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h b/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h index 8e3814ae3609..e81ae497b6ec 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h @@ -1,5 +1,5 @@ ---- ./core/OOXML/Base/Types_32.h.orig 2023-02-13 11:19:10.378060000 +0100 -+++ ./core/OOXML/Base/Types_32.h 2023-02-13 11:19:35.144374000 +0100 +--- core/OOXML/Base/Types_32.h.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/Base/Types_32.h @@ -38,7 +38,7 @@ typedef unsigned __int16 _UINT16; typedef unsigned __int32 _UINT32; diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp index 839338642d3b..efc36eda738f 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp @@ -1,6 +1,6 @@ ---- core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp.orig 2023-06-14 14:53:55.376306000 +0200 -+++ core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp 2023-06-14 14:54:16.425588000 +0200 -@@ -10010,7 +10010,7 @@ namespace BinXlsxRW +--- core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp +@@ -10121,7 +10121,7 @@ namespace BinXlsxRW WriteCT_String(*oVal.m_gapDepth); m_oBcw.WriteItemEnd(nCurPos); } diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp index 3e627ca23ed7..74fa1aabd8e0 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp @@ -1,5 +1,5 @@ ---- core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp.orig 2023-06-14 14:33:42.265435000 +0200 -+++ core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp 2023-06-14 14:33:54.354616000 +0200 +--- core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp @@ -1282,7 +1282,7 @@ xmlns:c16r2=\"http://schemas.microsoft.com/office/draw { writer.WriteString(L"<"); diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp index 7ed08a65819b..b56bb6c6e380 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp @@ -1,5 +1,5 @@ ---- core/OOXML/XlsxFormat/Common.cpp.orig 2023-02-13 11:53:45.780601000 +0100 -+++ core/OOXML/XlsxFormat/Common.cpp 2023-02-13 11:54:15.232608000 +0100 +--- core/OOXML/XlsxFormat/Common.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/XlsxFormat/Common.cpp @@ -48,6 +48,10 @@ char* gcvt(double x, int n, char* b) #define _gcvt gcvt #endif diff --git a/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h b/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h index 89f4e678060d..f69125a7034c 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h +++ b/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h @@ -1,5 +1,5 @@ ---- core/OfficeUtils/src/zlib-1.2.11/gzguts.h.orig 2025-04-16 08:37:24.000000000 +0000 -+++ core/OfficeUtils/src/zlib-1.2.11/gzguts.h 2025-06-19 20:31:01.755367000 +0000 +--- core/OfficeUtils/src/zlib-1.2.11/gzguts.h.orig 2025-04-16 08:37:24 UTC ++++ core/OfficeUtils/src/zlib-1.2.11/gzguts.h @@ -33,6 +33,8 @@ #ifdef _WIN32 diff --git a/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro index 08b3375f3170..5f6e12410a78 100644 --- a/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro +++ b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro @@ -1,6 +1,6 @@ ---- core/PdfFile/PdfFile.pro.orig 2023-02-13 12:29:53.978119000 +0100 -+++ core/PdfFile/PdfFile.pro 2023-02-13 12:30:22.230355000 +0100 -@@ -113,6 +113,11 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib +--- core/PdfFile/PdfFile.pro.orig 2025-08-02 18:33:34 UTC ++++ core/PdfFile/PdfFile.pro +@@ -110,6 +110,11 @@ DEFINES += CRYPTOPP_DISABLE_ASM \ NOMINMAX LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib diff --git a/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h b/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h index 7d9f7fb7ca52..19d91074ad5f 100644 --- a/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h +++ b/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h @@ -1,6 +1,6 @@ ---- core/PdfFile/SrcWriter/Types.h.orig 2023-02-13 11:25:36.702286000 +0100 -+++ core/PdfFile/SrcWriter/Types.h 2023-02-13 11:25:55.342494000 +0100 -@@ -46,7 +46,7 @@ +--- core/PdfFile/SrcWriter/Types.h.orig 2025-08-02 18:33:34 UTC ++++ core/PdfFile/SrcWriter/Types.h +@@ -47,7 +47,7 @@ #include <algorithm> #include <math.h> diff --git a/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.cpp b/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.cpp index 8de44c94276e..5fd5d171b7d7 100644 --- a/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_UnicodeConverter_UnicodeConverter.cpp @@ -1,10 +1,10 @@ ---- core/UnicodeConverter/UnicodeConverter.cpp.orig 2022-09-27 13:24:04 UTC +--- core/UnicodeConverter/UnicodeConverter.cpp.orig 2025-10-13 15:33:25 UTC +++ core/UnicodeConverter/UnicodeConverter.cpp -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ + #include "unicode/ucnv.h" /* C Converter API */ #include "unicode/usprep.h"
- //#include "../DesktopEditor/common/File.h"
+#define TRUE 1
-
#if !defined (_WIN32) && !defined (_WIN64)
#if defined (_LINUX) && !defined(__ANDROID__) && !defined(_IOS) && !defined(_MAC)
+ #define USE_ICONV diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile index ba4ae3c069d7..dba479793706 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile @@ -1,5 +1,5 @@ ---- document-server-package/Makefile.orig 2024-02-12 13:46:57.000000000 +0100 -+++ document-server-package/Makefile 2024-03-01 10:49:36.212407000 +0100 +--- document-server-package/Makefile.orig 2024-02-12 14:46:57 UTC ++++ document-server-package/Makefile @@ -23,6 +23,7 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW) PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) @@ -26,7 +26,7 @@ + DS_FILES := /var/db/$(DS_PREFIX) + DS_EXAMLE := %%LOCALBASE%%/www/$(DS_PREFIX)-example + DEV_NULL := /dev/null -+ PKG_TARGET := node20 ++ PKG_TARGET := node%%PKGFETCH_NODE_MAJOR_VERSION%% + endif ifeq ($(UNAME_S),Linux) PLATFORM := linux diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 index 92cb656f9917..deea13716080 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 @@ -1,6 +1,6 @@ ---- document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4.orig 2024-11-05 14:03:05.897987000 +0100 +--- document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4.orig 2025-07-18 12:53:25 UTC +++ document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4 -@@ -24,18 +24,16 @@ HASH=${HASH:-$(date +'%Y.%m.%d-%H%M' | openssl md5 | a +@@ -24,18 +24,16 @@ done HASH=${HASH:-$(date +'%Y.%m.%d-%H%M' | openssl md5 | awk '{print $2}')} # Save the hash to a variable in the configuration file diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf index 6386c904077e..0208f79889d0 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf @@ -1,8 +1,8 @@ https://raw.githubusercontent.com/nginx/nginx/master/conf/mime.types + IWork filetypes ---- document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf.orig 2022-05-15 11:09:53.906141000 +0200 -+++ document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf 2022-05-15 11:10:02.802873000 +0200 +--- document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf.orig 2025-08-08 19:00:44 UTC ++++ document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf @@ -0,0 +1,102 @@ + +types { diff --git a/www/onlyoffice-documentserver/files/patch-increase_max_connections b/www/onlyoffice-documentserver/files/patch-increase_max_connections index 6a8ed688b9ba..15499bc9f923 100644 --- a/www/onlyoffice-documentserver/files/patch-increase_max_connections +++ b/www/onlyoffice-documentserver/files/patch-increase_max_connections @@ -1,17 +1,17 @@ ---- server/Common/sources/constants.js.orig 2023-09-07 13:17:16 UTC +--- server/Common/sources/constants.js.orig 2025-10-12 16:21:06 UTC +++ server/Common/sources/constants.js -@@ -85,7 +85,7 @@ exports.LICENSE_RESULT = {
- NotBefore: 16
- };
-
--exports.LICENSE_CONNECTIONS = 20;
-+exports.LICENSE_CONNECTIONS = 2000;
- exports.LICENSE_USERS = 3;
- exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
-
---- web-apps/apps/documenteditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:14:46 UTC +@@ -88,7 +88,7 @@ exports.LICENSE_RESULT = { + NotBefore: 16 + }; + +-exports.LICENSE_CONNECTIONS = 20; ++exports.LICENSE_CONNECTIONS = 2000; + exports.LICENSE_USERS = 3; + exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds + +--- web-apps/apps/documenteditor/mobile/src/lib/patch.jsx.orig 2025-10-12 20:28:53 UTC +++ web-apps/apps/documenteditor/mobile/src/lib/patch.jsx -@@ -4,7 +4,7 @@ const EditorUIController = () => { +@@ -4,7 +4,7 @@ EditorUIController.isSupportEditFeature = () => { }; EditorUIController.isSupportEditFeature = () => { @@ -20,9 +20,9 @@ }; EditorUIController.getToolbarOptions = () => { ---- web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:15:25 UTC +--- web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx.orig 2025-10-12 20:28:53 UTC +++ web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx -@@ -1,6 +1,6 @@ +@@ -1,6 +1,6 @@ const EditorUIController = () => null; const EditorUIController = () => null; @@ -30,9 +30,9 @@ +EditorUIController.isSupportEditFeature = () => true; export default EditorUIController; ---- web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:16:07 UTC +--- web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx.orig 2025-10-12 20:28:53 UTC +++ web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx -@@ -1,6 +1,6 @@ +@@ -1,6 +1,6 @@ const EditorUIController = () => null; const EditorUIController = () => null; diff --git a/www/onlyoffice-documentserver/files/patch-server_DocService_patches_sharp b/www/onlyoffice-documentserver/files/patch-server_DocService_patches_sharp new file mode 100644 index 000000000000..11442922a16b --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-server_DocService_patches_sharp @@ -0,0 +1,17 @@ +--- server/DocService/patches/sharp+0.32.6.patch.orig 2025-10-25 03:44:19 UTC ++++ server/DocService/patches/sharp+0.32.6.patch +@@ -0,0 +1,13 @@ ++diff --git a/node_modules/sharp/package.json b/node_modules/sharp/package.json ++index b4d3a28..152b194 100644 ++--- a/node_modules/sharp/package.json +++++ b/node_modules/sharp/package.json ++@@ -89,7 +89,7 @@ ++ "Lachlan Newman <lachnewman007@gmail.com>" ++ ], ++ "scripts": { ++- "install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node install/can-compile && node-gyp rebuild && node install/dll-copy)", +++ "install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node install/can-compile && node-gyp --nodedir=%%LOCALBASE%% rebuild && node install/dll-copy)", ++ "clean": "rm -rf node_modules/ build/ vendor/ .nyc_output/ coverage/ test/fixtures/output.*", ++ "test": "npm run test-lint && npm run test-unit && npm run test-licensing && npm run test-types", ++ "test-lint": "semistandard && cpplint", + diff --git a/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog new file mode 100644 index 000000000000..7a10ecbd0a4e --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog @@ -0,0 +1,11 @@ +--- server/Metrics/patches/modern-syslog+1.2.0.patch.orig 2025-08-31 16:23:19 UTC ++++ server/Metrics/patches/modern-syslog+1.2.0.patch +@@ -0,0 +1,8 @@ ++diff --git a/node_modules/modern-syslog/Makefile b/node_modules/modern-syslog/Makefile ++index 8d2ec3a..125d526 100644 ++--- a/node_modules/modern-syslog/Makefile +++++ b/node_modules/modern-syslog/Makefile ++@@ -1,2 +1,2 @@ ++ rebuild: ++- node-gyp rebuild +++ node-gyp --nodedir=%%LOCALBASE%% rebuild diff --git a/www/onlyoffice-documentserver/files/patch-server_package.json b/www/onlyoffice-documentserver/files/patch-server_package.json index d1a485701de7..0c2dac162610 100644 --- a/www/onlyoffice-documentserver/files/patch-server_package.json +++ b/www/onlyoffice-documentserver/files/patch-server_package.json @@ -1,6 +1,6 @@ ---- server/package.json.orig 2025-06-16 18:22:18 UTC +--- server/package.json.orig 2025-10-12 16:21:06 UTC +++ server/package.json -@@ -4,6 +4,8 @@ +@@ -4,9 +4,11 @@ "homepage": "https://www.onlyoffice.com", "private": true, "dependencies": { @@ -8,8 +8,12 @@ + "grunt-cli": "^1.5.0", "license-downloader": "1.0.8", "license-report": "6.5.0", - "npm-run-all": "4.1.5" -@@ -25,10 +25,10 @@ +- "npm-run-all": "4.1.5" ++ "concurrently": "^9.2.0" + }, + "devDependencies": { + "@eslint/compat": "1.2.3", +@@ -38,12 +40,12 @@ "integration database tests": "cd ./DocService && jest integration/databaseTests --inject-globals=false --config=../tests/jest.config.js", "tests": "cd ./DocService && jest --inject-globals=false --config=../tests/jest.config.js", "tests:dev": "cd ./DocService && jest --inject-globals=false --config=../tests/jest.config.js --watch", @@ -17,10 +21,22 @@ - "install:DocService": "npm ci --prefix ./DocService", - "install:FileConverter": "npm ci --prefix ./FileConverter", - "install:Metrics": "npm ci --prefix ./Metrics", +- "install:AdminPanel/server": "npm ci --prefix ./AdminPanel/server", +- "install:AdminPanel/client": "npm ci --include=dev --prefix ./AdminPanel/client && npm --prefix ./AdminPanel/client run build", + "install:Common": "npm install --prefix ./Common", + "install:DocService": "npm install --prefix ./DocService", + "install:FileConverter": "npm install --prefix ./FileConverter", + "install:Metrics": "npm install --prefix ./Metrics", ++ "install:AdminPanel/server": "npm install --prefix ./AdminPanel/server", ++ "install:AdminPanel/client": "npm install --include=dev --prefix ./AdminPanel/client && npm --prefix ./AdminPanel/client run build", "3d-party-lic-json:Common": "license-report --output=json --package=./Common/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", "3d-party-lic-json:DocService": "license-report --output=json --package=./DocService/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", "3d-party-lic-json:FileConverter": "license-report --output=json --package=./FileConverter/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", +@@ -56,6 +58,6 @@ + "3d-party-lic-report:FileConverter": "run-s 3d-party-lic-json:FileConverter 3d-party-lic-downloader 3d-party-lic-md", + "3d-party-lic-report:Metrics": "run-s 3d-party-lic-json:Metrics 3d-party-lic-downloader 3d-party-lic-md", + "3d-party-lic-report": "run-s 3d-party-lic-md-header 3d-party-lic-report:*", +- "build": "run-p install:*" ++ "build": "concurrently \"npm run install:Common\" \"npm run install:DocService\" \"npm run install:FileConverter\" \"npm run install:Metrics\" \"npm run install:AdminPanel/server\" \"npm run install:AdminPanel/client\"" + } + } diff --git a/www/onlyoffice-documentserver/files/pkg-message.in b/www/onlyoffice-documentserver/files/pkg-message.in index 9bf36aae43ac..b31157599e10 100644 --- a/www/onlyoffice-documentserver/files/pkg-message.in +++ b/www/onlyoffice-documentserver/files/pkg-message.in @@ -59,18 +59,29 @@ files = %%ETCDIR%%/documentserver/supervisor/*.conf include %%ETCDIR%%/documentserver/nginx/ds.conf; NOTE: documentserver-update-securelink.sh will only update ./nginx/ds.conf and local.json under %%ETCDIR%%/documentserver/! - - run documentserver-update-securelink.sh once for creationg a verysecretstring + - run documentserver-update-securelink.sh once for creating a verysecretstring - start nginx: # service nginx start -6. Follow the following doc If you want to use Onlyoffice with Nextcloud: +6. Follow the following doc if you want to use Onlyoffice with Nextcloud: - https://api.onlyoffice.com/editors/nextcloud 7. Install OnlyOffice plugins (you'll need internet): - # %%PREFIX%%/bin/documentserver-pluginsmanager.sh --update=%%PREFIX%%/www/onlyoffice/documentserver/sdkjs-plugins/plugin-list-default.json + # %%PREFIX%%/bin/documentserver-pluginsmanager.sh --update=%%PREFIX%%/www/onlyoffice/documentserver/sdkjs-plugins/plugin-list-default.json -8. Enjoy. +8. Set up Admin Panel, if desired: + - locate your temporary bootstrap code in the adminpanel log file: + /var/log/onlyoffice/documentserver/adminpanel/out.log + + - access the admin panel at http://host/admin + + - use the bootstrap code to complete setup of new admin password + + - see the following for more info: + https://www.onlyoffice.com/blog/2025/10/docs-admin-panel-enterprise + +9. Enjoy. EOM } { type: upgrade |