Skip to content

Commit

Permalink
www/onlyoffice-documentserver: Update to 7.4.0
Browse files Browse the repository at this point in the history 
Changes:
  https://github.com/ONLYOFFICE/DocumentServer/blob/v7.4.0/CHANGELOG.md
  • Loading branch information
@MikaelUrankar
MikaelUrankar committed Jul 24, 2023
1 parent 22543f0 commit bebb90b
Show file tree
Hide file tree
Showing 54 changed files with 3,102 additions and 1,059 deletions.
55 changes: 23 additions & 32 deletions www/onlyoffice-documentserver/Makefile
View file
@@ -1,7 +1,6 @@
PORTNAME= onlyoffice-documentserver
DISTVERSIONPREFIX= v
DISTVERSION= 7.3.3.49
PORTREVISION= 4
DISTVERSION= 7.4.0.163
CATEGORIES= www
MASTER_SITES+= LOCAL/mikael/v8/:source1 \
LOCAL/mikael/onlyoffice/:source2 \
Expand All @@ -27,7 +26,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
gn:devel/gn \
java:java/openjdk11 \
ninja:devel/ninja \
npm:www/npm-node16
npm:www/npm-node16 \
${LOCALBASE}/lib/libcrypto.a:security/openssl30
LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libcurl.so:ftp/curl \
libharfbuzz.so:print/harfbuzz \
Expand Down Expand Up @@ -59,7 +59,7 @@ GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \
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 \
jasenhuang:katana-parser:be6df45:jasenhuang_katana/core/Common/3dParty/html/katana-parser \
google:gumbo-parser:aa91b27:google_gumbo/core/Common/3dParty/html/gumbo-parser

OPTIONS_SINGLE= DB
Expand Down Expand Up @@ -107,7 +107,7 @@ DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/htt
CONFLICTS_BUILD=devel/googletest

post-extract:
@${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8
@${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8_89

@${MKDIR} ${WRKDIR}/.pkg-cache/node
@${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${WRKDIR}/.pkg-cache/node
Expand All @@ -127,54 +127,44 @@ post-extract:

post-patch:
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/build_tools/tools/freebsd/automate.py \
${WRKSRC}/core/Common/3dParty/boost/boost.pri \
${WRKSRC}/core/Common/3dParty/icu/icu.pri \
${WRKSRC}/core/Common/3dParty/v8/v8/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/core/Common/3dParty/v8/v8/buildtools/third_party/libc++/BUILD.gn \
${WRKSRC}/core/Common/3dParty/openssl/openssl.pri \
${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/core/Common/3dParty/v8_89/v8/buildtools/third_party/libc++/BUILD.gn \
${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp \
${WRKSRC}/build_tools/tools/freebsd/automate.py
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-pluginsmanager.sh.m4 \
${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/supervisor/ds-converter.conf \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-metrics.conf
@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \
${WRKSRC}/core/Common/3dParty/v8/v8/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/core/Common/base.pri
@${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \
${WRKSRC}/document-server-package/Makefile
@${REINPLACE_CMD} 's|%%WRKSRC%%|${WRKSRC}|' \
${WRKSRC}/build_tools/scripts/build_js.py \
${WRKSRC}/build_tools/scripts/build_server.py \
${WRKSRC}/document-server-package/Makefile
@${REINPLACE_CMD} -e 's|linux|freebsd|' -e 's|/etc|${LOCALBASE}/etc|' \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-converter.conf \
${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-jwt-status.sh.m4
@${REINPLACE_CMD} 's|/var/www|${LOCALBASE}/www|' \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-converter.conf \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \
${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-metrics.conf \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-static-gzip.sh.m4 \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4
@${REINPLACE_CMD} -e 's|/var/lib|/var/db|' -e 's|/var/www|${LOCALBASE}/www|' \
-e 's|/usr/share|${LOCALBASE}/share|' -e 's|/etc|${LOCALBASE}/etc|' \
${WRKSRC}/server/Common/config/production-freebsd.json \
${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-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}|' \
${WRKSRC}/document-server-package/Makefile
@${REINPLACE_CMD} 's#ds:ds#${DS_USERNAME}:${DS_GROUPNAME}#' \
${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4
@${RM} ${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch.orig

@${FIND} ${WRKSRC}/server -type f -name npm-shrinkwrap.json -delete

@${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8/v8/build/config/gclient_args.gni
@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8/v8/build/config/gclient_args.gni
@${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni
@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni

do-build:
${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm
Expand Down Expand Up @@ -204,6 +194,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/all* ${STAGEDIR}${WWWDIR}/documentserver/server/tools
${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/x2t ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/docbuilder ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin
${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/pluginsmanager ${STAGEDIR}${WWWDIR}/documentserver/server/tools
${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm
${INSTALL_LIB} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/*.so ${STAGEDIR}${PREFIX}/lib
${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh
Expand Down Expand Up @@ -236,7 +227,7 @@ do-install:

create-caches-tarball:
# do some cleanup first
${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp
${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp ${WRKDIR}/.cache/node-gyp
${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
${FIND} ${WRKDIR}/.pkg-cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}

Expand Down
54 changes: 27 additions & 27 deletions www/onlyoffice-documentserver/distinfo
View file
@@ -1,39 +1,39 @@
TIMESTAMP = 1689784075
TIMESTAMP = 1689842471
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 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
SIZE (optipng-0.7.7.tar.gz) = 2329555
SHA256 (onlyoffice-documentserver-7.3.3.49-npm-cache.tar.gz) = e1611fe023c2ac5eacae097c4f9605710f8d5de34b600f6301b282872db3fe1d
SIZE (onlyoffice-documentserver-7.3.3.49-npm-cache.tar.gz) = 234604012
SHA256 (ONLYOFFICE-DocumentServer-v7.3.3.49-v7.3.3_GH0.tar.gz) = 7eb5d59aea3211fd56d17379c29bf680939fab88e1eb25d0cd6aa32c64e86a4c
SIZE (ONLYOFFICE-DocumentServer-v7.3.3.49-v7.3.3_GH0.tar.gz) = 63957
SHA256 (ONLYOFFICE-core-v7.3.3.49_GH0.tar.gz) = 7cb74cd2027d051ddf66129df9efc78e3d646af189c18d50e33018d50a356904
SIZE (ONLYOFFICE-core-v7.3.3.49_GH0.tar.gz) = 88430975
SHA256 (ONLYOFFICE-core-fonts-v7.3.3.49_GH0.tar.gz) = 3f726b0e5344eabf501e22d566554bbfbc343625360699bbe23536a4d02b73fb
SIZE (ONLYOFFICE-core-fonts-v7.3.3.49_GH0.tar.gz) = 95253256
SHA256 (ONLYOFFICE-dictionaries-v7.3.3.49_GH0.tar.gz) = 8434d8aad8c7acd571e2d8a751dcbb4e13a750ccf37188455d747f85d2ba4df4
SIZE (ONLYOFFICE-dictionaries-v7.3.3.49_GH0.tar.gz) = 41115358
SHA256 (ONLYOFFICE-document-server-integration-v7.3.3.49_GH0.tar.gz) = 9ed80d4f3fba3d98a7cb0e528d856a9ac46ff56233d96f46ce2cd62aa4a17306
SIZE (ONLYOFFICE-document-server-integration-v7.3.3.49_GH0.tar.gz) = 5344109
SHA256 (ONLYOFFICE-document-templates-v7.3.3.49_GH0.tar.gz) = e04fdff908953049781c67c74c7d643bd3f2f42f3bd1af4cdcfff45bd4145e8e
SIZE (ONLYOFFICE-document-templates-v7.3.3.49_GH0.tar.gz) = 2152326
SHA256 (ONLYOFFICE-sdkjs-v7.3.3.49_GH0.tar.gz) = 4e0b68f43cd3338b25e06bbacf69399fee9d69a1d9e6e073c6d971d35bc96e19
SIZE (ONLYOFFICE-sdkjs-v7.3.3.49_GH0.tar.gz) = 25674391
SHA256 (ONLYOFFICE-server-v7.3.3.49_GH0.tar.gz) = 6d54baed81b5723c53e55598a5f0a716c18a2bf78047605a725b51a8d0d312ba
SIZE (ONLYOFFICE-server-v7.3.3.49_GH0.tar.gz) = 258896
SHA256 (ONLYOFFICE-web-apps-v7.3.3.49_GH0.tar.gz) = 90ae7a0e27487d503d681bfdfe84d395baa1139385ca40179956baece9eb2abb
SIZE (ONLYOFFICE-web-apps-v7.3.3.49_GH0.tar.gz) = 281994064
SHA256 (ONLYOFFICE-build_tools-v7.3.3.49_GH0.tar.gz) = 58607e40cc757d29bfb60bdb1ee687965e812f6219a265ab26ff585f0779b8e8
SIZE (ONLYOFFICE-build_tools-v7.3.3.49_GH0.tar.gz) = 4588736
SHA256 (onlyoffice-documentserver-7.4.0.163-npm-cache.tar.gz) = 13c6a5c314a7619473260b2d7fb1161d7d2178e0da3ab6973981b7bfddae82b3
SIZE (onlyoffice-documentserver-7.4.0.163-npm-cache.tar.gz) = 275714693
SHA256 (ONLYOFFICE-DocumentServer-v7.4.0.163-v7.4.0_GH0.tar.gz) = ceaa39fcb9373a22f652c02c760f32961d02c49b14af3acb2412b422972fe0bb
SIZE (ONLYOFFICE-DocumentServer-v7.4.0.163-v7.4.0_GH0.tar.gz) = 65484
SHA256 (ONLYOFFICE-core-v7.4.0.163_GH0.tar.gz) = d6fbd0acd244cfa3e48afe98942720aed0463afb34d12c257bf233f91e919891
SIZE (ONLYOFFICE-core-v7.4.0.163_GH0.tar.gz) = 88380222
SHA256 (ONLYOFFICE-core-fonts-v7.4.0.163_GH0.tar.gz) = dc829e15f7fc7f08be31de53d2eb9842c840a2d5a95afd9d99cd0c482c60d277
SIZE (ONLYOFFICE-core-fonts-v7.4.0.163_GH0.tar.gz) = 95366415
SHA256 (ONLYOFFICE-dictionaries-v7.4.0.163_GH0.tar.gz) = a6247152990493aa5cf43d22c11d754ecdc2d9740b60b26cbdb955fa1938dbaa
SIZE (ONLYOFFICE-dictionaries-v7.4.0.163_GH0.tar.gz) = 41115736
SHA256 (ONLYOFFICE-document-server-integration-v7.4.0.163_GH0.tar.gz) = d57cda65a2c3aa8468c665cd789cc59ccbd833c8c13de2247e811a665adb0ec5
SIZE (ONLYOFFICE-document-server-integration-v7.4.0.163_GH0.tar.gz) = 5118132
SHA256 (ONLYOFFICE-document-templates-v7.4.0.163_GH0.tar.gz) = 41dcff925754f5ac57ac06fa116e3318ac2d6bcb35a38ca866182477caa858eb
SIZE (ONLYOFFICE-document-templates-v7.4.0.163_GH0.tar.gz) = 2538820
SHA256 (ONLYOFFICE-sdkjs-v7.4.0.163_GH0.tar.gz) = 411c2b89d46fa3e0af08b4e081ba79366ddc33f5971df8d5963cd36f8046e364
SIZE (ONLYOFFICE-sdkjs-v7.4.0.163_GH0.tar.gz) = 25997019
SHA256 (ONLYOFFICE-server-v7.4.0.163_GH0.tar.gz) = cd0df0e1745e0d3944b508d1019669a72f748e7da3b0ff3560d58bd855de9cd4
SIZE (ONLYOFFICE-server-v7.4.0.163_GH0.tar.gz) = 267471
SHA256 (ONLYOFFICE-web-apps-v7.4.0.163_GH0.tar.gz) = 74edc2cbeda649251df8f1cf0e34ce48372a1f9a35541abfb70617552a6b18e6
SIZE (ONLYOFFICE-web-apps-v7.4.0.163_GH0.tar.gz) = 348597216
SHA256 (ONLYOFFICE-build_tools-v7.4.0.163_GH0.tar.gz) = 048cc71c124dd27a399feb960e540eed555f3935d5272aeb67bdedc030bbdace
SIZE (ONLYOFFICE-build_tools-v7.4.0.163_GH0.tar.gz) = 6656908
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.3.3.49_GH0.tar.gz) = 1d441f347851055356ded52ad038ee3ebe65d03806f9155c6221a3a0c4491a5b
SIZE (ONLYOFFICE-document-server-package-v7.3.3.49_GH0.tar.gz) = 154588
SHA256 (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = ed83020cbe07877c7323d475491803797fac12ce4086966011c81023b9852c4b
SIZE (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = 97209
SHA256 (ONLYOFFICE-document-server-package-v7.4.0.163_GH0.tar.gz) = d9fb262e19ecbbd9a13bbc9f1e2d40f7fcef1ee1548302f4f09c2410a7abae01
SIZE (ONLYOFFICE-document-server-package-v7.4.0.163_GH0.tar.gz) = 155522
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
SIZE (google-gumbo-parser-aa91b27_GH0.tar.gz) = 2119417
6 changes: 3 additions & 3 deletions www/onlyoffice-documentserver/files/ds-converter.conf
View file
@@ -1,8 +1,8 @@
[program:converter]
command=/var/www/onlyoffice/documentserver/server/FileConverter/converter
directory=/var/www/onlyoffice/documentserver/server/FileConverter
command=%%LOCALBASE%%/www/onlyoffice/documentserver/server/FileConverter/converter
directory=%%LOCALBASE%%/www/onlyoffice/documentserver/server/FileConverter
user=onlyoffice
environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/onlyoffice/documentserver,NODE_DISABLE_COLORS=1,APPLICATION_NAME=M4_COMPANY_NAME
environment=NODE_ENV=production-freebsd,NODE_CONFIG_DIR=%%LOCALBASE%%/etc/onlyoffice/documentserver,NODE_DISABLE_COLORS=1,APPLICATION_NAME=M4_COMPANY_NAME
stdout_logfile=/var/log/onlyoffice/documentserver/converter/out.log
stdout_logfile_backups=0
stdout_logfile_maxbytes=0
Expand Down
6 changes: 3 additions & 3 deletions www/onlyoffice-documentserver/files/ds-docservice.conf
View file
@@ -1,8 +1,8 @@
[program:docservice]
command=/var/www/onlyoffice/documentserver/server/DocService/docservice
directory=/var/www/onlyoffice/documentserver/server/DocService
command=%%LOCALBASE%%/www/onlyoffice/documentserver/server/DocService/docservice
directory=%%LOCALBASE%%/www/onlyoffice/documentserver/server/DocService
user=onlyoffice
environment=NODE_ENV=production-linux,NODE_CONFIG_DIR=/etc/onlyoffice/documentserver,NODE_DISABLE_COLORS=1
environment=NODE_ENV=production-freebsd,NODE_CONFIG_DIR=%%LOCALBASE%%/etc/onlyoffice/documentserver,NODE_DISABLE_COLORS=1
stdout_logfile=/var/log/onlyoffice/documentserver/docservice/out.log
stdout_logfile_backups=0
stdout_logfile_maxbytes=0
Expand Down
4 changes: 2 additions & 2 deletions www/onlyoffice-documentserver/files/ds-metrics.conf
View file
@@ -1,6 +1,6 @@
[program:metrics]
command=/var/www/onlyoffice/documentserver/server/Metrics/metrics ./config/config.js
directory=/var/www/onlyoffice/documentserver/server/Metrics
command=%%LOCALBASE%%/www/onlyoffice/documentserver/server/Metrics/metrics ./config/config.js
directory=%%LOCALBASE%%/www/onlyoffice/documentserver/server/Metrics
user=onlyoffice
environment=NODE_DISABLE_COLORS=1
stdout_logfile=/var/log/onlyoffice/documentserver/metrics/out.log
Expand Down
29 changes: 28 additions & 1 deletion www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v16.13.0.cpp.patch
View file
Expand Up @@ -4,7 +4,31 @@ https://github.com/vercel/pkg-fetch/blob/main/patches/node.v16.14.2.cpp.patch

--- server/node_modules/pkg-fetch/patches/node.v16.13.0.cpp.patch.orig 2021-12-30 20:04:18.203959000 +0100
+++ server/node_modules/pkg-fetch/patches/node.v16.13.0.cpp.patch 2021-12-30 20:09:53.210319000 +0100
@@ -521,3 +521,171 @@ index 0000000000..fb2d47f52b
@@ -1,5 +1,5 @@
---- node/common.gypi
-+++ node/common.gypi
+--- common.gypi.orig 2021-10-26 14:00:54.000000000 +0200
++++ common.gypi 2023-07-18 12:52:05.744323000 +0200
@@ -171,7 +171,7 @@
'MSVC_runtimeType': 2 # MultiThreadedDLL (/MD)
}],
@@ -9,6 +9,15 @@ + 'lto': ' -flto=4 -ffat-lto-objects ', #
}, {
'lto': ' -flto ', # Clang
}],
+@@ -386,7 +386,7 @@
+ }],
+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+ 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
+- 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14' ],
++ 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14', '-Wno-error=enum-constexpr-conversion' ],
+ 'defines': [ '__STDC_FORMAT_MACROS' ],
+ 'ldflags': [ '-rdynamic' ],
+ 'target_conditions': [
--- node/deps/v8/include/v8.h
+++ node/deps/v8/include/v8.h
@@ -10092,6 +10092,10 @@ class V8_EXPORT V8 {
@@ -521,6 +530,174 @@ + 'cflags_cc': [ '-frtti', '-fno-lto' ],
'cflags_cc!': [ '-fno-rtti' ],
}],
[ 'OS == "mac" or OS == "ios"', {
Expand Down Expand Up @@ -176,3 +200,6 @@ https://github.com/vercel/pkg-fetch/blob/main/patches/node.v16.14.2.cpp.patch
+
+ namespace node {
+ namespace cares_wrap {
--- node/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2019-08-06 20:46:23 UTC
+++ node/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi
@@ -12,7 +12,7 @@
10 changes: 5 additions & 5 deletions www/onlyoffice-documentserver/files/patch-build__tools_scripts_base.py
View file
@@ -1,6 +1,6 @@
--- build_tools/scripts/base.py.orig 2021-11-16 08:07:24 UTC
+++ build_tools/scripts/base.py
@@ -1144,9 +1144,15 @@ def support_old_versions_plugins(out_dir):
@@ -1186,9 +1186,15 @@ def support_old_versions_plugins(out_dir):
def support_old_versions_plugins(out_dir):
if is_file(out_dir + "/pluginBase.js"):
return
Expand All @@ -19,12 +19,12 @@ def support_old_versions_plugins(out_dir):
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):
@@ -1331,7 +1337,7 @@ def clone_marketplace_plugin(out_dir, is_name_as_guid=
def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""):
old_cur = os.getcwd()
os.chdir(out_dir)
- git_update("onlyoffice.github.io", False, True)
+# git_update("onlyoffice.github.io", False, True)
- git_update("onlyoffice.github.io", False, True, git_owner)
+# git_update("onlyoffice.github.io", False, True, git_owner)
os.chdir(old_cur)

dst_dir_name = "marketplace"

0 comments on commit bebb90b

Please sign in to comment.