mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
www/onlyoffice-documentserver: Update to 8.3.1.25
This commit is contained in:
Mikael Urankar
parent
ba5cc4abd7
commit
1ee427d6c2
16 changed files with 1017 additions and 242 deletions
|
|
@ -1,7 +1,6 @@
|
|||
PORTNAME= onlyoffice-documentserver
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 8.2.0.143
|
||||
PORTREVISION= 6
|
||||
DISTVERSION= 8.3.1.25
|
||||
CATEGORIES= www
|
||||
MASTER_SITES+= LOCAL/mikael/v8/:source1 \
|
||||
LOCAL/mikael/onlyoffice/:source2 \
|
||||
|
|
@ -30,11 +29,15 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
|
|||
npm:www/npm-node18 \
|
||||
${LOCALBASE}/lib/libcrypto.a:security/openssl
|
||||
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
|
||||
libetonyek-0.1.so:graphics/libetonyek01 \
|
||||
libcurl.so:ftp/curl \
|
||||
libharfbuzz.so:print/harfbuzz \
|
||||
libiconv.so:converters/libiconv \
|
||||
libicutu.so:devel/icu
|
||||
libicutu.so:devel/icu \
|
||||
libodfgen-0.1.so:textproc/libodfgen01 \
|
||||
librevenge-0.0.so:textproc/librevenge
|
||||
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \
|
||||
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
|
||||
gsed:textproc/gsed \
|
||||
nginx:www/nginx \
|
||||
pwgen:sysutils/pwgen \
|
||||
|
|
@ -145,6 +148,7 @@ post-extract:
|
|||
post-patch:
|
||||
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
|
||||
${WRKSRC}/build_tools/tools/freebsd/automate.py \
|
||||
${WRKSRC}/core/Apple/IWork.pro \
|
||||
${WRKSRC}/core/Common/3dParty/boost/boost.pri \
|
||||
${WRKSRC}/core/Common/3dParty/icu/icu.pri \
|
||||
${WRKSRC}/core/Common/3dParty/openssl/openssl.pri \
|
||||
|
|
@ -186,7 +190,7 @@ post-patch:
|
|||
|
||||
do-build:
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm
|
||||
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKDIR}/.bin/npm
|
||||
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKDIR}/.bin/npm
|
||||
|
||||
@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install patch-package
|
||||
@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install optipng-bin@5.1.0
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
TIMESTAMP = 1730734950
|
||||
TIMESTAMP = 1741364853
|
||||
SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
|
||||
SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
|
||||
SHA256 (node-v18.18.2.tar.gz) = 509cd2cfc3a515bf2257ed3886b9fac64aeaac2a70ea59c0a6e02e2dbb722132
|
||||
SIZE (node-v18.18.2.tar.gz) = 86108679
|
||||
SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
|
||||
SIZE (optipng-0.7.7.tar.gz) = 2329555
|
||||
SHA256 (onlyoffice-documentserver-8.2.0.143-npm-cache.tar.gz) = 40fda73895d1aeef15b8c7957ad605a444e71c154cfa8e4c257f17755f821636
|
||||
SIZE (onlyoffice-documentserver-8.2.0.143-npm-cache.tar.gz) = 240990797
|
||||
SHA256 (ONLYOFFICE-DocumentServer-v8.2.0.143-v8.2.0_GH0.tar.gz) = 52bc67369c598f55d7b4eeda27f0004c66214a7ece3ef5c120aa6b14ca81af1f
|
||||
SIZE (ONLYOFFICE-DocumentServer-v8.2.0.143-v8.2.0_GH0.tar.gz) = 83933
|
||||
SHA256 (ONLYOFFICE-core-v8.2.0.143_GH0.tar.gz) = d40a7246d4d1643260953d664d0cf69e7aefa740fd93560ce3ace77c6836979d
|
||||
SIZE (ONLYOFFICE-core-v8.2.0.143_GH0.tar.gz) = 204412191
|
||||
SHA256 (ONLYOFFICE-core-fonts-v8.2.0.143_GH0.tar.gz) = 3c6c5439ee2c8ef9fcaa64b5bafde3480594fef5c9582c9974983491645c9195
|
||||
SIZE (ONLYOFFICE-core-fonts-v8.2.0.143_GH0.tar.gz) = 95367838
|
||||
SHA256 (ONLYOFFICE-dictionaries-v8.2.0.143_GH0.tar.gz) = 7206504973d6816340b5b6e6d77ae2d8da7cdcabf3e337c7b6eb9b904cf2e18f
|
||||
SIZE (ONLYOFFICE-dictionaries-v8.2.0.143_GH0.tar.gz) = 56268709
|
||||
SHA256 (ONLYOFFICE-document-server-integration-v8.2.0.143_GH0.tar.gz) = bfce555a66c6eee950dd006ee2efbd87f4d3fd8135a60d3be5a4c5645bb2eb40
|
||||
SIZE (ONLYOFFICE-document-server-integration-v8.2.0.143_GH0.tar.gz) = 5476114
|
||||
SHA256 (ONLYOFFICE-document-templates-v8.2.0.143_GH0.tar.gz) = 62cab5969a7d89892a32d502ad5986f05ed68d97d572fa7e2821bb2df8cae0da
|
||||
SIZE (ONLYOFFICE-document-templates-v8.2.0.143_GH0.tar.gz) = 4583231
|
||||
SHA256 (ONLYOFFICE-sdkjs-v8.2.0.143_GH0.tar.gz) = d2626c55588baa4e2624eba57e31dddc901840d06c53ed41586a190145ca9fd1
|
||||
SIZE (ONLYOFFICE-sdkjs-v8.2.0.143_GH0.tar.gz) = 29697330
|
||||
SHA256 (ONLYOFFICE-server-v8.2.0.143_GH0.tar.gz) = 6ba0a3891fcf8412ffb55a79572ff17faa63c6624bf1b1e3f87a6df963653c2a
|
||||
SIZE (ONLYOFFICE-server-v8.2.0.143_GH0.tar.gz) = 399728
|
||||
SHA256 (ONLYOFFICE-web-apps-v8.2.0.143_GH0.tar.gz) = c19aaadb71caeb840f6a6a26405ef753c346000e0d66401d6a2bc096ce250f8b
|
||||
SIZE (ONLYOFFICE-web-apps-v8.2.0.143_GH0.tar.gz) = 442965492
|
||||
SHA256 (ONLYOFFICE-build_tools-v8.2.0.143_GH0.tar.gz) = 0ee26f49113df25e4af1d364828e738cba87f965bc7c088f3c23773485fdd771
|
||||
SIZE (ONLYOFFICE-build_tools-v8.2.0.143_GH0.tar.gz) = 33856121
|
||||
SHA256 (onlyoffice-documentserver-8.3.1.25-npm-cache.tar.gz) = 0ffa264f6a2436d554413f91be736a93d1b03023b86a6402451405304ec6817b
|
||||
SIZE (onlyoffice-documentserver-8.3.1.25-npm-cache.tar.gz) = 245650446
|
||||
SHA256 (ONLYOFFICE-DocumentServer-v8.3.1.25-v8.3.1_GH0.tar.gz) = 12bc7a24425d304cd6a94d5e23f6007aa9ac559be9d608eff09b22826aa9a57e
|
||||
SIZE (ONLYOFFICE-DocumentServer-v8.3.1.25-v8.3.1_GH0.tar.gz) = 90246
|
||||
SHA256 (ONLYOFFICE-core-v8.3.1.25_GH0.tar.gz) = 3d91a99d57bb77fa856e18c1b4b2e3d701e2a28e2f69c8b979dfd010d302645f
|
||||
SIZE (ONLYOFFICE-core-v8.3.1.25_GH0.tar.gz) = 204581260
|
||||
SHA256 (ONLYOFFICE-core-fonts-v8.3.1.25_GH0.tar.gz) = 8079a63344346c3dac63c69607cf8133b2bed626070a2324d63a6e691252dc59
|
||||
SIZE (ONLYOFFICE-core-fonts-v8.3.1.25_GH0.tar.gz) = 95366171
|
||||
SHA256 (ONLYOFFICE-dictionaries-v8.3.1.25_GH0.tar.gz) = ebeadf55e47ec31ff9526cf962d95cc8790b2f6444a5f1af318ba830b17dcb4e
|
||||
SIZE (ONLYOFFICE-dictionaries-v8.3.1.25_GH0.tar.gz) = 56268621
|
||||
SHA256 (ONLYOFFICE-document-server-integration-v8.3.1.25_GH0.tar.gz) = 93bd33ec15c45023f8254cc7500240fdd2ff2ee38403713ca82e714fcf080044
|
||||
SIZE (ONLYOFFICE-document-server-integration-v8.3.1.25_GH0.tar.gz) = 5643898
|
||||
SHA256 (ONLYOFFICE-document-templates-v8.3.1.25_GH0.tar.gz) = 3512982805dff81853973b698f928861e5b8a7ce28efe22b00623613cb2e8ce6
|
||||
SIZE (ONLYOFFICE-document-templates-v8.3.1.25_GH0.tar.gz) = 3683581
|
||||
SHA256 (ONLYOFFICE-sdkjs-v8.3.1.25_GH0.tar.gz) = 95758b803075a1a2f4243dad8e4dbcc5416da69c77be72fce890e25b9b2c7430
|
||||
SIZE (ONLYOFFICE-sdkjs-v8.3.1.25_GH0.tar.gz) = 36275009
|
||||
SHA256 (ONLYOFFICE-server-v8.3.1.25_GH0.tar.gz) = 6022a24f893ed7a86567609005817c50c5edacdebee3dbcca713c974e573442b
|
||||
SIZE (ONLYOFFICE-server-v8.3.1.25_GH0.tar.gz) = 397622
|
||||
SHA256 (ONLYOFFICE-web-apps-v8.3.1.25_GH0.tar.gz) = 55c7225961af6d1e7fdd017abadadff2868a0ca94c30dfe91b0a153c6f4da312
|
||||
SIZE (ONLYOFFICE-web-apps-v8.3.1.25_GH0.tar.gz) = 436939510
|
||||
SHA256 (ONLYOFFICE-build_tools-v8.3.1.25_GH0.tar.gz) = 7ed97abf6aba24a21ef3b1c0d24758a998337bc49cc2d5e176ab98c2369e6e08
|
||||
SIZE (ONLYOFFICE-build_tools-v8.3.1.25_GH0.tar.gz) = 33861466
|
||||
SHA256 (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 275c3a8c993528fa56c69aedb11dd74a6fba9c3bd372874004584ae9cbb190b5
|
||||
SIZE (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 31659
|
||||
SHA256 (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 347b8f1d3c21b1f61a3f1fcae86f402b27ce4f8b826e18158834251046d83cf5
|
||||
SIZE (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 17009005
|
||||
SHA256 (ONLYOFFICE-document-server-package-v8.2.0.143_GH0.tar.gz) = e16dd0a96361b6267730b5db4f658e0828996aef4db2e004eb3d45785ad81311
|
||||
SIZE (ONLYOFFICE-document-server-package-v8.2.0.143_GH0.tar.gz) = 182791
|
||||
SHA256 (ONLYOFFICE-document-server-package-v8.3.1.25_GH0.tar.gz) = 3075aaba50dc564ff33f4817902c99e0058c0387f6128e1b19a6d931c72a3a8a
|
||||
SIZE (ONLYOFFICE-document-server-package-v8.3.1.25_GH0.tar.gz) = 186505
|
||||
SHA256 (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 363ede45ba6d125fdb7323c43d34acd3d0ae9028ac18aec632eb6a623160f09a
|
||||
SIZE (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 97712
|
||||
SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
#!/bin/sh
|
||||
exec /usr/local/bin/npm --offline --nodedir=%%LOCALBASE%% "$@"
|
||||
exec %%LOCALBASE%%/bin/npm --offline --nodedir=%%LOCALBASE%% "$@"
|
||||
#exec %%LOCALBASE%%/bin/npm --nodedir=%%LOCALBASE%% "$@"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- build_tools/scripts/core_common/make_common.py.orig 2021-11-16 07:07:24 UTC
|
||||
+++ build_tools/scripts/core_common/make_common.py
|
||||
@@ -8,19 +8,19 @@ import glob
|
||||
@@ -8,20 +8,20 @@ import glob
|
||||
import base
|
||||
import glob
|
||||
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
import websocket_all
|
||||
import v8
|
||||
import html2
|
||||
import iwork
|
||||
-import hunspell
|
||||
+#import hunspell
|
||||
import glew
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
import libvlc
|
||||
|
||||
def check_android_ndk_macos_arm(dir):
|
||||
@@ -36,17 +36,17 @@ def make():
|
||||
@@ -37,18 +37,18 @@ def make():
|
||||
if base.is_dir(toolchain):
|
||||
check_android_ndk_macos_arm(toolchain + "/prebuilt")
|
||||
|
||||
|
|
@ -41,6 +42,7 @@
|
|||
+# openssl.make()
|
||||
v8.make()
|
||||
html2.make()
|
||||
iwork.make(False)
|
||||
- hunspell.make(False)
|
||||
- harfbuzz.make()
|
||||
+# hunspell.make(False)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
--- 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
|
||||
@@ -30,9 +30,9 @@ def make(use_gperf = True):
|
||||
if use_gperf:
|
||||
cmd_args.append("--gperf")
|
||||
|
||||
- base.cmd_in_dir(base_dir, "python", cmd_args)
|
||||
+# base.cmd_in_dir(base_dir, "python", cmd_args)
|
||||
return
|
||||
|
||||
if __name__ == '__main__':
|
||||
# manual compile
|
||||
- make(False)
|
||||
\ No newline at end of file
|
||||
+ make(False)
|
||||
|
|
@ -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
|
||||
@@ -106,54 +106,18 @@ def make():
|
||||
base.create_dir(base_dir)
|
||||
@@ -115,46 +115,7 @@ def make():
|
||||
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()):
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
- base.copy_dir("./v8/third_party", "./v8/third_party_new")
|
||||
- if ("windows" == base.host_platform()):
|
||||
- os.chdir("v8")
|
||||
- base.cmd("git", ["config", "--system", "core.longpaths", "true"])
|
||||
- base.cmd("git", ["config", "--system", "core.longpaths", "true"], True)
|
||||
- os.chdir("../")
|
||||
- v8_branch_version = "remotes/branch-heads/8.9"
|
||||
- if ("mac" == base.host_platform()):
|
||||
|
|
@ -45,11 +45,9 @@
|
|||
- base.replaceInFile("v8/third_party/jinja2/tests.py", "from collections import Mapping", "try:\n from collections.abc import Mapping\nexcept ImportError:\n from collections import Mapping")
|
||||
-
|
||||
os.chdir("v8")
|
||||
-
|
||||
+
|
||||
|
||||
gn_args = ["v8_static_library=true",
|
||||
"is_component_build=false",
|
||||
"v8_monolithic=true",
|
||||
@@ -163,6 +124,11 @@ def make():
|
||||
"v8_use_external_startup_data=false",
|
||||
"use_custom_libcxx=false",
|
||||
"treat_warnings_as_errors=false"]
|
||||
|
|
@ -57,6 +55,7 @@
|
|||
+ if config.check_option("platform", "freebsd_64"):
|
||||
+ base.cmd2("gn", ["gen", "out.gn/freebsd_64", "--args=\"v8_monolithic=true is_debug=false v8_static_library=true is_component_build=false is_clang=true use_sysroot=false treat_warnings_as_errors=false clang_use_chrome_plugins=false use_lld=true use_custom_libcxx=false v8_use_external_startup_data=false is_component_build=false\""])
|
||||
+ base.cmd("ninja", ["-C", "out.gn/freebsd_64"])
|
||||
+
|
||||
|
||||
if config.check_option("platform", "linux_64"):
|
||||
base.cmd2("gn", ["gen", "out.gn/linux_64", make_args(gn_args, "linux")])
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
--- 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
|
||||
@@ -6,7 +6,8 @@
|
||||
#include <libodfgen/OdtGenerator.hxx>
|
||||
#include <libodfgen/OdsGenerator.hxx>
|
||||
#include <libodfgen/OdpGenerator.hxx>
|
||||
-#include <libodfgen/test/StringDocumentHandler.hxx>
|
||||
+//#include <libodfgen/test/StringDocumentHandler.hxx>
|
||||
+#include "StringDocumentHandler.hxx"
|
||||
|
||||
#include <memory>
|
||||
#include <fstream>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
--- 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
|
||||
|
||||
DEFINES += IWORK_USE_DYNAMIC_LIBRARY
|
||||
|
||||
+INCLUDEPATH += %%LOCALBASE%%/include/librevenge-0.0
|
||||
+INCLUDEPATH += %%LOCALBASE%%/include/libetonyek-0.1
|
||||
+INCLUDEPATH += %%LOCALBASE%%/include/libodfgen-0.1
|
||||
+
|
||||
+LIBS += %%LOCALBASE%%/lib/librevenge-0.0.so
|
||||
+LIBS += %%LOCALBASE%%/lib/libetonyek-0.1.so
|
||||
+LIBS += %%LOCALBASE%%/lib/libodfgen-0.1.so
|
||||
+
|
||||
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
|
||||
include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri)
|
||||
|
||||
# TEST
|
||||
-HEADERS += $$ODF_LIB_ROOT/test/StringDocumentHandler.h
|
||||
-SOURCES += $$ODF_LIB_ROOT/test/StringDocumentHandler.cxx
|
||||
+#HEADERS += $$ODF_LIB_ROOT/test/StringDocumentHandler.h
|
||||
+#SOURCES += $$ODF_LIB_ROOT/test/StringDocumentHandler.cxx
|
||||
|
||||
SOURCES += IWork.cpp
|
||||
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
--- core/Apple/StringDocumentHandler.hxx.orig 2025-03-08 17:38:58.104116000 +0100
|
||||
+++ core/Apple/StringDocumentHandler.hxx 2025-03-08 16:45:03.144938000 +0100
|
||||
@@ -0,0 +1,51 @@
|
||||
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
+/* writerperfect
|
||||
+ * Version: MPL 2.0 / LGPLv2.1+
|
||||
+ *
|
||||
+ * This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
+ *
|
||||
+ * Major Contributor(s):
|
||||
+ * Copyright (C) 2002-2004 William Lachance (wrlach@gmail.com)
|
||||
+ * Copyright (C) 2004-2006 Fridrich Strba (fridrich.strba@bluewin.ch)
|
||||
+ *
|
||||
+ * For minor contributions see the git repository.
|
||||
+ *
|
||||
+ * Alternatively, the contents of this file may be used under the terms
|
||||
+ * of the GNU Lesser General Public License Version 2.1 or later
|
||||
+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
|
||||
+ * applicable instead of those above.
|
||||
+ *
|
||||
+ * For further information visit http://libwpd.sourceforge.net
|
||||
+ */
|
||||
+
|
||||
+#ifndef _STRING_DOCUMENT_HANDLER_H
|
||||
+#define _STRING_DOCUMENT_HANDLER_H
|
||||
+
|
||||
+#include <libodfgen/libodfgen.hxx>
|
||||
+
|
||||
+class StringDocumentHandler final : public OdfDocumentHandler
|
||||
+{
|
||||
+public:
|
||||
+ StringDocumentHandler();
|
||||
+
|
||||
+ char const *cstr() const
|
||||
+ {
|
||||
+ return m_data.cstr();
|
||||
+ }
|
||||
+
|
||||
+ void startDocument() final {}
|
||||
+ void endDocument() final;
|
||||
+ void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) final;
|
||||
+ void endElement(const char *psName) final;
|
||||
+ void characters(const librevenge::RVNGString &sCharacters) final;
|
||||
+private:
|
||||
+private:
|
||||
+ librevenge::RVNGString m_data;
|
||||
+ bool m_isTagOpened;
|
||||
+ librevenge::RVNGString m_openedTagName;
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
+/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
} else {
|
||||
- LIBS += $$OPENSSL_LIBS_DIRECTORY/libssl.a
|
||||
- LIBS += $$OPENSSL_LIBS_DIRECTORY/libcrypto.a
|
||||
+ LIBS += /usr/local/lib/libssl.a
|
||||
+ LIBS += /usr/local/lib/libcrypto.a
|
||||
+ LIBS += %%LOCALBASE%%/lib/libssl.a
|
||||
+ LIBS += %%LOCALBASE%%/lib/libcrypto.a
|
||||
}
|
||||
|
||||
INCLUDEPATH += $$OPENSSL_LIBS_DIRECTORY/../include
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
--- ./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
|
||||
#CONFIG += v8_version_60
|
||||
core_android:DEFINES += DISABLE_MEMORY_LIMITATION
|
||||
|
||||
+core_freebsd {
|
||||
+ LIBS += -lexecinfo
|
||||
+}
|
||||
+
|
||||
HEADERS += \
|
||||
$$PWD_CUR/config.h \
|
||||
$$PWD_CUR/editors.h \
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- core/DesktopEditor/doctrenderer/doctrenderer.pro.orig 2021-09-30 12:13:32 UTC
|
||||
+++ core/DesktopEditor/doctrenderer/doctrenderer.pro 2021-09-30 12:13:32 UTC
|
||||
@@ -18,6 +18,10 @@ core_android:DEFINES += DISABLE_MEMORY_LIMITATION
|
||||
#CONFIG += build_xp
|
||||
core_android:DEFINES += DISABLE_MEMORY_LIMITATION
|
||||
|
||||
+core_freebsd {
|
||||
+ LIBS += -lexecinfo
|
||||
+}
|
||||
+
|
||||
HEADERS += \
|
||||
config.h \
|
||||
doctrenderer.h \
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
#if defined(_MAC) && !defined(_IOS)
|
||||
@@ -1802,6 +1804,9 @@ std::vector<std::wstring> CApplicationFonts::GetSetupF
|
||||
NSDirectory::GetFiles2(L"/usr/X11R6/lib/X11/fonts", _array, true);
|
||||
NSDirectory::GetFiles2(L"/usr/local/share/fonts", _array, true);
|
||||
NSDirectory::GetFiles2(L"%%LOCALBASE%%/share/fonts", _array, true);
|
||||
NSDirectory::GetFiles2(L"/run/host/fonts", _array, true);
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ std::vector<std::wstring> _array = NSDirectory::GetFiles(L"/usr/share/fonts", true);
|
||||
|
|
|
|||
|
|
@ -8,43 +8,43 @@
|
|||
UNAME_M ?= $(shell uname -m)
|
||||
ifeq ($(UNAME_M),x86_64)
|
||||
RPM_ARCH := x86_64
|
||||
@@ -142,6 +143,22 @@ else
|
||||
DS_EXAMLE := /var/www/$(DS_PREFIX)-example
|
||||
@@ -138,6 +139,22 @@ else
|
||||
endif
|
||||
else
|
||||
UNAME_S := $(shell uname -s)
|
||||
+ ifeq ($(UNAME_S),FreeBSD)
|
||||
+ PLATFORM := freebsd
|
||||
+ SHARED_EXT := .so*
|
||||
+ SHELL_EXT := .sh
|
||||
+ ARCH_EXT := .zip
|
||||
+ AR := 7z a -y
|
||||
+ PACKAGES = tar
|
||||
+ DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
|
||||
+ NGINX_CONF := %%ETCDIR%%/documentserver/nginx/includes
|
||||
+ NGINX_LOG := /var/log/$(DS_PREFIX)
|
||||
+ DS_ROOT := %%LOCALBASE%%/www/$(DS_PREFIX)
|
||||
+ DS_FILES := /var/db/$(DS_PREFIX)
|
||||
+ DS_EXAMLE := %%LOCALBASE%%/www/$(DS_PREFIX)-example
|
||||
+ DEV_NULL := /dev/null
|
||||
+ PKG_TARGET := node18
|
||||
+ endif
|
||||
ifeq ($(UNAME_S),Linux)
|
||||
PLATFORM := linux
|
||||
SHARED_EXT := .so*
|
||||
@@ -167,6 +184,12 @@ else
|
||||
DS_EXAMLE := /var/www/onlyoffice/documentserver-example
|
||||
DEV_NULL := /dev/null
|
||||
endif
|
||||
+ ifeq ($(UNAME_S),FreeBSD)
|
||||
+ PLATFORM := freebsd
|
||||
+ SHARED_EXT := .so*
|
||||
+ SHELL_EXT := .sh
|
||||
+ ARCH_EXT := .zip
|
||||
+ AR := 7z a -y
|
||||
+ PACKAGES = tar
|
||||
+ DS_PREFIX := $(COMPANY_NAME_LOW)/$(PRODUCT_SHORT_NAME_LOW)
|
||||
+ NGINX_CONF := /usr/local/etc/onlyoffice/documentserver/nginx/includes
|
||||
+ NGINX_LOG := /var/log/$(DS_PREFIX)
|
||||
+ DS_ROOT := /usr/local/www/$(DS_PREFIX)
|
||||
+ DS_FILES := /var/db/$(DS_PREFIX)
|
||||
+ DS_EXAMLE := /usr/local/www/$(DS_PREFIX)-example
|
||||
+ DEV_NULL := /dev/null
|
||||
+ PKG_TARGET := node18
|
||||
+ endif
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
PLATFORM := mac
|
||||
SHARED_EXT := .dylib
|
||||
@@ -159,6 +176,12 @@ else
|
||||
+ ifeq ($(UNAME_P),amd64)
|
||||
+ ARCHITECTURE := 64
|
||||
+ endif
|
||||
+ ifeq ($(UNAME_P),aarch64)
|
||||
+ ARCHITECTURE := 64
|
||||
+ endif
|
||||
ifeq ($(UNAME_M),x86_64)
|
||||
ARCHITECTURE := 64
|
||||
endif
|
||||
+ ifeq ($(UNAME_P),amd64)
|
||||
+ ARCHITECTURE := 64
|
||||
+ endif
|
||||
+ ifeq ($(UNAME_P),aarch64)
|
||||
+ ARCHITECTURE := 64
|
||||
+ endif
|
||||
ifneq ($(filter %86,$(UNAME_M)),)
|
||||
ARCHITECTURE := 32
|
||||
endif
|
||||
@@ -320,7 +343,7 @@ documentserver:
|
||||
@@ -334,7 +357,7 @@ documentserver:
|
||||
|
||||
documentserver:
|
||||
mkdir -p $(DOCUMENTSERVER_FILES)
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
mkdir -p $(DOCUMENTSERVER_CONFIG)
|
||||
mkdir -p $(DOCUMENTSERVER_CONFIG)/log4js
|
||||
@@ -329,25 +352,25 @@ documentserver:
|
||||
@@ -343,25 +366,25 @@ documentserver:
|
||||
mv -f $(DOCUMENTSERVER)/server/Common/config/log4js/*.json $(DOCUMENTSERVER_CONFIG)/log4js/
|
||||
|
||||
# rename product specific folders
|
||||
|
|
@ -82,11 +82,11 @@
|
|||
chmod ug=r $(DOCUMENTSERVER_CONFIG)/*.json
|
||||
|
||||
- cp -fr -t $(DOCUMENTSERVER) $(3RD_PARTY_LICENSE_FILES)
|
||||
+ cp -fr $(3RD_PARTY_LICENSE_FILES) $(DOCUMENTSERVER)
|
||||
+ cp -fr $(3RD_PARTY_LICENSE_FILES) $(3RD_PARTY_LICENSE_FILES)
|
||||
rm -fr $(3RD_PARTY_LICENSE_FILES)
|
||||
|
||||
ifeq ($(PLATFORM),win)
|
||||
@@ -357,34 +380,34 @@ endif
|
||||
@@ -371,8 +394,8 @@ endif
|
||||
endif
|
||||
|
||||
[ -f $(LICENSE_FILE) ] \
|
||||
|
|
@ -97,11 +97,12 @@
|
|||
|
||||
chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/x2t$(EXEC_EXT)
|
||||
#chmod u+x $(DOCUMENTSERVER)/server/FileConverter/bin/docbuilder$(EXEC_EXT)
|
||||
[ -f $(HTMLFILEINTERNAL)$(EXEC_EXT) ] && chmod u+x $(HTMLFILEINTERNAL)$(EXEC_EXT) || true
|
||||
@@ -380,26 +403,26 @@ endif
|
||||
chmod u+x $(DOCUMENTSERVER)/server/tools/allfontsgen$(EXEC_EXT)
|
||||
|
||||
mv -f $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
|
||||
- sed "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|" -i $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
|
||||
+ sed -i '' "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|" $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
|
||||
+ sed -i '' "s|\(_dc=\)0|\1"$(PACKAGE_VERSION)"|" $(DOCUMENTSERVER)/web-apps/apps/api/documents/api.js.tpl
|
||||
|
||||
ifeq ($(PRODUCT_NAME_LOW), documentserver)
|
||||
- sed 's|\("packageType": \)[0-9]\+\(.*\)|\10\2|' -i $(DOCUMENTSERVER_CONFIG)/*.json
|
||||
|
|
@ -131,7 +132,7 @@
|
|||
|
||||
ifeq ($(PLATFORM),win)
|
||||
cd $(DOCUMENTSERVER)/npm && \
|
||||
@@ -398,7 +421,7 @@ documentserver-example:
|
||||
@@ -413,7 +436,7 @@ documentserver-example:
|
||||
|
||||
documentserver-example:
|
||||
mkdir -p $(DOCUMENTSERVER_EXAMPLE)
|
||||
|
|
@ -140,7 +141,7 @@
|
|||
|
||||
mkdir -p $(DOCUMENTSERVER_EXAMPLE_CONFIG)
|
||||
|
||||
@@ -407,7 +430,7 @@ documentserver-example:
|
||||
@@ -422,7 +445,7 @@ documentserver-example:
|
||||
# Prevent for modification original config
|
||||
chmod ug=r $(DOCUMENTSERVER_EXAMPLE_CONFIG)/*.json
|
||||
|
||||
|
|
@ -149,12 +150,11 @@
|
|||
|
||||
/usr/bin/find $(DOCUMENTSERVER_EXAMPLE)/welcome -depth -type f -exec sed -i "s_{{year}}_$(shell date +"%Y")_g" {} \;
|
||||
|
||||
@@ -500,6 +523,8 @@ $(DEB): $(DEB_DEPS) $(COMMON_DEPS) $(LINUX_DEPS) docum
|
||||
@@ -517,6 +540,7 @@ $(EXE): iss_file = common.iss
|
||||
cd $(@D) && $(ISCC) $(ISCC_PARAMS) $(iss_file)
|
||||
|
||||
%.exe:
|
||||
cd $(@D) && $(ISCC) $(ISCC_PARAMS) common.iss
|
||||
+
|
||||
$(EXE): iss_file = common.iss
|
||||
+freebsd: $(COMMON_DEPS) $(LINUX_DEPS) documentserver
|
||||
|
||||
$(EXE): $(COMMON_DEPS) documentserver documentserver-example $(NGINX) $(PSQL) $(WINSW)
|
||||
|
||||
$(EXE_PR): iss_file = prerequisites.iss
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
export LD_LIBRARY_PATH=/var/www/M4_DS_PREFIX/server/FileConverter/bin:$LD_LIBRARY_PATH
|
||||
|
||||
@@ -52,24 +52,16 @@ echo Done
|
||||
@@ -52,11 +52,6 @@ echo Done
|
||||
|
||||
echo Done
|
||||
|
||||
|
|
@ -21,10 +21,7 @@
|
|||
#Remove gzipped files
|
||||
rm -f \
|
||||
$DIR/fonts/*.gz \
|
||||
$DIR/sdkjs/common/AllFonts.js.gz \
|
||||
- $DIR/sdkjs/common/Images/*.gz \
|
||||
+ $DIR/sdkjs/common/Images/*.gz \
|
||||
$DIR/sdkjs/slide/themes/themes.js.gz
|
||||
@@ -66,10 +61,7 @@ if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then
|
||||
|
||||
#Restart web-site and converter
|
||||
if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue