Compare commits
23 commits
edge
...
onlyoffice
Author | SHA1 | Date | |
---|---|---|---|
6bd408087a | |||
d3a9b2e03a | |||
d74b2c3f20 | |||
|
fc86883416 | ||
62d267907c | |||
ed94a57db3 | |||
28d6f149ee | |||
18a6d9e488 | |||
5cf90ebb45 | |||
fd41656ba9 | |||
7d688b7cc1 | |||
ef0fa981e0 | |||
2ef1bf1029 | |||
|
e33fa8a90c | ||
067de7880a | |||
411a576e7e | |||
511b829e03 | |||
|
4210ec4a39 | ||
5a1894d553 | |||
fec9ff297b | |||
1ff7f6fb5c | |||
d6101173b1 | |||
07d9405eac |
8 changed files with 494 additions and 0 deletions
146
user/onlyoffice-document-server/APKBUILD
Normal file
146
user/onlyoffice-document-server/APKBUILD
Normal file
|
@ -0,0 +1,146 @@
|
|||
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
|
||||
|
||||
pkgname=onlyoffice-document-server
|
||||
pkgver=8.0.0
|
||||
_buildno=105
|
||||
_webtag=7baa887e343de1ad6ec2705953ad021f379f86cc
|
||||
pkgrel=0
|
||||
pkgdesc="ONLYOFFICE Docs is a free collaborative online office suite"
|
||||
url="https://github.com/ONLYOFFICE/DocumentServer"
|
||||
arch="x86_64"
|
||||
license="AGPL-3.0"
|
||||
makedepends="
|
||||
make
|
||||
qt5-qtbase-dev
|
||||
bash
|
||||
g++
|
||||
nodejs
|
||||
clang
|
||||
npm
|
||||
autoconf
|
||||
automake
|
||||
openjdk20-jdk
|
||||
libxscrnsaver
|
||||
libncurses++
|
||||
libxrender-dev
|
||||
boost1.82-dev
|
||||
boost1.82-libs
|
||||
boost1.82-regex
|
||||
boost1.82-system
|
||||
boost1.82-filesystem
|
||||
boost1.82-date_time
|
||||
libxi-dev
|
||||
libxcb-dev
|
||||
libx11-dev
|
||||
gst-plugins-base-dev
|
||||
gstreamer-dev
|
||||
glu
|
||||
icu-dev
|
||||
dbus-dev
|
||||
cups-dev
|
||||
at-spi2-core
|
||||
harfbuzz-dev
|
||||
alsa-lib
|
||||
subversion
|
||||
gzip
|
||||
p7zip
|
||||
libtool
|
||||
libpulse
|
||||
gtk+3.0-dev
|
||||
glib-dev
|
||||
nodejs-dev
|
||||
"
|
||||
options="!check" # No testsuite
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://lab.ilot.io/mirrors/onlyoffice-document-server/-/releases/v$pkgver/downloads/tarball/onlyoffice-document-server-v$pkgver.tar.gz
|
||||
$pkgname-build_tools-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/build_tools/archive/refs/tags/v$pkgver.$_buildno.tar.gz
|
||||
$pkgname-document-server-integration-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/document-server-integration/archive/refs/tags/v$pkgver.$_buildno.tar.gz
|
||||
$pkgname-document-templates-$pkgver.$_buildno.tar.gz::https://github.com/ONLYOFFICE/document-templates/archive/refs/tags/v$pkgver.$_buildno.tar.gz
|
||||
$pkgname-onlyoffice-io-$_webtag.tar.gz::https://github.com/ONLYOFFICE/onlyoffice.github.io/archive/$_webtag.tar.gz
|
||||
server_fix-makefile.patch
|
||||
server_restore-mobile-editing.patch
|
||||
core_fix-memory-limitations.patch
|
||||
web-apps_restore-mobile-editing.patch
|
||||
build_tools-untarget-pkg.patch
|
||||
core_fix-musl-build.patch
|
||||
"
|
||||
builddir="$srcdir"/$pkgname-v$pkgver
|
||||
|
||||
prepare() {
|
||||
mv ../build_tools-$pkgver.$_buildno build_tools
|
||||
mv ../document-server-integration-$pkgver.$_buildno document-server-integration
|
||||
mv ../document-templates-$pkgver.$_buildno document-templates
|
||||
mv ../onlyoffice.github.io-$_webtag onlyoffice.github.io
|
||||
default_prepare
|
||||
|
||||
mkdir -p "$srcdir"/system_qt/gcc_64
|
||||
ln -s /usr/lib "$srcdir"/system_qt/gcc_64/lib
|
||||
ln -s /usr/lib/qt5/bin "$srcdir"/system_qt/gcc_64/bin
|
||||
ln -s /usr/lib/qt5/plugins "$srcdir"/system_qt/gcc_64/plugins
|
||||
|
||||
npm install -g --prefix "$srcdir"/npm_cache pkg grunt grunt-cli gifsicle
|
||||
# overrides rpi for certain 3rd party libraries as already provided by system
|
||||
sed -i '/harfbuzz.make()/d' build_tools/scripts/core_common/make_common.py
|
||||
cat > "$builddir"/core/Common/3dParty/harfbuzz/harfbuzz.pri << EOF
|
||||
INCLUDEPATH += /usr/include/harfbuzz
|
||||
EOF
|
||||
|
||||
sed -i '/icu.make()/d' build_tools/scripts/core_common/make_common.py
|
||||
cat > "$builddir"/core/Common/3dParty/icu/icu.pri << EOF
|
||||
INCLUDEPATH += /usr/include
|
||||
LIBS += -licuuc -l icudata
|
||||
EOF
|
||||
sed -i '/v8.make()/d' build_tools/scripts/core_common/make_common.py
|
||||
cat > "$builddir"/core/Common/3dParty/v8/v8.pri << EOF
|
||||
INCLUDEPATH += /usr/include/node
|
||||
LIBS += -lnode
|
||||
EOF
|
||||
sed -i '/openssl.make()/d' build_tools/scripts/core_common/make_common.py
|
||||
cat > "$builddir"/core/Common/3dParty/openssl/openssl.pri << EOF
|
||||
INCLUDEPATH += /usr/include/openssl
|
||||
LIBS += -lcrypto -lssl
|
||||
EOF
|
||||
sed -i '/boost.make()/d' build_tools/scripts/core_common/make_common.py
|
||||
cat > "$builddir"/core/Common/3dParty/boost/boost.pri << EOF
|
||||
INCLUDEPATH += /usr/include/boost
|
||||
CORE_BOOST_LIBS = /usr/lib
|
||||
core_boost_libs:LIBS += -L\$CORE_BOOST_LIBS -lboost_system -lboost_filesystem
|
||||
core_boost_regex:LIBS += -L\$CORE_BOOST_LIBS -lboost_regex
|
||||
core_boost_date_time:LIBS += -L\$CORE_BOOST_LIBS -lboost_date_time
|
||||
EOF
|
||||
}
|
||||
|
||||
build() {
|
||||
export PATH="$PATH:$srcdir/npm_cache/bin"
|
||||
msg "Building core"
|
||||
cd "$builddir"/build_tools
|
||||
./configure.py \
|
||||
--update 0 \
|
||||
--module "server" \
|
||||
--qt-dir "$srcdir"/system_qt
|
||||
./make.py
|
||||
}
|
||||
|
||||
package() {
|
||||
export PATH="$PATH:$srcdir/npm_cache/bin"
|
||||
|
||||
cd "$builddir"/server
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
||||
|
||||
|
||||
sha512sums="
|
||||
17ef866cabea16ec759a861a4c353b0bff7e79527fe2e4e10f886507f5f3adc847cd624f916d0ab2f06a86822470922c8b15c229fc62e78955561448e4a4d657 onlyoffice-document-server-8.0.0.tar.gz
|
||||
40dc03b9fa4fb61c0e6881998511349bc265387dd1b836c92f00edde177a1cf90f8b39a4f09e624a1a4acf69fc6d957d495aa979952093308342cc81c6f5d66a onlyoffice-document-server-build_tools-8.0.0.105.tar.gz
|
||||
876ca2e70dd662f7f8676dbfaa951b3b4c21d2b7ebefe429489c8d446a09faa007f57b8b60c5bfdf6e5f2dbd330a21156d1f8098231a641e85e32487f205215a onlyoffice-document-server-document-server-integration-8.0.0.105.tar.gz
|
||||
56e1e6c17a1eada945042e34e25a6c7d0183f16f76ac03d0ad49577e30b50d271ddff2851cfb7cd33b477eeeb09bfd98a25f96841f39b50b4aea16b8b12b8e27 onlyoffice-document-server-document-templates-8.0.0.105.tar.gz
|
||||
c22ed18e5736cbc037f2cb74c4ad3e5f4913432e5440951c908ee68be969d03ce28dbb759b850e0fe999b5eb6f48415fab25f8438d7ce96921ab59ee80fc80d4 onlyoffice-document-server-onlyoffice-io-7baa887e343de1ad6ec2705953ad021f379f86cc.tar.gz
|
||||
dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd14a0ab33a00962f604e1d6c5a7040d7f1b117d260e286839 server_fix-makefile.patch
|
||||
6eced34e6d0b1452b8c521f0644972ae877eeb4f05c73c1104bb44f5eed0fa036ee05a94d8348252592e1873aa8fb8527ba3337b227a77aa1a5f65d0e387c2a6 server_restore-mobile-editing.patch
|
||||
814ebde322af9ef468b447cb1989742bf94fe3839c29b7904cc079e5ce1e5d8db307fe546107de610cbfccc6227ae14dfdb3835aeb9f272f5303249f787afac5 core_fix-memory-limitations.patch
|
||||
5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch
|
||||
770c53c7b78e713ef059f3e65a65cb3d635fca2b63ee9f0c534ee0b9762bb0c7f9c944edded3aac79a21a28ff77ee523dd4cf99c4792a433e898a2b3afc3e403 build_tools-untarget-pkg.patch
|
||||
edf83d229459cba87029cecde2777fdc5b4717eed965fe91a4223475bc85e0c99cbc25b9be8de4497c0b14d96b0fe4bee77dd2174c6f59cc9a82ef6c96a1feae core_fix-musl-build.patch
|
||||
"
|
47
user/onlyoffice-document-server/build_tools-nerf-v8.patch
Normal file
47
user/onlyoffice-document-server/build_tools-nerf-v8.patch
Normal file
|
@ -0,0 +1,47 @@
|
|||
diff --git a/build_tools/scripts/core_common/modules/v8.py.orig b/build_tools/scripts/core_common/modules/v8.py
|
||||
index f185baa..ed86e58 100644
|
||||
--- a/build_tools/scripts/core_common/modules/v8.py.orig
|
||||
+++ b/build_tools/scripts/core_common/modules/v8.py
|
||||
@@ -73,7 +73,6 @@ def make():
|
||||
use_v8_89 = True
|
||||
|
||||
if (use_v8_89):
|
||||
- v8_89.make()
|
||||
return
|
||||
|
||||
print("[fetch & build]: v8")
|
||||
@@ -167,34 +166,6 @@ def make():
|
||||
base_args64 = "target_cpu=\\\"x64\\\" v8_target_cpu=\\\"x64\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false"
|
||||
base_args32 = "target_cpu=\\\"x86\\\" v8_target_cpu=\\\"x86\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false"
|
||||
|
||||
- if config.check_option("platform", "linux_64"):
|
||||
- base.cmd2("gn", ["gen", "out.gn/linux_64", "--args=\"is_debug=false " + base_args64 + " is_clang=" + is_use_clang() + " use_sysroot=false treat_warnings_as_errors=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/linux_64"])
|
||||
-
|
||||
- if config.check_option("platform", "linux_32"):
|
||||
- base.cmd2("gn", ["gen", "out.gn/linux_32", "--args=\"is_debug=false " + base_args32 + " is_clang=" + is_use_clang() + " use_sysroot=false treat_warnings_as_errors=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/linux_32"])
|
||||
-
|
||||
- if config.check_option("platform", "mac_64"):
|
||||
- base.cmd2("gn", ["gen", "out.gn/mac_64", "--args=\"is_debug=false " + base_args64 + "\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/mac_64"])
|
||||
-
|
||||
- if config.check_option("platform", "win_64"):
|
||||
- if (-1 != config.option("config").lower().find("debug")):
|
||||
- base.cmd2("gn", ["gen", "out.gn/win_64/debug", "--args=\"is_debug=true " + base_args64 + " is_clang=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/win_64/debug"])
|
||||
-
|
||||
- base.cmd2("gn", ["gen", "out.gn/win_64/release", "--args=\"is_debug=false " + base_args64 + " is_clang=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/win_64/release"])
|
||||
-
|
||||
- if config.check_option("platform", "win_32"):
|
||||
- if (-1 != config.option("config").lower().find("debug")):
|
||||
- base.cmd2("gn", ["gen", "out.gn/win_32/debug", "--args=\"is_debug=true " + base_args32 + " is_clang=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/win_32/debug"])
|
||||
-
|
||||
- base.cmd2("gn", ["gen", "out.gn/win_32/release", "--args=\"is_debug=false " + base_args32 + " is_clang=false\""])
|
||||
- base.cmd("ninja", ["-C", "out.gn/win_32/release"])
|
||||
-
|
||||
os.chdir(old_cur)
|
||||
os.environ.clear()
|
||||
os.environ.update(old_env)
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/build_tools/scripts/build_server.py.orig b/build_tools/scripts/build_server.py
|
||||
index 0f3cd1d..cfb0faf 100644
|
||||
--- a/build_tools/scripts/build_server.py.orig
|
||||
+++ b/build_tools/scripts/build_server.py
|
||||
@@ -48,14 +48,9 @@ def make():
|
||||
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"])
|
||||
-
|
||||
- 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"])
|
||||
- base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"])
|
||||
+ base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "--options", "max_old_space_size=4096", "-o", "docservice"])
|
||||
+ base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-o", "converter"])
|
||||
+ base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-o", "metrics"])
|
||||
|
||||
def build_server_with_addons():
|
||||
addons = {}
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/core/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h.orig b/core/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h
|
||||
index 2700377..4846688 100644
|
||||
--- a/core/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h.orig
|
||||
+++ b/core/DesktopEditor/doctrenderer/js_internal/v8/v8_base.h
|
||||
@@ -18,10 +18,6 @@
|
||||
#include "v8.h"
|
||||
#include "libplatform/libplatform.h"
|
||||
|
||||
-#ifndef DISABLE_MEMORY_LIMITATION
|
||||
-#include "src/base/sys-info.h"
|
||||
-#endif
|
||||
-
|
||||
#ifdef V8_VERSION_89_PLUS
|
||||
#define kV8NormalString v8::NewStringType::kNormal
|
||||
#define kV8ProduceCodeCache v8::ScriptCompiler::kEagerCompile
|
79
user/onlyoffice-document-server/core_fix-musl-build.patch
Normal file
79
user/onlyoffice-document-server/core_fix-musl-build.patch
Normal file
|
@ -0,0 +1,79 @@
|
|||
diff --git a/core/DesktopEditor/graphics/BaseThread.cpp.orig b/core/DesktopEditor/graphics/BaseThread.cpp
|
||||
index df64ee0..beba342 100644
|
||||
--- a/core/DesktopEditor/graphics/BaseThread.cpp.orig
|
||||
+++ b/core/DesktopEditor/graphics/BaseThread.cpp
|
||||
@@ -136,7 +136,7 @@ namespace NSThreads
|
||||
public:
|
||||
__native_thread() : CThreadDescriptor()
|
||||
{
|
||||
- m_thread = NULL;
|
||||
+ m_thread = 0;
|
||||
}
|
||||
virtual ~__native_thread()
|
||||
{
|
||||
diff --git a/core/DesktopEditor/cximage/CxImage/ximagif.cpp.orig b/core/DesktopEditor/cximage/CxImage/ximagif.cpp
|
||||
index 4fbcf1e..fef552f 100644
|
||||
--- a/core/DesktopEditor/cximage/CxImage/ximagif.cpp.orig
|
||||
+++ b/core/DesktopEditor/cximage/CxImage/ximagif.cpp
|
||||
@@ -86,7 +86,7 @@ namespace NSGeneratePalette
|
||||
|
||||
if ( ( X + Width ) > SrcWidth || ( Y + Height ) > SrcHeigth || NULL == pSrc )
|
||||
{
|
||||
- return NULL;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
(*pImage) = new CImage8bit ();
|
||||
diff --git a/core/DesktopEditor/doctrenderer/nativecontrol.h.orig b/core/DesktopEditor/doctrenderer/nativecontrol.h
|
||||
index 22a99e3..c49cc88 100644
|
||||
--- a/core/DesktopEditor/doctrenderer/nativecontrol.h.orig
|
||||
+++ b/core/DesktopEditor/doctrenderer/nativecontrol.h
|
||||
@@ -327,7 +327,7 @@ namespace NSNativeControl
|
||||
|
||||
if (m_map_access_directories.end() == m_map_access_directories.find(NSFile::GetDirectoryName(strFile)))
|
||||
{
|
||||
- *pData = NULL;
|
||||
+ *pData = 0;
|
||||
dwLen = 0;
|
||||
return;
|
||||
}
|
||||
diff --git a/core/UnicodeConverter/UnicodeConverter.cpp.orig b/core/UnicodeConverter/UnicodeConverter.cpp
|
||||
index 61f1403..60d517f 100644
|
||||
--- a/core/UnicodeConverter/UnicodeConverter.cpp.orig
|
||||
+++ b/core/UnicodeConverter/UnicodeConverter.cpp
|
||||
@@ -131,7 +131,7 @@ namespace NSUnicodeConverter
|
||||
char *sResCur = sResStart;
|
||||
const char *sResLimit = sResCur + nOutputLen * ucnv_getMaxCharSize(conv);
|
||||
|
||||
- ucnv_fromUnicode(conv, &sResCur, sResLimit, &pOutputStart, pOutputLimit, NULL, TRUE, &status);
|
||||
+ ucnv_fromUnicode(conv, &sResCur, sResLimit, &pOutputStart, pOutputLimit, NULL, true, &status);
|
||||
if (U_SUCCESS(status))
|
||||
{
|
||||
sRes = std::string(sResStart, sResCur - sResStart);
|
||||
@@ -180,7 +180,7 @@ namespace NSUnicodeConverter
|
||||
char *sResCur = sResStart;
|
||||
const char *sResLimit = sResCur + sRes.size();
|
||||
|
||||
- ucnv_fromUnicode(conv, &sResCur, sResLimit, &pUCharStart, pUCharLimit, NULL, TRUE, &status);
|
||||
+ ucnv_fromUnicode(conv, &sResCur, sResLimit, &pUCharStart, pUCharLimit, NULL, true, &status);
|
||||
if (U_SUCCESS(status))
|
||||
{
|
||||
sRes.resize(sResCur - sResStart);
|
||||
@@ -223,7 +223,7 @@ namespace NSUnicodeConverter
|
||||
UChar* target = targetStart;
|
||||
UChar* targetLimit = target + uBufSize;
|
||||
|
||||
- ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, TRUE, &status);
|
||||
+ ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, true, &status);
|
||||
if (U_SUCCESS(status))
|
||||
{
|
||||
size_t nTargetSize = target - targetStart;
|
||||
@@ -278,7 +278,7 @@ namespace NSUnicodeConverter
|
||||
UChar* target = targetStart;
|
||||
UChar* targetLimit = target + uBufSize;
|
||||
|
||||
- ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, TRUE, &status);
|
||||
+ ucnv_toUnicode(conv, &target, targetLimit, &source, sourceLimit, NULL, true, &status);
|
||||
if (U_SUCCESS(status))
|
||||
{
|
||||
size_t nTargetSize = target - targetStart;
|
41
user/onlyoffice-document-server/server_fix-makefile.patch
Normal file
41
user/onlyoffice-document-server/server_fix-makefile.patch
Normal file
|
@ -0,0 +1,41 @@
|
|||
diff --git a/server/Makefile.orig b/server/Makefile
|
||||
index e8e1308..cd01a39 100644
|
||||
--- a/server/Makefile.orig
|
||||
+++ b/server/Makefile
|
||||
@@ -141,7 +141,6 @@ clean:
|
||||
|
||||
install:
|
||||
mkdir -pv ${DESTDIR}/var/www/onlyoffice
|
||||
- if ! id -u onlyoffice > /dev/null 2>&1; then useradd -m -d /var/www/onlyoffice -r -U onlyoffice; fi
|
||||
|
||||
mkdir -p ${DESTDIR}${DOCUMENT_ROOT}/fonts
|
||||
mkdir -p ${DESTDIR}/var/log/onlyoffice/documentserver
|
||||
@@ -151,10 +150,6 @@ install:
|
||||
mkdir -p ${DESTDIR}/etc/onlyoffice/documentserver
|
||||
mv ${DESTDIR}${DOCUMENT_ROOT}/server/Common/config/* ${DESTDIR}/etc/onlyoffice/documentserver
|
||||
|
||||
- chown onlyoffice:onlyoffice -R ${DESTDIR}/var/www/onlyoffice
|
||||
- chown onlyoffice:onlyoffice -R ${DESTDIR}/var/log/onlyoffice
|
||||
- chown onlyoffice:onlyoffice -R ${DESTDIR}/var/lib/onlyoffice
|
||||
-
|
||||
# Make symlinks for shared libs
|
||||
find \
|
||||
${DESTDIR}${DOCUMENT_ROOT}/server/FileConverter/bin \
|
||||
@@ -162,7 +157,7 @@ install:
|
||||
-name *$(SHARED_EXT) \
|
||||
-exec sh -c 'ln -sf {} ${DESTDIR}/lib/$$(basename {})' \;
|
||||
|
||||
- sudo -u onlyoffice "${DESTDIR}${DOCUMENT_ROOT}/server/tools/allfontsgen"\
|
||||
+ "${DESTDIR}${DOCUMENT_ROOT}/server/tools/allfontsgen"\
|
||||
--input="${DESTDIR}${DOCUMENT_ROOT}/core-fonts"\
|
||||
--allfonts-web="${DESTDIR}${DOCUMENT_ROOT}/sdkjs/common/AllFonts.js"\
|
||||
--allfonts="${DESTDIR}${DOCUMENT_ROOT}/server/FileConverter/bin/AllFonts.js"\
|
||||
@@ -171,7 +166,7 @@ install:
|
||||
--output-web="${DESTDIR}${DOCUMENT_ROOT}/fonts"\
|
||||
--use-system="true"
|
||||
|
||||
- sudo -u onlyoffice "${DESTDIR}${DOCUMENT_ROOT}/server/tools/allthemesgen"\
|
||||
+ "${DESTDIR}${DOCUMENT_ROOT}/server/tools/allthemesgen"\
|
||||
--converter-dir="${DESTDIR}${DOCUMENT_ROOT}/server/FileConverter/bin"\
|
||||
--src="${DESTDIR}${DOCUMENT_ROOT}/sdkjs/slide/themes"\
|
||||
--output="${DESTDIR}${DOCUMENT_ROOT}/sdkjs/common/Images"
|
|
@ -0,0 +1,93 @@
|
|||
diff --git a/server/DocService/sources/server.js.orig b/server/DocService/sources/server.js
|
||||
index 8809831..3918ed4 100644
|
||||
--- a/server/DocService/sources/server.js.orig
|
||||
+++ b/server/DocService/sources/server.js
|
||||
@@ -129,7 +129,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
|
||||
}
|
||||
|
||||
updateLicense();
|
||||
-fs.watchFile(cfgLicenseFile, updateLicense);
|
||||
setInterval(updateLicense, 86400000);
|
||||
|
||||
if (config.has('services.CoAuthoring.server.static_content')) {
|
||||
|
||||
diff --git a/server/Makefile b/server/Makefile
|
||||
index e8e1308..23f7e2e 100644
|
||||
--- a/server/Makefile
|
||||
+++ b/server/Makefile
|
||||
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
|
||||
.PHONY: all clean install uninstall build-date
|
||||
|
||||
.NOTPARALLEL:
|
||||
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
|
||||
+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
|
||||
|
||||
build-date: $(GRUNT_FILES)
|
||||
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
|
||||
diff --git a/server/Common/sources/constants.js.orig b/server/Common/sources/constants.js
|
||||
index 36471ca..8a3744a 100644
|
||||
--- a/server/Common/sources/constants.js.orig
|
||||
+++ b/server/Common/sources/constants.js
|
||||
@@ -86,7 +86,7 @@ exports.LICENSE_RESULT = {
|
||||
NotBefore: 16
|
||||
};
|
||||
|
||||
-exports.LICENSE_CONNECTIONS = 20;
|
||||
+exports.LICENSE_CONNECTIONS = 9999;
|
||||
exports.LICENSE_USERS = 3;
|
||||
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
|
||||
|
||||
|
||||
diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js
|
||||
index 1b617c6..fc72302 100644
|
||||
--- a/server/Common/sources/license.js.orig
|
||||
+++ b/server/Common/sources/license.js
|
||||
@@ -45,24 +45,24 @@ exports.readLicense = function*() {
|
||||
count: 1,
|
||||
type: c_LR.Success,
|
||||
light: false,
|
||||
- packageType: constants.PACKAGE_TYPE_OS,
|
||||
+ packageType: constants.PACKAGE_TYPE_I,
|
||||
mode: constants.LICENSE_MODE.None,
|
||||
- branding: false,
|
||||
+ branding: true,
|
||||
connections: constants.LICENSE_CONNECTIONS,
|
||||
connectionsView: constants.LICENSE_CONNECTIONS,
|
||||
- customization: false,
|
||||
- advancedApi: false,
|
||||
- usersCount: 0,
|
||||
- usersViewCount: 0,
|
||||
+ customization: true,
|
||||
+ advancedApi: true,
|
||||
+ usersCount: constants.LICENSE_CONNECTIONS,
|
||||
+ usersViewCount: constants.LICENSE_CONNECTIONS,
|
||||
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
||||
- hasLicense: false,
|
||||
- plugins: false,
|
||||
+ hasLicense: true,
|
||||
+ plugins: true,
|
||||
buildDate: oBuildDate,
|
||||
startDate: startDate,
|
||||
- endDate: null,
|
||||
+ endDate: new Date("2099-01-01T23:59:59.000Z"),
|
||||
customerId: "",
|
||||
- alias: ""
|
||||
+ alias: "community"
|
||||
}, null];
|
||||
};
|
||||
|
||||
-exports.packageType = constants.PACKAGE_TYPE_OS;
|
||||
+exports.packageType = constants.PACKAGE_TYPE_I;
|
||||
diff --git a/server/FileConverter/sources/convertermaster.js.orig b/server/FileConverter/sources/convertermaster.js
|
||||
index 4661503..52f0bd4 100644
|
||||
--- a/server/FileConverter/sources/convertermaster.js.orig
|
||||
+++ b/server/FileConverter/sources/convertermaster.js
|
||||
@@ -92,7 +92,6 @@ if (cluster.isMaster) {
|
||||
|
||||
updateLicense();
|
||||
|
||||
- fs.watchFile(cfgLicenseFile, updateLicense);
|
||||
setInterval(updateLicense, 86400000);
|
||||
} else {
|
||||
const converter = require('./converter');
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From 692bef4561ef9978c6b8663dd618211bf526b69f Mon Sep 17 00:00:00 2001
|
||||
From: Beeant <huangxb0512@gmail.com>
|
||||
Date: Sat, 24 Sep 2022 21:39:36 +0800
|
||||
Subject: [PATCH] build: license
|
||||
|
||||
---
|
||||
apps/documenteditor/mobile/src/lib/web-apps/patch.jsx | 2 +-
|
||||
apps/presentationeditor/mobile/src/lib/web-apps/patch.jsx | 2 +-
|
||||
apps/spreadsheeteditor/mobile/src/lib/web-apps/patch.jsx | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/web-apps/apps/documenteditor/mobile/src/lib/web-apps/patch.jsx b/apps/documenteditor/mobile/src/lib/patch.jsx
|
||||
index 963aca451..1ee48e856 100644
|
||||
--- a/web-apps/apps/documenteditor/mobile/src/lib/web-apps/patch.jsx
|
||||
+++ b/web-apps/apps/documenteditor/mobile/src/lib/patch.jsx
|
||||
@@ -4,7 +4,7 @@ const EditorUIController = () => {
|
||||
};
|
||||
|
||||
EditorUIController.isSupportEditFeature = () => {
|
||||
- return false
|
||||
+ return true
|
||||
};
|
||||
|
||||
EditorUIController.getToolbarOptions = () => {
|
||||
diff --git a/web-apps/apps/presentationeditor/mobile/src/lib/web-apps/patch.jsx b/apps/presentationeditor/mobile/src/lib/patch.jsx
|
||||
index ec7b37a2c..bfd879583 100644
|
||||
--- a/web-apps/apps/presentationeditor/mobile/src/lib/web-apps/patch.jsx
|
||||
+++ b/web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
const EditorUIController = () => null;
|
||||
|
||||
-EditorUIController.isSupportEditFeature = () => false;
|
||||
+EditorUIController.isSupportEditFeature = () => true;
|
||||
|
||||
export default EditorUIController;
|
||||
diff --git a/web-apps/apps/spreadsheeteditor/mobile/src/lib/web-apps/patch.jsx b/apps/spreadsheeteditor/mobile/src/lib/patch.jsx
|
||||
index ec7b37a2c..bfd879583 100644
|
||||
--- a/web-apps/apps/spreadsheeteditor/mobile/src/lib/web-apps/patch.jsx
|
||||
+++ b/web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
const EditorUIController = () => null;
|
||||
|
||||
-EditorUIController.isSupportEditFeature = () => false;
|
||||
+EditorUIController.isSupportEditFeature = () => true;
|
||||
|
||||
export default EditorUIController;
|
||||
--
|
||||
2.31.1.windows.1
|
||||
|
Loading…
Reference in a new issue