www/onlyoffice-documentserver: Update to 7.2.1.34

This commit is contained in:
Mikael Urankar 2022-11-14 14:55:00 +01:00
parent c034f803c5
commit c1df68539c
23 changed files with 1124 additions and 11696 deletions

View File

@ -1,7 +1,6 @@
PORTNAME= onlyoffice-documentserver
DISTVERSIONPREFIX= v
DISTVERSION= 7.1.1.23
PORTREVISION= 2
DISTVERSION= 7.2.1.34
CATEGORIES= www
MASTER_SITES+= LOCAL/mikael/v8/:source1 \
LOCAL/mikael/onlyoffice/:source2 \
@ -12,7 +11,7 @@ DISTFILES+= v8-8.9.255.25_all.tar.gz:source1 \
node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \
node-v${NODE_VERSION_PORTS}.tar.gz:source3 \
optipng-0.7.7.tar.gz:source4 \
onlyoffice-${DISTVERSION}-npm-cache.tar.gz:source2
${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2
MAINTAINER= mikael@FreeBSD.org
COMMENT= Secure office and productivity apps
@ -32,8 +31,10 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
npm:www/npm-node16
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libcurl.so:ftp/curl \
libharfbuzz.so:print/harfbuzz \
libiconv.so:converters/libiconv \
libicutu.so:devel/icu
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \
gsed:textproc/gsed \
nginx:www/nginx \
@ -41,12 +42,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLA
webfonts>=0:x11-fonts/webfonts
USES= autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:16,build pkgconfig \
python:3.7+,build qt:5 trigger
python:3.9+,build qt:5 trigger
USE_QT= qmake:build
USE_GITHUB= yes
GH_ACCOUNT= ONLYOFFICE
GH_PROJECT= DocumentServer
GH_TAGNAME= v7.1.1
GH_TAGNAME= v7.2.1
GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \
ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \
ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \
@ -55,19 +56,10 @@ GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \
ONLYOFFICE:sdkjs:v${DISTVERSION}:sdkjs/sdkjs \
ONLYOFFICE:server:v${DISTVERSION}:server/server \
ONLYOFFICE:web-apps:v${DISTVERSION}:webapps/web-apps \
ONLYOFFICE:plugin-highlightcode:v${DISTVERSION}:sdkjs_plugins_highlightcode/sdkjs-plugins/plugin-highlightcode \
ONLYOFFICE:plugin-macros:v${DISTVERSION}:sdkjs_plugins_macros/sdkjs-plugins/plugin-macros \
ONLYOFFICE:plugin-mendeley:v${DISTVERSION}:sdkjs_plugins_mendeley/sdkjs-plugins/plugin-mendeley \
ONLYOFFICE:plugin-ocr:v${DISTVERSION}:sdkjs_plugins_ocr/sdkjs-plugins/plugin-ocr \
ONLYOFFICE:plugin-photoeditor:v${DISTVERSION}:sdkjs_plugins_photoeditor/sdkjs-plugins/plugin-photoeditor \
ONLYOFFICE:plugin-speech:v${DISTVERSION}:sdkjs_plugins_speech/sdkjs-plugins/plugin-speech \
ONLYOFFICE:plugin-thesaurus:v${DISTVERSION}:sdkjs_plugins_thesaurus/sdkjs-plugins/plugin-thesaurus \
ONLYOFFICE:plugin-translator:v${DISTVERSION}:sdkjs_plugins_translator/sdkjs-plugins/plugin-translator \
ONLYOFFICE:plugin-youtube:v${DISTVERSION}:sdkjs_plugins_youtube/sdkjs-plugins/plugin-youtube \
ONLYOFFICE:plugin-zotero:v${DISTVERSION}:sdkjs_plugins_zotero/sdkjs-plugins/plugin-zotero \
ONLYOFFICE:plugin-mendeley:v${PLUGIN_VERSION}:sdkjs_plugins_mendeley/sdkjs-plugins/plugin-mendeley \
ONLYOFFICE:build_tools:v${DISTVERSION}:buildtools/build_tools \
ONLYOFFICE:DocumentBuilder:v${DISTVERSION}:document_builder/DocumentBuilder \
ONLYOFFICE:onlyoffice.github.io:342e8f66:sdkjs_plugins_v1/onlyoffice.github.io \
ONLYOFFICE:DocumentBuilder:626d1e44db3d06ceb8298215a67ef0475912d89a:document_builder/DocumentBuilder \
ONLYOFFICE:onlyoffice.github.io:b26d001664d771df4f663d2d3ba7dd4a188b6cab:sdkjs_plugins_v1/onlyoffice.github.io \
ONLYOFFICE:document-server-package:v${DISTVERSION}:dsp/document-server-package \
hackers-painters:katana-parser:499118d3:hackers_painters_katana/core/Common/3dParty/html/katana-parser \
google:gumbo-parser:aa91b27:google_gumbo/core/Common/3dParty/html/gumbo-parser
@ -100,10 +92,11 @@ SUB_LIST= ETCDIR=${ETCDIR} \
PREFIX=${PREFIX} \
WWWDIR=${WWWDIR}
PLUGIN_VERSION= 7.2.0.8
# node version used with "npm install pkg@5.5.1"
NODE_VERSION_PKGFETCH= 16.13.0
# node version used in the ports tree
NODE_VERSION_PORTS= 16.17.1
NODE_VERSION_PORTS= 16.16.0
MAKE_ENV= BUILD_NUMBER="1" \
PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
@ -164,7 +157,8 @@ post-patch:
${WRKSRC}/server/Common/config/development-freebsd.json
@${REINPLACE_CMD} -e 's|bash|sh|' -e 's|sed|gsed|' \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-static-gzip.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4
@${REINPLACE_CMD} 's|%%DISTDIR%%|${DISTDIR}|' \
${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%ETCDIR%%|${ETCDIR}|' \
@ -177,15 +171,17 @@ post-patch:
@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8/v8/build/config/gclient_args.gni
do-build:
${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm
@${CP} ${FILESDIR}/packagejsons/server/package-lock.json ${WRKSRC}/server
@${CP} ${FILESDIR}/packagejsons/server/Common/package-lock.json ${WRKSRC}/server/Common
# @${CP} ${FILESDIR}/packagejsons/server/Common/package-lock.json ${WRKSRC}/server/Common
@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
@cd ${WRKSRC}/web-apps/build ; node_modules/.bin/patch-package
@cd ${WRKSRC}/web-apps/build/node_modules/optipng-bin ; ${SETENV} ${MAKE_ENV} npm run postinstall optipng-bin
@cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install patch-package
# @cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} npm install patch-package
@cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install grunt-cli
@cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install grunt
@cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install pkg@5.5.1
@ -235,4 +231,12 @@ do-install:
${STAGEDIR}${WWWDIR}/Data \
${STAGEDIR}${WWWDIR}/documentserver/fonts
create-caches-tarball:
# do some cleanup first
${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp
${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
cd ${WRKDIR} && \
${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .cache .pkg-cache
.include <bsd.port.mk>

View File

@ -1,60 +1,42 @@
TIMESTAMP = 1666340352
TIMESTAMP = 1668376343
SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f
SIZE (node-v16.13.0.tar.gz) = 63735070
SHA256 (node-v16.17.1.tar.gz) = e423985f6019b2026f9a191adb56a96ae83ecd56cdf839cf94aa980168b7a90f
SIZE (node-v16.17.1.tar.gz) = 67255715
SHA256 (node-v16.16.0.tar.gz) = e07c30b0498f143c08793e34bda1adeaad32f485a4f79f4d67a82879f4c0bbe3
SIZE (node-v16.16.0.tar.gz) = 66189510
SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
SIZE (optipng-0.7.7.tar.gz) = 2329555
SHA256 (onlyoffice-7.1.1.23-npm-cache.tar.gz) = 973e17df56cfe216e671d2a9c58d49d7e3bf33bebdeb5c3634a1310910cceb31
SIZE (onlyoffice-7.1.1.23-npm-cache.tar.gz) = 204228019
SHA256 (ONLYOFFICE-DocumentServer-v7.1.1.23-v7.1.1_GH0.tar.gz) = dd00e923a85168d0c2c9d9dc3e0e28878c8d55c5b19f09364b786ca434a36160
SIZE (ONLYOFFICE-DocumentServer-v7.1.1.23-v7.1.1_GH0.tar.gz) = 55515
SHA256 (ONLYOFFICE-core-v7.1.1.23_GH0.tar.gz) = 29c1691abeb16fa44162a83ad5ccb0f1d6b1a383eae11c52ddeae91f8d927fe9
SIZE (ONLYOFFICE-core-v7.1.1.23_GH0.tar.gz) = 85336026
SHA256 (ONLYOFFICE-core-fonts-v7.1.1.23_GH0.tar.gz) = caabf3282475af078c2b9318d93174fddf3227e844deec182a140b37dcff4229
SIZE (ONLYOFFICE-core-fonts-v7.1.1.23_GH0.tar.gz) = 95254716
SHA256 (ONLYOFFICE-dictionaries-v7.1.1.23_GH0.tar.gz) = 31b94aa87bb25ed7d28521ba2600dd7c1dcef20d58d26142fdf81a72fb0a6b3e
SIZE (ONLYOFFICE-dictionaries-v7.1.1.23_GH0.tar.gz) = 41040585
SHA256 (ONLYOFFICE-document-server-integration-v7.1.1.23_GH0.tar.gz) = 41a01ce928de4a4eee9a7b3cafbc16137029e2594e6ef8ac8e89751b0af52f2c
SIZE (ONLYOFFICE-document-server-integration-v7.1.1.23_GH0.tar.gz) = 5263057
SHA256 (ONLYOFFICE-document-templates-v7.1.1.23_GH0.tar.gz) = 868dbc84c77035a603899333477097ff98e384d3d0c5ee944c9cd48cd3ea91f5
SIZE (ONLYOFFICE-document-templates-v7.1.1.23_GH0.tar.gz) = 2152335
SHA256 (ONLYOFFICE-sdkjs-v7.1.1.23_GH0.tar.gz) = daa3c4bbae73e0cbcbb000535b7f2a2ad5ce9c3de2daf49597d417c7064deb8b
SIZE (ONLYOFFICE-sdkjs-v7.1.1.23_GH0.tar.gz) = 19011048
SHA256 (ONLYOFFICE-server-v7.1.1.23_GH0.tar.gz) = 95a08d87b5b81cb44696e8a72042dc32f87adca4468215f37537b9367b3a22e6
SIZE (ONLYOFFICE-server-v7.1.1.23_GH0.tar.gz) = 257880
SHA256 (ONLYOFFICE-web-apps-v7.1.1.23_GH0.tar.gz) = d3bfcee33098f8eae350a02a362ecd69c288ad00eccbb81eb6348c9ce1183c9c
SIZE (ONLYOFFICE-web-apps-v7.1.1.23_GH0.tar.gz) = 321909894
SHA256 (ONLYOFFICE-plugin-highlightcode-v7.1.1.23_GH0.tar.gz) = 5aeef8c437d6c3229872f8e7aa32372cac008bc40fcbd0156174d5940c7a712b
SIZE (ONLYOFFICE-plugin-highlightcode-v7.1.1.23_GH0.tar.gz) = 245226
SHA256 (ONLYOFFICE-plugin-macros-v7.1.1.23_GH0.tar.gz) = 4fa5c8998b2ac8291cd044e76ed266540c14a7ac7cc42f93b5e58ce993dfe413
SIZE (ONLYOFFICE-plugin-macros-v7.1.1.23_GH0.tar.gz) = 2646708
SHA256 (ONLYOFFICE-plugin-mendeley-v7.1.1.23_GH0.tar.gz) = 629a227d00f5afa5a8efbc40408f7fac3a7fc0cfb321794bfa14382300fe1d4d
SIZE (ONLYOFFICE-plugin-mendeley-v7.1.1.23_GH0.tar.gz) = 417663
SHA256 (ONLYOFFICE-plugin-ocr-v7.1.1.23_GH0.tar.gz) = 28c1a6ebd539c65c837e75bdbfe38c011f86f272650d15549b23b80c9d753de5
SIZE (ONLYOFFICE-plugin-ocr-v7.1.1.23_GH0.tar.gz) = 169528
SHA256 (ONLYOFFICE-plugin-photoeditor-v7.1.1.23_GH0.tar.gz) = 1707d97022a3dc458a6db3b802779cb270b6e12c733aa86a0517546d12ddea89
SIZE (ONLYOFFICE-plugin-photoeditor-v7.1.1.23_GH0.tar.gz) = 201054
SHA256 (ONLYOFFICE-plugin-speech-v7.1.1.23_GH0.tar.gz) = 619858d4003ae21439d1a6b0a5bb474cf01cfff6ccf8195dfcb66ea175566024
SIZE (ONLYOFFICE-plugin-speech-v7.1.1.23_GH0.tar.gz) = 184762
SHA256 (ONLYOFFICE-plugin-thesaurus-v7.1.1.23_GH0.tar.gz) = e3c1f937b751cfa3107ac3097cb500cb90181550ea330af2e4eac89e5d3f8f01
SIZE (ONLYOFFICE-plugin-thesaurus-v7.1.1.23_GH0.tar.gz) = 42922
SHA256 (ONLYOFFICE-plugin-translator-v7.1.1.23_GH0.tar.gz) = 71ba309c882c6e139b6621eef6002157295ed1a6ce00e2807d50c94015f1c2d7
SIZE (ONLYOFFICE-plugin-translator-v7.1.1.23_GH0.tar.gz) = 141324
SHA256 (ONLYOFFICE-plugin-youtube-v7.1.1.23_GH0.tar.gz) = 75f5bd055751395743b6e9801d6e6c9f5c48276f06b0e7d6fb9c5c462bfadbf3
SIZE (ONLYOFFICE-plugin-youtube-v7.1.1.23_GH0.tar.gz) = 11573
SHA256 (ONLYOFFICE-plugin-zotero-v7.1.1.23_GH0.tar.gz) = 96599e8cdb2a623d8112668f7030d2cc6f5ef8738594250654be58099984c7ad
SIZE (ONLYOFFICE-plugin-zotero-v7.1.1.23_GH0.tar.gz) = 33815
SHA256 (ONLYOFFICE-build_tools-v7.1.1.23_GH0.tar.gz) = 2c3cae4694789ee4e286b216a98f45322fccbe8b4b7440957d8551cf3f48f7c2
SIZE (ONLYOFFICE-build_tools-v7.1.1.23_GH0.tar.gz) = 4093579
SHA256 (ONLYOFFICE-DocumentBuilder-v7.1.1.23_GH0.tar.gz) = 3b99065ccc6adce2e05837ce54f722aa0c100a2ade31afc99cafbb8fce33ff61
SIZE (ONLYOFFICE-DocumentBuilder-v7.1.1.23_GH0.tar.gz) = 1271599
SHA256 (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 20a58e72bb2e3eaede5acbeaa6284769d9ec4606f39869da8b7edcc1aefc9e63
SIZE (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 13283
SHA256 (ONLYOFFICE-document-server-package-v7.1.1.23_GH0.tar.gz) = fecde28442253adc02d40121bcc7a79cfb728f0c246427f3fdf518cdc017f4da
SIZE (ONLYOFFICE-document-server-package-v7.1.1.23_GH0.tar.gz) = 145078
SHA256 (onlyoffice-documentserver-7.2.1.34-npm-cache.tar.gz) = 15a9bd7c70b7d413534f7d53762a67e13ac6bda13b10c9c609615aec459165d9
SIZE (onlyoffice-documentserver-7.2.1.34-npm-cache.tar.gz) = 227942365
SHA256 (ONLYOFFICE-DocumentServer-v7.2.1.34-v7.2.1_GH0.tar.gz) = d339fe4c7ddf0d2d9b40020b2229d880274bafa31347b5fed46e1bcab418cdea
SIZE (ONLYOFFICE-DocumentServer-v7.2.1.34-v7.2.1_GH0.tar.gz) = 59218
SHA256 (ONLYOFFICE-core-v7.2.1.34_GH0.tar.gz) = 07107f3e83131a33c291ca8d6ddb9da894b0a08fb08edf213a57a59ebf1691d5
SIZE (ONLYOFFICE-core-v7.2.1.34_GH0.tar.gz) = 89925469
SHA256 (ONLYOFFICE-core-fonts-v7.2.1.34_GH0.tar.gz) = 4b6073b14eb73f152f150560c277c6003fd94cbdc2845030c9ca9b6726c3bec4
SIZE (ONLYOFFICE-core-fonts-v7.2.1.34_GH0.tar.gz) = 95256926
SHA256 (ONLYOFFICE-dictionaries-v7.2.1.34_GH0.tar.gz) = fd89298c26156f0bdedd910bde30b2c0b89f18375195f371c09d8ae6fbe0848d
SIZE (ONLYOFFICE-dictionaries-v7.2.1.34_GH0.tar.gz) = 41115585
SHA256 (ONLYOFFICE-document-server-integration-v7.2.1.34_GH0.tar.gz) = e79a5313b29dc0618f9ace73d02169b1dcb52f04c4d8f92eef160a62aebd0c1a
SIZE (ONLYOFFICE-document-server-integration-v7.2.1.34_GH0.tar.gz) = 5289469
SHA256 (ONLYOFFICE-document-templates-v7.2.1.34_GH0.tar.gz) = 0088a2fb8eb2e3b2e6f8423829c443d95b9b69879ed7c432351df61003bb1b59
SIZE (ONLYOFFICE-document-templates-v7.2.1.34_GH0.tar.gz) = 2152340
SHA256 (ONLYOFFICE-sdkjs-v7.2.1.34_GH0.tar.gz) = de45047a12101381157d98494979a89267d47fc4233aa6f1037da89604cb14d0
SIZE (ONLYOFFICE-sdkjs-v7.2.1.34_GH0.tar.gz) = 21095862
SHA256 (ONLYOFFICE-server-v7.2.1.34_GH0.tar.gz) = 66742e760a55f0d79481e24b3061de57eba0f8b922f607e31f615bbf290af361
SIZE (ONLYOFFICE-server-v7.2.1.34_GH0.tar.gz) = 245601
SHA256 (ONLYOFFICE-web-apps-v7.2.1.34_GH0.tar.gz) = 8245ff52912ff429d3785e6a87e4352e5747855fa18ff8cd5db9a88a74bea4d2
SIZE (ONLYOFFICE-web-apps-v7.2.1.34_GH0.tar.gz) = 279618487
SHA256 (ONLYOFFICE-plugin-mendeley-v7.2.0.8_GH0.tar.gz) = 7c5a706c32314a049e1edb7aaeafd113b4868cf3b441498ab24c1ef3ff495cf4
SIZE (ONLYOFFICE-plugin-mendeley-v7.2.0.8_GH0.tar.gz) = 417664
SHA256 (ONLYOFFICE-build_tools-v7.2.1.34_GH0.tar.gz) = e6daeac5dbd173e25335b93995ad7ad4fa1f46e30eb9fb35ae4f060486ca2099
SIZE (ONLYOFFICE-build_tools-v7.2.1.34_GH0.tar.gz) = 4583267
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-v7.2.1.34_GH0.tar.gz) = b96f19ecda2a15694b684b859be3fde8dbf0304cd674a4cb9da11ef06338ddc7
SIZE (ONLYOFFICE-document-server-package-v7.2.1.34_GH0.tar.gz) = 152576
SHA256 (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = ed83020cbe07877c7323d475491803797fac12ce4086966011c81023b9852c4b
SIZE (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = 97209
SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335

View File

@ -0,0 +1,2 @@
#!/bin/sh
exec /usr/local/bin/npm --offline "$@"

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
--- build_tools/scripts/base.py.orig 2021-11-16 08:07:24 UTC
+++ build_tools/scripts/base.py
@@ -1092,9 +1092,15 @@ def copy_sdkjs_plugins_server(dst_dir, is_name_as_guid
@@ -1144,9 +1144,15 @@ def support_old_versions_plugins(out_dir):
def support_old_versions_plugins(out_dir):
if is_file(out_dir + "/pluginBase.js"):
return
@ -19,3 +19,12 @@
content_plugin_base = ""
with open(get_path(out_dir + "/plugins.js"), "r") as file:
content_plugin_base += file.read()
@@ -1282,7 +1288,7 @@ def clone_marketplace_plugin(out_dir, is_name_as_guid=
def clone_marketplace_plugin(out_dir, is_name_as_guid=False):
old_cur = os.getcwd()
os.chdir(out_dir)
- git_update("onlyoffice.github.io", False, True)
+# git_update("onlyoffice.github.io", False, True)
os.chdir(old_cur)
dst_dir_name = "marketplace"

View File

@ -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,15 +8,15 @@ import config
@@ -8,17 +8,17 @@ import glob
import base
import glob
@ -19,9 +19,12 @@
-import hunspell
+#import hunspell
import glew
-import harfbuzz
+#import harfbuzz
def check_android_ndk_macos_arm(dir):
@@ -32,13 +32,15 @@ def make():
if base.is_dir(dir + "/darwin-x86_64") and not base.is_dir(dir + "/darwin-arm64"):
@@ -33,14 +33,15 @@ def make():
if base.is_dir(toolchain):
check_android_ndk_macos_arm(toolchain + "/prebuilt")
@ -34,11 +37,12 @@
+ cef.make()
+ icu.make()
+ openssl.make()
+
v8.make()
html2.make()
- hunspell.make(False)
- harfbuzz.make()
+# hunspell.make(False)
+# harfbuzz.make()
glew.make()
if config.check_option("module", "mobile"):
curl.make()

View File

@ -0,0 +1,11 @@
--- ./core/ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/CodePageOle.h.orig 2022-09-27 15:45:47.287310000 +0200
+++ ./core/ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/CodePageOle.h 2022-09-27 15:45:56.147611000 +0200
@@ -35,7 +35,7 @@
#include <string>
#include <vector>
#include <boost/smart_ptr/shared_array.hpp>
-#include "../../../../../../Common/DocxFormat/Source/Base/Types_32.h"
+#include "../../../../../Common/DocxFormat/Source/Base/Types_32.h"
namespace OLEPS
{

View File

@ -25,8 +25,8 @@
- nm = "${toolprefix}nm"
+ if (is_bsd) {
+ prefix = "%%LOCALBASE%%/bin"
+ cc = "cc"
+ cxx = "c++"
+ cc = "%%CC%%"
+ cxx = "%%CXX%%"
+ ld = cxx
+ readelf = "${prefix}/readelf"
+ ar = "llvm-ar"

View File

@ -5,7 +5,7 @@
}
+core_freebsd {
+ LIBS += -lz -pthread -liconv
+ LIBS += -lz -pthread -liconv -lharfbuzz
+
+ QMAKE_LFLAGS += -Wl,--rpath=./
+}

View File

@ -1,29 +1,29 @@
--- core/DesktopEditor/doctrenderer/docbuilder_p.h.orig 2021-09-30 12:13:32 UTC
+++ core/DesktopEditor/doctrenderer/docbuilder_p.h
@@ -50,7 +50,7 @@
@@ -47,7 +47,7 @@
#include "embed/NativeControlEmbed.h"
#include "embed/MemoryStreamEmbed.h"
#include "embed/GraphicsEmbed.h"
#include "embed/Default.h"
-#ifdef LINUX
+#if defined(LINUX) || defined(__FreeBSD__)
#include <unistd.h>
#include <sys/wait.h>
#include <stdio.h>
@@ -536,7 +536,7 @@ namespace NSDoctRenderer
@@ -785,7 +785,7 @@ namespace NSDoctRenderer
#endif
#endif
- #ifdef LINUX
+ #if defined(LINUX) || defined(__FreeBSD__)
pid_t pid = fork(); // create child process
int status;
-#ifdef LINUX
+#if defined(LINUX) || defined(__FreeBSD__)
pid_t pid = fork(); // create child process
int status;
@@ -848,7 +848,7 @@ namespace NSDoctRenderer
@@ -1103,7 +1103,7 @@ namespace NSDoctRenderer
#endif
#endif
- #ifdef LINUX
+ #if defined(LINUX) || defined(__FreeBSD__)
pid_t pid = fork(); // create child process
int status;
-#ifdef LINUX
+#if defined(LINUX) || defined(__FreeBSD__)
pid_t pid = fork(); // create child process
int status;

View File

@ -1,11 +1,11 @@
--- core/DesktopEditor/doctrenderer/nativecontrol.h.orig 2021-09-30 12:13:32 UTC
+++ core/DesktopEditor/doctrenderer/nativecontrol.h
@@ -327,7 +327,7 @@ class CNativeControl (public)
@@ -327,7 +327,7 @@ namespace NSNativeControl
if (m_map_access_directories.end() == m_map_access_directories.find(NSFile::GetDirectoryName(strFile)))
{
- *pData = NULL;
+ pData = NULL;
dwLen = 0;
return;
}
if (m_map_access_directories.end() == m_map_access_directories.find(NSFile::GetDirectoryName(strFile)))
{
- *pData = NULL;
+ pData = NULL;
dwLen = 0;
return;
}

View File

@ -4,7 +4,7 @@
#if defined(_LINUX) && !defined(_MAC) && !defined(__ANDROID__)
m_oList.LoadFromFolder(L"/usr/share/fonts");
+#else if defined(__FreeBSD__)
+#elif defined(__FreeBSD__)
+ m_oList.LoadFromFolder(L"%%LOCALBASE%%/share/fonts");
#endif
@ -14,7 +14,7 @@
if (!custom_fonts_path.empty())
NSDirectory::GetFiles2(custom_fonts_path, _array, true);
+
+#else if defined(__FreeBSD__)
+#elif defined(__FreeBSD__)
+ std::vector<std::wstring> _array = NSDirectory::GetFiles(L"/usr/share/fonts", true);
+ NSDirectory::GetFiles2(L"%%LOCALBASE%%/share/fonts", _array, true);
#endif

View File

@ -0,0 +1,15 @@
--- 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
@@ -649,9 +649,9 @@ namespace NSShaper
#ifdef SUPPORT_HARFBUZZ_SHAPER
-#include <hb.h>
-#include <hb-ft.h>
-#include <hb-ot.h>
+#include <harfbuzz/hb.h>
+#include <harfbuzz/hb-ft.h>
+#include <harfbuzz/hb-ot.h>
namespace NSShaper
{

View File

@ -0,0 +1,15 @@
--- 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
// ------------------------------------------------------------
// HARFBUZZ
-#include <hb.h>
-#include <hb-ft.h>
-#include <hb-ot.h>
+#include <harfbuzz/hb.h>
+#include <harfbuzz/hb-ft.h>
+#include <harfbuzz/hb-ot.h>
#define g_userfeatures_count 5
hb_feature_t g_userfeatures[g_userfeatures_count];

View File

@ -0,0 +1,15 @@
--- 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
@@ -25,9 +25,9 @@
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
-#include <hb.h>
-#include <hb-ot.h>
-#include <hb-ft.h>
+#include <harfbuzz/hb.h>
+#include <harfbuzz/hb-ot.h>
+#include <harfbuzz/hb-ft.h>
#endif

View File

@ -1,14 +1,15 @@
--- core/DesktopEditor/graphics/pro/graphics.pro.orig 2021-12-18 11:22:47 UTC
+++ core/DesktopEditor/graphics/pro/graphics.pro
@@ -35,6 +35,11 @@ DEFINES += \
@@ -22,6 +22,12 @@ ADD_DEPENDENCY(UnicodeConverter, kernel)
DEFINES += FT_SUPPORT_UTF8_IN_NAMES
ADD_DEPENDENCY(UnicodeConverter, kernel)
+core_freebsd {
+ LIBS += -lharfbuzz
+ DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
+ QMAKE_CXXFLAGS += -Wno-narrowing
+}
+
core_linux {
DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
QMAKE_CXXFLAGS += -Wno-narrowing
core_windows {
LIBS += -lAdvapi32
LIBS += -lShell32

View File

@ -1,11 +0,0 @@
--- core/PdfWriter/Src/FontCidTT.cpp.orig 2022-01-19 13:47:39 UTC
+++ core/PdfWriter/Src/FontCidTT.cpp
@@ -222,7 +222,7 @@ namespace PdfWriter
unsigned short CFontCidTrueType::EncodeChar(const unsigned int &unUnicode)
{
if (!OpenFontFace())
- return NULL;
+ return 0;
std::map<unsigned int, unsigned short>::const_iterator oIter = m_mUnicodeToCode.find(unUnicode);
if (oIter != m_mUnicodeToCode.end())

View File

@ -9,12 +9,12 @@
#include <unistd.h>
#include <sys/wait.h>
#include <stdio.h>
@@ -178,7 +178,7 @@ namespace NSX2T
@@ -347,7 +347,7 @@ namespace NSX2T
#endif
-#ifdef LINUX
+#if defined(LINUX) || defined(__FreeBSD__)
pid_t pid = fork(); // create child process
int status;
pid_t pid = fork(); // create child process
int status;

View File

@ -0,0 +1,10 @@
--- core/UnicodeConverter/UnicodeConverter.cpp.orig 2022-09-27 13:24:04 UTC
+++ core/UnicodeConverter/UnicodeConverter.cpp
@@ -38,6 +38,7 @@
#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)

View File

@ -5,7 +5,7 @@
LIBS += -lAdvapi32
}
+core_freebsd {
+ LIBS += -liconv
+ LIBS += -liconv -lharfbuzz
+ QMAKE_CXXFLAGS += -Wno-narrowing
+}
########################################################

View File

@ -1,14 +1,16 @@
--- web-apps/build/package.json.orig 2021-12-12 18:45:10 UTC
+++ web-apps/build/package.json
@@ -28,7 +28,9 @@
@@ -29,8 +29,9 @@
"vinyl-fs": "^3.0.3"
},
"devDependencies": {
"chai": "1.9.1",
- "mocha": "^6.2.2",
- "grunt-mocha": "^1.0.0"
+ "mocha": "^6.2.2"
- "chai": "1.9.1",
- "grunt-mocha": "^1.0.0",
- "mocha": "^9.2.0"
- }
+ "chai": "1.9.1"
+ },
+ "scripts": {
+ "postinstall": "patch-package"
}
+ }
}

View File

@ -76,4 +76,16 @@ you need to update the database schema:
mysql -u onlyoffice -D onlyoffice -p < %%WWWDIR%%/documentserver/server/schema/mysql/upgrade/upgradev710.sql
EOM
}
{ type: upgrade
minimum_version: 7.1.0.215
maximum_version: 7.2.1.34
message: <<EOM
If you are upgrading onlyoffice-documentserver from a version prior to 7.2.1.34,
you need to update the database schema:
For PostgreSQL:
psql -U postgres -d onlyoffice -f %%WWWDIR%%/documentserver/server/schema/postgresql/upgrade/upgradev720.sql
For MySQL:
mysql -u onlyoffice -D onlyoffice -p < %%WWWDIR%%/documentserver/server/schema/mysql/upgrade/upgradev720.sql
EOM
}
]

File diff suppressed because it is too large Load Diff