From nobody Wed Jan 26 14:39:53 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5177C198DE5E; Wed, 26 Jan 2022 14:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkRFk0wMCz4VZG; Wed, 26 Jan 2022 14:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643207994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eRs+gPx0STyW8eF8b2Q+MMch2gj4vNB2C1WsRc5CK+w=; b=j5Vc9+7T210+NZS5BAabiibYylYP1aIfYFfT4+awUE+cGFQwJSLFXwwYqjx1p6awH3XcCN qoQSDCZpN/Ssb5twMGNovPVb4ExCn952MGrEnK4fOaEsVUrJ7XuuF6gJZb6wPJiU31NXWx u0XNY+f2M3YZZrRqqqlWm6gxgADWT43EhaToHBctqkMkpjPRTSat29c38zmPatp9kDT6gj m9+WoWsvC6H57rPvQ76DjV9O6ZtKxS0EDXFnQHe/kJFDREEgygjZxrdchEzoMmAv0rCPlE wqsksGkUE8L0fG9g4MCLwHX9VMQnookhfj3q3JhYgaku9BmRnUwpEVeMGOIPQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F29BE1EDF9; Wed, 26 Jan 2022 14:39:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QEdrun024267; Wed, 26 Jan 2022 14:39:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QEdrtw024266; Wed, 26 Jan 2022 14:39:53 GMT (envelope-from git) Date: Wed, 26 Jan 2022 14:39:53 GMT Message-Id: <202201261439.20QEdrtw024266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 7bad2e9cdca0 - main - www/onlyoffice-documentserver: Update to 7.0.0.133 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bad2e9cdca0053fbe943ed42340bea883d28671 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643207994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eRs+gPx0STyW8eF8b2Q+MMch2gj4vNB2C1WsRc5CK+w=; b=GiaJ+bIBOwbIVWvNInEPA2PfKB1+gSGWIB/K1bDvtK7c269vigqApRtp0YPerQ0xiG8A/D RqLfyXfRvOPPaLsDeGDDAfdE68zimTD8QNPmk+3WzajICsJmNMxD6sjVxnoy805kxZNXU5 NDIVHwRIsA4tG7fTKTVhpFwU1iEyoQcOYK2+2iCl6Q+V7MZBh6YQnDR9wXfzICDAWKuJZ3 XzUGSG5Guvt36rJdorK34Mpuf1WjC4QuzRLvPkmrtJCpwK9WfCTDxQmrr2pjoEZFxDejSI vYp72gP5o78EnHdx1NRMQJRPrtuVw0DAb68mthxsHxkvY891JW0iBl0s/JlSUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643207994; a=rsa-sha256; cv=none; b=rylJ06lo6zup1gKVvhg3XQ4vZoJnyrSLUd/LIcP36djj13lkJfkR45aG6ot6U73nAgQuHq Pdm2LT11JUbqc/Qtvruo+7mpBpT1wpzmo1IZTpL3Z8+A8g1EM1CnS4MLTtoAcxJ/Q62PlS vY4VBIbLmUs1f0+HQgWa9nU7UodmzZJudhxd9yZ9Ap0Biz10RWO6mY2OuQO9ii11BH/po5 jidUDZ25nHIBPskNx816YwZwAiYm3UHyibNbKJw2U2ER6SFwVGEmr3ZaEGZ2lFmxDuwCZi vRlRRq9tXGXy8GzbUBCDZbhXcSLzxKqPefjkEXiU/6aDWq4w9DNA4UaXJa7jGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bad2e9cdca0053fbe943ed42340bea883d28671 commit 7bad2e9cdca0053fbe943ed42340bea883d28671 Author: Mikael Urankar AuthorDate: 2022-01-26 12:52:39 +0000 Commit: Mikael Urankar CommitDate: 2022-01-26 14:39:48 +0000 www/onlyoffice-documentserver: Update to 7.0.0.133 - Update to 7.0.0.133 - Downgrade v8 to v6.8.275.32: onlyoffice doesn't work correctly with version 8.7.220.31 - Use prebuilt binaries for v8, version 6.8.275.32 requires outdated ports: devel/gn@v1714, devel/py-Jinja2@v2.8 and textproc/py-markupsafe@v1.1.1 - Restrict the port to aarch64 and amd64 - Fix user name in pkg-plist Changes: https://github.com/ONLYOFFICE/DocumentServer/blob/v7.0.0/CHANGELOG.md --- www/onlyoffice-documentserver/Makefile | 72 +++--- www/onlyoffice-documentserver/distinfo | 106 ++++---- .../files/packagejsons/server/package-lock.json | 30 +-- .../patch-build__tools_scripts_build__server.py | 13 +- ...ild__tools_scripts_core__common_make__common.py | 16 +- ...build__tools_scripts_core__common_modules_v8.py | 6 +- ...File_TxtXmlFormatLib_Source_ConvertDocx2Txt.cpp | 11 + .../files/patch-core_Common_3dParty_v8_v8.pri | 10 +- .../files/patch-core_Common_3dParty_v8_v8_BUILD.gn | 32 --- ...core_Common_3dParty_v8_v8_build_config_BUILD.gn | 30 --- ...ommon_3dParty_v8_v8_build_config_BUILDCONFIG.gn | 48 ---- ...on_3dParty_v8_v8_build_config_compiler_BUILD.gn | 92 ------- ...dParty_v8_v8_build_config_compiler_compiler.gni | 11 - ..._Common_3dParty_v8_v8_build_config_features.gni | 11 - ...dParty_v8_v8_build_config_freetype_freetype.gni | 9 - ...ommon_3dParty_v8_v8_build_config_linux_BUILD.gn | 11 - ..._3dParty_v8_v8_build_config_linux_pkg-config.py | 26 -- ...e_Common_3dParty_v8_v8_build_config_sysroot.gni | 14 -- ...ommon_3dParty_v8_v8_build_detect__host__arch.py | 11 - ...e_Common_3dParty_v8_v8_build_gn__run__binary.py | 11 - ...ore_Common_3dParty_v8_v8_build_linux_chrome.map | 29 --- ...ommon_3dParty_v8_v8_build_linux_libpci_BUILD.gn | 53 ---- ...on_3dParty_v8_v8_build_linux_unbundle_libusb.gn | 27 -- ...8_v8_build_linux_unbundle_replace__gn__files.py | 10 - ...dParty_v8_v8_build_toolchain_gcc__toolchain.gni | 45 ---- ...v8_v8_build_toolchain_get__concurrent__links.py | 17 -- ...on_3dParty_v8_v8_build_toolchain_linux_BUILD.gn | 10 - ...ch-core_Common_3dParty_v8_v8_build_win_BUILD.gn | 13 - ...y_v8_v8_buildtools_third__party_libc++_BUILD.gn | 11 - ...ch-core_Common_3dParty_v8_v8_include_v8config.h | 21 -- .../patch-core_Common_3dParty_v8_v8_src_api_api.cc | 11 - ...patch-core_Common_3dParty_v8_v8_src_base_cpu.cc | 18 -- ...rty_v8_v8_src_base_platform_platform-freebsd.cc | 13 - ...Party_v8_v8_src_base_platform_platform-posix.cc | 24 -- ...ch-core_Common_3dParty_v8_v8_src_d8_d8-posix.cc | 19 -- ...mon_3dParty_v8_v8_src_objects_js-list-format.cc | 74 ------ ...ore_Common_3dParty_v8_v8_testing_gmock_BUILD.gn | 18 -- ...Common_3dParty_v8_v8_third__party_zlib_BUILD.gn | 11 - ...3dParty_v8_v8_third__party_zlib_cpu__features.c | 48 ---- ...mon_Network_FileTransporter_filetransporter.pri | 15 ++ .../files/patch-core_Common_kernel.pro | 21 -- .../patch-core_DesktopEditor_graphics_Graphics.cpp | 10 +- .../files/patch-core_PdfWriter_Src_FontCidTT.cpp | 11 + .../patch-core_X2tConverter_src_ASCConverters.cpp | 20 -- www/onlyoffice-documentserver/pkg-plist | 278 +++++++++++++++++++-- www/onlyoffice-documentserver/v8_fetch.sh | 59 ----- 46 files changed, 435 insertions(+), 1021 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 2ce58a23e602..d8b498b36c48 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,15 +1,16 @@ PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v -DISTVERSION= 6.4.2 -PORTREVISION= 2 +DISTVERSION= 7.0.0.133 CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ LOCAL/mikael/onlyoffice/:source2 \ https://nodejs.org/dist/v16.13.0/:source3 \ SF/optipng/OptiPNG/optipng-0.7.7/:source4 -DISTFILES+= v8-8.7.220.31_all.tar.gz:source1 \ +DISTFILES+= v8-6.8.275.32_all.tar.gz:source1 \ + v8-6.8.275.32_122aarch64.tar.gz:source1 \ + v8-6.8.275.32_122amd64.tar.gz:source1 \ node-v16.13.0.tar.gz:source3 \ - npm-cache-onlyoffice.tar.gz:source2 \ + npm-cache-onlyoffice-${DISTVERSION}.tar.gz:source2 \ optipng-0.7.7.tar.gz:source4 MAINTAINER= mikael@FreeBSD.org @@ -18,6 +19,9 @@ COMMENT= Secure office and productivity apps LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +ONLY_FOR_ARCHS= aarch64 amd64 +ONLY_FOR_ARCHS_REASON= uses aarch64 or amd64 binaries + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ binutils>=0:devel/binutils \ boost-libs>0:devel/boost-libs \ @@ -25,47 +29,47 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ gn:devel/gn \ java:java/openjdk11 \ ninja:devel/ninja \ - node:www/node16 \ npm:www/npm-node16 LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ + libcurl.so:ftp/curl \ libiconv.so:converters/libiconv \ libicutu.so:devel/icu RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \ - curl:ftp/curl \ gsed:textproc/gsed \ nginx:www/nginx \ pg_dump:databases/postgresql${PGSQL_VER_NODOT}-server \ rabbitmq>0:net/rabbitmq \ webfonts>=0:x11-fonts/webfonts -USES= autoreconf:build dos2unix fakeroot gmake gnome iconv pgsql pkgconfig \ +USES= autoreconf:build dos2unix fakeroot gmake gnome iconv nodejs:16,build pgsql pkgconfig \ python:3.7+,build qt:5 USE_QT= qmake_build USE_GITHUB= yes GH_ACCOUNT= ONLYOFFICE GH_PROJECT= DocumentServer -GH_TUPLE= ONLYOFFICE:core:0c29e4d:core/core \ - ONLYOFFICE:core-fonts:3929a09:corefonts/core-fonts \ - ONLYOFFICE:dictionaries:cfa50d3:dictionaries/dictionaries \ - ONLYOFFICE:document-server-integration:v1.0.0:dsi/document-server-integration \ - ONLYOFFICE:document-templates:v6.4.2.1:dt/document-templates \ - ONLYOFFICE:sdkjs:9af7d08:sdkjs/sdkjs \ - ONLYOFFICE:server:10929a0:server/server \ - ONLYOFFICE:web-apps:1851cae:webapps/web-apps \ - ONLYOFFICE:plugin-highlightcode:7ea4ddf:sdkjs_plugins_highlightcode/sdkjs-plugins/plugin-highlightcode \ - ONLYOFFICE:plugin-macros:4027439:sdkjs_plugins_macros/sdkjs-plugins/plugin-macros \ - ONLYOFFICE:plugin-mendeley:5a36bf9:sdkjs_plugins_mendeley/sdkjs-plugins/plugin-mendeley \ - ONLYOFFICE:plugin-ocr:5b24c87:sdkjs_plugins_ocr/sdkjs-plugins/plugin-ocr \ - ONLYOFFICE:plugin-photoeditor:995b5f6:sdkjs_plugins_photoeditor/sdkjs-plugins/plugin-photoeditor \ - ONLYOFFICE:plugin-speech:fcec715:sdkjs_plugins_speech/sdkjs-plugins/plugin-speech \ - ONLYOFFICE:plugin-thesaurus:4ada280:sdkjs_plugins_thesaurus/sdkjs-plugins/plugin-thesaurus \ - ONLYOFFICE:plugin-translator:ba6caed:sdkjs_plugins_translator/sdkjs-plugins/plugin-translator \ - ONLYOFFICE:plugin-youtube:4dec911:sdkjs_plugins_youtube/sdkjs-plugins/plugin-youtube \ - ONLYOFFICE:plugin-zotero:c9f472f:sdkjs_plugins_zotero/sdkjs-plugins/plugin-zotero \ - ONLYOFFICE:build_tools:cf4cac94:buildtools/build_tools \ - ONLYOFFICE:DocumentBuilder:4169685e6:document_builder/DocumentBuilder \ - ONLYOFFICE:onlyoffice.github.io:ca730969:sdkjs_plugins_v1/onlyoffice.github.io \ - ONLYOFFICE:document-server-package:c12273c0a:dsp/document-server-package \ +GH_TAGNAME= v7.0.0 +GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \ + ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \ + ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \ + ONLYOFFICE:document-server-integration:v${DISTVERSION}:dsi/document-server-integration \ + ONLYOFFICE:document-templates:v${DISTVERSION}:dt/document-templates \ + 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: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: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 @@ -98,6 +102,8 @@ CONFLICTS_BUILD=devel/googletest post-extract: @${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8 + @${MKDIR} ${WRKSRC}/core/Common/3dParty/v8/v8/out.gn/freebsd_64 + @${MV} ${WRKDIR}/v8_obj_122${ARCH}/obj ${WRKSRC}/core/Common/3dParty/v8/v8/out.gn/freebsd_64 @${MKDIR} ${WRKDIR}/.pkg-cache/node @${CP} ${DISTDIR}/node-v16.13.0.tar.gz ${WRKDIR}/.pkg-cache/node @@ -113,11 +119,9 @@ post-extract: post-patch: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${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/icu/icu.pri \ ${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \ - ${WRKSRC}/core/Common/3dParty/v8/v8/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/core/Common/base.pri @${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \ ${WRKSRC}/document-server-package/Makefile @@ -157,12 +161,12 @@ do-build: @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 ; ${SETENV} ${MAKE_ENV} npm build optipng-bin + @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}/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 + @cd ${WRKSRC}/server ; ${SETENV} ${MAKE_ENV} npm install pkg@5.5.1 @cd ${WRKSRC}/sdkjs ; ${SETENV} ${MAKE_ENV} npm install grunt-cli @cd ${WRKSRC}/sdkjs ; ${SETENV} ${MAKE_ENV} npm install grunt @cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js || ${TRUE} diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo index 3eb4d249f1f3..59a92f61301d 100644 --- a/www/onlyoffice-documentserver/distinfo +++ b/www/onlyoffice-documentserver/distinfo @@ -1,58 +1,62 @@ -TIMESTAMP = 1641567875 -SHA256 (v8-8.7.220.31_all.tar.gz) = 0d2e1355cbbb80130d87f9e0acfb94c72846f820339b8a1003875230a5d0fa2f -SIZE (v8-8.7.220.31_all.tar.gz) = 305810432 +TIMESTAMP = 1643198986 +SHA256 (v8-6.8.275.32_all.tar.gz) = 9a62989b8965970c0cc67aef911b4937b822fe91a41e9d6977e797ed1326504b +SIZE (v8-6.8.275.32_all.tar.gz) = 65333304 +SHA256 (v8-6.8.275.32_122aarch64.tar.gz) = affe0a27d12ae2efeae9b0684d6a086c6974e4ba10cab493738a1214ddb45679 +SIZE (v8-6.8.275.32_122aarch64.tar.gz) = 10236562 +SHA256 (v8-6.8.275.32_122amd64.tar.gz) = 78d13788f4e3608a7b6765621353aa9f334f54985358936f3e214dfcca23ae57 +SIZE (v8-6.8.275.32_122amd64.tar.gz) = 10328115 SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f SIZE (node-v16.13.0.tar.gz) = 63735070 -SHA256 (npm-cache-onlyoffice.tar.gz) = 85c72a0b06439352f2a0ead2fb1412436c38b0dc3200c620f52967415adbf225 -SIZE (npm-cache-onlyoffice.tar.gz) = 263763627 +SHA256 (npm-cache-onlyoffice-7.0.0.133.tar.gz) = 5fc9a9fbb5df370e3aa91288ef28c350ddf52f28be8ce0e85c7477053006d5e8 +SIZE (npm-cache-onlyoffice-7.0.0.133.tar.gz) = 313289046 SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452 SIZE (optipng-0.7.7.tar.gz) = 2329555 -SHA256 (ONLYOFFICE-DocumentServer-v6.4.2_GH0.tar.gz) = fac8bb07884149c042afabb2ab9ce8ba1c11dd35379eea1e2086d6d5bef45a5d -SIZE (ONLYOFFICE-DocumentServer-v6.4.2_GH0.tar.gz) = 51163 -SHA256 (ONLYOFFICE-core-0c29e4d_GH0.tar.gz) = e522f85ce12c66f46edfb252efcf8f6205d693b95c3391bf485fb7accfd41735 -SIZE (ONLYOFFICE-core-0c29e4d_GH0.tar.gz) = 83856852 -SHA256 (ONLYOFFICE-core-fonts-3929a09_GH0.tar.gz) = f264251db39c2ac844644dfebccc6fa836afb2a27cce1bfc565645a48600b49b -SIZE (ONLYOFFICE-core-fonts-3929a09_GH0.tar.gz) = 95253093 -SHA256 (ONLYOFFICE-dictionaries-cfa50d3_GH0.tar.gz) = b58d9df27bd3b8a5898a28727e247e282ecb1b770d7980205c0ef4eba5e5fa58 -SIZE (ONLYOFFICE-dictionaries-cfa50d3_GH0.tar.gz) = 39363959 -SHA256 (ONLYOFFICE-document-server-integration-v1.0.0_GH0.tar.gz) = f09c9384d3abea4d7e3ef31df333125d4e45cc4fa9ecc69a573ee6562231658a -SIZE (ONLYOFFICE-document-server-integration-v1.0.0_GH0.tar.gz) = 5227788 -SHA256 (ONLYOFFICE-document-templates-v6.4.2.1_GH0.tar.gz) = b3ad21607446074d36a1913f6b1ac896e38911c8a9c7ffd4a7ea68f5cb6cf39f -SIZE (ONLYOFFICE-document-templates-v6.4.2.1_GH0.tar.gz) = 2152308 -SHA256 (ONLYOFFICE-sdkjs-9af7d08_GH0.tar.gz) = 45198d1264b52e36a1e8c66d69130c214a713f4f0ee1a2b9428f95d75480e1e6 -SIZE (ONLYOFFICE-sdkjs-9af7d08_GH0.tar.gz) = 11523531 -SHA256 (ONLYOFFICE-server-10929a0_GH0.tar.gz) = 439822bbf9a3849823c63cff93b3af0d31560134e58b8b4562baec56d69dab14 -SIZE (ONLYOFFICE-server-10929a0_GH0.tar.gz) = 242462 -SHA256 (ONLYOFFICE-web-apps-1851cae_GH0.tar.gz) = 598f57b821013e14936a539ebfc7fe1da1ce673d85c95fdfdd607f8e4fa4b5e6 -SIZE (ONLYOFFICE-web-apps-1851cae_GH0.tar.gz) = 215031184 -SHA256 (ONLYOFFICE-plugin-highlightcode-7ea4ddf_GH0.tar.gz) = 74ec5782ee967bbddf4b524311dcc09be0e28a7e15ef07ce85b30c1fbf0dda90 -SIZE (ONLYOFFICE-plugin-highlightcode-7ea4ddf_GH0.tar.gz) = 245219 -SHA256 (ONLYOFFICE-plugin-macros-4027439_GH0.tar.gz) = faf8a2bee2c8eaa169eec6ceae272d168e0b6307a16845b5fb844f039cebd351 -SIZE (ONLYOFFICE-plugin-macros-4027439_GH0.tar.gz) = 2616745 -SHA256 (ONLYOFFICE-plugin-mendeley-5a36bf9_GH0.tar.gz) = 3da951e764ff201d8853ca70e1bc147a0b4bcf6a3b2134b067de8432c293bee0 -SIZE (ONLYOFFICE-plugin-mendeley-5a36bf9_GH0.tar.gz) = 417551 -SHA256 (ONLYOFFICE-plugin-ocr-5b24c87_GH0.tar.gz) = f39b418974868c863ce313873b876e47cd33a3469d786a9eade584c35881cbae -SIZE (ONLYOFFICE-plugin-ocr-5b24c87_GH0.tar.gz) = 169538 -SHA256 (ONLYOFFICE-plugin-photoeditor-995b5f6_GH0.tar.gz) = 413b4444a9d3f47a57637f141066ea72e4e24bbbed9c0f45794b2d9da651d43c -SIZE (ONLYOFFICE-plugin-photoeditor-995b5f6_GH0.tar.gz) = 201051 -SHA256 (ONLYOFFICE-plugin-speech-fcec715_GH0.tar.gz) = d85e322059d8b62176c0d3f6a0a999268932990e314242c6b4828ec1a28bbbd0 -SIZE (ONLYOFFICE-plugin-speech-fcec715_GH0.tar.gz) = 68212 -SHA256 (ONLYOFFICE-plugin-thesaurus-4ada280_GH0.tar.gz) = 8834dec6b1d3ac3aabe4c1c8697bbce859acee0b38137d1d8310631bf7da1286 -SIZE (ONLYOFFICE-plugin-thesaurus-4ada280_GH0.tar.gz) = 42914 -SHA256 (ONLYOFFICE-plugin-translator-ba6caed_GH0.tar.gz) = d78241b0a23e7b451c92d67a14626066e838dfe1fed098cf1032939c797cabf0 -SIZE (ONLYOFFICE-plugin-translator-ba6caed_GH0.tar.gz) = 140898 -SHA256 (ONLYOFFICE-plugin-youtube-4dec911_GH0.tar.gz) = 953526e6b8d56a21d1428be949cbb1dc1017b3a0d7f07703aaa860fdb5f9afc4 -SIZE (ONLYOFFICE-plugin-youtube-4dec911_GH0.tar.gz) = 11635 -SHA256 (ONLYOFFICE-plugin-zotero-c9f472f_GH0.tar.gz) = 8cabfed9f54e23630b7a0fec71db8e16c703b1c67eb85a439a09b5e311ac0ab9 -SIZE (ONLYOFFICE-plugin-zotero-c9f472f_GH0.tar.gz) = 33816 -SHA256 (ONLYOFFICE-build_tools-cf4cac94_GH0.tar.gz) = ef2617a425b3c4b5c893709725f2c4941cb872ecc8c6fbb966fb12ae80f50f18 -SIZE (ONLYOFFICE-build_tools-cf4cac94_GH0.tar.gz) = 4089822 -SHA256 (ONLYOFFICE-DocumentBuilder-4169685e6_GH0.tar.gz) = 697bd92c6d02973a5e9df78d3be888f7e305983eda3661e3a16ae7fbbee6bb9e -SIZE (ONLYOFFICE-DocumentBuilder-4169685e6_GH0.tar.gz) = 1271109 -SHA256 (ONLYOFFICE-onlyoffice.github.io-ca730969_GH0.tar.gz) = 1612d7ab512bfe80001d40da99cb96761c0bfcd9026c1be5ba8ffa3a050ac085 -SIZE (ONLYOFFICE-onlyoffice.github.io-ca730969_GH0.tar.gz) = 13278 -SHA256 (ONLYOFFICE-document-server-package-c12273c0a_GH0.tar.gz) = c6b226a8616d1a897a64fdf3de4cdf2a70e9418fde911bb558cef84d57633fc5 -SIZE (ONLYOFFICE-document-server-package-c12273c0a_GH0.tar.gz) = 171493 +SHA256 (ONLYOFFICE-DocumentServer-v7.0.0.133-v7.0.0_GH0.tar.gz) = c228d579a1434ecf9df1319efa8bc7ac6f4a814b50bf98d6564d4cd1d50aa3eb +SIZE (ONLYOFFICE-DocumentServer-v7.0.0.133-v7.0.0_GH0.tar.gz) = 51546 +SHA256 (ONLYOFFICE-core-v7.0.0.133_GH0.tar.gz) = 6fa8f092609a79849fcaede100eeb893d89a8b29dd20a269546270e16b04dcd8 +SIZE (ONLYOFFICE-core-v7.0.0.133_GH0.tar.gz) = 83982867 +SHA256 (ONLYOFFICE-core-fonts-v7.0.0.133_GH0.tar.gz) = fcb6813d2e47d97574ff84f4a45f59a31988793e4b9ec6a4fcfcc4eb9b2cdece +SIZE (ONLYOFFICE-core-fonts-v7.0.0.133_GH0.tar.gz) = 95253814 +SHA256 (ONLYOFFICE-dictionaries-v7.0.0.133_GH0.tar.gz) = 0b3255e0ebe7693a2516f13e33d7763b724ed72baac917ff11454bbb6867f048 +SIZE (ONLYOFFICE-dictionaries-v7.0.0.133_GH0.tar.gz) = 40190006 +SHA256 (ONLYOFFICE-document-server-integration-v7.0.0.133_GH0.tar.gz) = 8c1cd189c73649571158c42bf817aacac19d4538df7a657df5eec2b4709a2812 +SIZE (ONLYOFFICE-document-server-integration-v7.0.0.133_GH0.tar.gz) = 5246759 +SHA256 (ONLYOFFICE-document-templates-v7.0.0.133_GH0.tar.gz) = 15ae1c9114d10e660f8dd620e2b22c2c1ba3334eb8de141d2ad8f971f4867ac3 +SIZE (ONLYOFFICE-document-templates-v7.0.0.133_GH0.tar.gz) = 2152333 +SHA256 (ONLYOFFICE-sdkjs-v7.0.0.133_GH0.tar.gz) = f23421f23fd576bfb3b51db9af54d0924f4bea2e5c03ac2ceef96df975c5780c +SIZE (ONLYOFFICE-sdkjs-v7.0.0.133_GH0.tar.gz) = 11798678 +SHA256 (ONLYOFFICE-server-v7.0.0.133_GH0.tar.gz) = 25e2287feb0817960296ffb1287a15cab8ab156964b57f96c9a3a65a0500f3c5 +SIZE (ONLYOFFICE-server-v7.0.0.133_GH0.tar.gz) = 251263 +SHA256 (ONLYOFFICE-web-apps-v7.0.0.133_GH0.tar.gz) = 8115126338c8e3eb86878d103ed24f72be675fee08a5450db75f9132d633460a +SIZE (ONLYOFFICE-web-apps-v7.0.0.133_GH0.tar.gz) = 256708229 +SHA256 (ONLYOFFICE-plugin-highlightcode-v7.0.0.133_GH0.tar.gz) = af47ac3de5e869b414ab2b90bd08a14df80716d588ed461e5155ef26604d9462 +SIZE (ONLYOFFICE-plugin-highlightcode-v7.0.0.133_GH0.tar.gz) = 245229 +SHA256 (ONLYOFFICE-plugin-macros-v7.0.0.133_GH0.tar.gz) = 54af0dc2b5c831427b19aa8926dfb81bbf1c507de439d2b90ee7c994427703d9 +SIZE (ONLYOFFICE-plugin-macros-v7.0.0.133_GH0.tar.gz) = 2646817 +SHA256 (ONLYOFFICE-plugin-mendeley-v7.0.0.133_GH0.tar.gz) = 3a5c215f0d4bcb4c6c47e7026d0bca310b67fdad717be7b63effe6a09974a88b +SIZE (ONLYOFFICE-plugin-mendeley-v7.0.0.133_GH0.tar.gz) = 417558 +SHA256 (ONLYOFFICE-plugin-ocr-v7.0.0.133_GH0.tar.gz) = 0ccd17625ebf999d488fcbf6162276701cb6296f038057b8497697f546b6a4df +SIZE (ONLYOFFICE-plugin-ocr-v7.0.0.133_GH0.tar.gz) = 169527 +SHA256 (ONLYOFFICE-plugin-photoeditor-v7.0.0.133_GH0.tar.gz) = 8c253508cb40cae9b492eadebfba08704ad7d62db1f8b0025d54db559fd210c6 +SIZE (ONLYOFFICE-plugin-photoeditor-v7.0.0.133_GH0.tar.gz) = 201060 +SHA256 (ONLYOFFICE-plugin-speech-v7.0.0.133_GH0.tar.gz) = 33424bb8405d09a07c3c90039a366157fbfc7fc85c6217800ad9ed639c7ed0c6 +SIZE (ONLYOFFICE-plugin-speech-v7.0.0.133_GH0.tar.gz) = 68220 +SHA256 (ONLYOFFICE-plugin-thesaurus-v7.0.0.133_GH0.tar.gz) = 7603e3be3dd229430972fd2c7938ac8f705efc819cf70bc95016fc6ec3075068 +SIZE (ONLYOFFICE-plugin-thesaurus-v7.0.0.133_GH0.tar.gz) = 42917 +SHA256 (ONLYOFFICE-plugin-translator-v7.0.0.133_GH0.tar.gz) = de4fd8f415fcab2ce4e4d1fb938221128ab8e768ef005f5c0b0060e6f29eb097 +SIZE (ONLYOFFICE-plugin-translator-v7.0.0.133_GH0.tar.gz) = 140898 +SHA256 (ONLYOFFICE-plugin-youtube-v7.0.0.133_GH0.tar.gz) = 77eb671a352b181177ccb9ee4eb5ddac85a26eb86f3fb33d77c65788254a64eb +SIZE (ONLYOFFICE-plugin-youtube-v7.0.0.133_GH0.tar.gz) = 11642 +SHA256 (ONLYOFFICE-plugin-zotero-v7.0.0.133_GH0.tar.gz) = e45f1e5481ea29ddcd98ee826bde1a0fd493eee410f97eccec81d62be9fa02b7 +SIZE (ONLYOFFICE-plugin-zotero-v7.0.0.133_GH0.tar.gz) = 33819 +SHA256 (ONLYOFFICE-build_tools-v7.0.0.133_GH0.tar.gz) = 30e411008065e744b6c7cb8dd93737445541615f1a7f7f88ff48f7ccb33482c5 +SIZE (ONLYOFFICE-build_tools-v7.0.0.133_GH0.tar.gz) = 4091744 +SHA256 (ONLYOFFICE-DocumentBuilder-v7.0.0.133_GH0.tar.gz) = ba782719859074b0fbd72b1ce519f2ee2ee239120ee6833084e6d7b047c551d9 +SIZE (ONLYOFFICE-DocumentBuilder-v7.0.0.133_GH0.tar.gz) = 1271108 +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.0.0.133_GH0.tar.gz) = a9dba7bbf3a45da5f822e87fefa5da6e261eaf811231293fb7ae017417b93160 +SIZE (ONLYOFFICE-document-server-package-v7.0.0.133_GH0.tar.gz) = 171524 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 diff --git a/www/onlyoffice-documentserver/files/packagejsons/server/package-lock.json b/www/onlyoffice-documentserver/files/packagejsons/server/package-lock.json index 29936c509a75..60f86cfe2c5d 100644 --- a/www/onlyoffice-documentserver/files/packagejsons/server/package-lock.json +++ b/www/onlyoffice-documentserver/files/packagejsons/server/package-lock.json @@ -154,9 +154,9 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, "async": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz", - "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==" + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, "at-least-node": { "version": "1.0.0", @@ -814,9 +814,9 @@ } }, "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", + "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -1108,15 +1108,15 @@ } }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" } }, @@ -1905,9 +1905,9 @@ } }, "node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "requires": { "whatwg-url": "^5.0.0" } diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py index 35c7557965bb..157a2efc08ed 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py @@ -9,17 +9,16 @@ #env variables product_version = base.get_env('PRODUCT_VERSION') -@@ -41,29 +41,34 @@ def make(): +@@ -41,22 +41,26 @@ def make(): if(base.is_exist(custom_public_key)): base.copy_file(custom_public_key, server_build_dir + '/Common/sources') -- pkg_target = "node10" +- pkg_target = "node14" + pkg_target = "node16" + if ("freebsd" == base.host_platform()): + pkg_target += "-freebsd" + pkgBin = "%%WRKSRC%%/server/node_modules/.bin/pkg" -+ pkg_target = "node16" + if ("linux" == base.host_platform()): pkg_target += "-linux" @@ -37,14 +36,6 @@ 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", ["install"]) - sync_rpc_lib_dir = example_dir + "/node_modules/sync-rpc/lib" - patch_file = base.get_script_dir() + "/../tools/linux/sync-rpc.patch" -- if ("linux" == base.host_platform()): -+ if ("linux" == base.host_platform() or "freebsd" == base.host_platform()): - base.cmd_in_dir(sync_rpc_lib_dir, "patch", ["-N", "-i", patch_file]) - if ("windows" == base.host_platform()): - patch_exe_dir = base.git_dir() + "/usr/bin" - base.cmd_in_dir(patch_exe_dir, "patch.exe", ["-N", "-d", sync_rpc_lib_dir, "-i", patch_file]) - base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"]) + base.cmd_in_dir(example_dir, pkgBin, [".", "-t", pkg_target, "-o", "example"]) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py index 43674d96f959..0320a121dc82 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py @@ -1,8 +1,8 @@ --- build_tools/scripts/core_common/make_common.py.orig 2021-11-16 07:07:24 UTC +++ build_tools/scripts/core_common/make_common.py -@@ -7,22 +7,23 @@ sys.path.append('..') - import config +@@ -8,15 +8,15 @@ import config import base + import glob -import boost -import cef @@ -12,13 +12,19 @@ +#import cef +#import icu +#import openssl + import curl + import websocket import v8 import html2 -import hunspell +#import hunspell import glew - def make(): + def check_android_ndk_macos_arm(dir): +@@ -32,13 +32,15 @@ def make(): + if base.is_dir(toolchain): + check_android_ndk_macos_arm(toolchain + "/prebuilt") + - boost.make() - cef.make() - icu.make() @@ -28,9 +34,11 @@ + cef.make() + icu.make() + openssl.make() ++ v8.make() html2.make() - hunspell.make(False) +# hunspell.make(False) glew.make() - return + if config.check_option("module", "mobile"): + curl.make() diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py index 2d70a449adce..b1da6dcf2837 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py @@ -79,9 +79,9 @@ base_args32 = "target_cpu=\\\"x86\\\" v8_target_cpu=\\\"x86\\\" v8_static_library=true is_component_build=false v8_use_snapshot=false" + +# v8_monolithic=true -+ 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", "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", "--args=\"is_debug=false " + base_args64 + " is_clang=" + is_use_clang() + " use_sysroot=false treat_warnings_as_errors=false\""]) diff --git a/www/onlyoffice-documentserver/files/patch-core_ASCOfficeTxtFile_TxtXmlFormatLib_Source_ConvertDocx2Txt.cpp b/www/onlyoffice-documentserver/files/patch-core_ASCOfficeTxtFile_TxtXmlFormatLib_Source_ConvertDocx2Txt.cpp new file mode 100644 index 000000000000..f784979325ff --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_ASCOfficeTxtFile_TxtXmlFormatLib_Source_ConvertDocx2Txt.cpp @@ -0,0 +1,11 @@ +--- core/ASCOfficeTxtFile/TxtXmlFormatLib/Source/ConvertDocx2Txt.cpp.orig 2022-01-19 14:08:20 UTC ++++ core/ASCOfficeTxtFile/TxtXmlFormatLib/Source/ConvertDocx2Txt.cpp +@@ -159,7 +159,7 @@ namespace Docx2Txt + const std::wstring Converter_Impl::m_letters = _T("abcdefghijklmnopqrstuvwxyz"); + + Converter_Impl::Converter_Impl() +- : Lists(NULL), NoteCount(0), listNumPrev(1) ++ : Lists(0), NoteCount(0), listNumPrev(1) + { + } + diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8.pri index 83e22eb1c6b1..d245ae484bd0 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8.pri +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8.pri @@ -5,10 +5,10 @@ } +core_freebsd { -+ CONFIG += c++14 -+ CONFIG += use_v8_monolith -+ DEFINES += V8_VERSION_87_PLUS -+ DEFINES += V8_COMPRESS_POINTERS ++ #CONFIG += c++14 ++ #CONFIG += use_v8_monolith ++ #DEFINES += V8_VERSION_87_PLUS ++ #DEFINES += V8_COMPRESS_POINTERS + use_v8_monolith { + LIBS += -L$$CORE_V8_PATH_LIBS -lv8_monolith + } else { @@ -17,7 +17,7 @@ + SNAPSHOT_LIB=v8_nosnapshot + } + -+ LIBS += -L$$CORE_V8_PATH_LIBS -lv8_initializers -lv8_init -lv8_base -lv8_libplatform -lv8_libbase -l$$SNAPSHOT_LIB -lv8_libsampler ++ LIBS += -L$$CORE_V8_PATH_LIBS -lv8_init -lv8_initializers -lv8_base -lv8_libplatform -lv8_libbase -l$$SNAPSHOT_LIB -lv8_libsampler -ltorque_generated_initializers + LIBS += -L$$CORE_V8_PATH_LIBS/third_party/icu -licui18n -licuuc + } +} diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_BUILD.gn deleted file mode 100644 index a1a457658a5b..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_BUILD.gn +++ /dev/null @@ -1,32 +0,0 @@ ---- core/Common/3dParty/v8/v8/BUILD.gn.orig 2020-12-15 11:23:25 UTC -+++ core/Common/3dParty/v8/v8/BUILD.gn -@@ -4068,7 +4068,7 @@ v8_component("v8_libbase") { - } - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "src/base/debug/stack_trace_posix.cc", - "src/base/platform/platform-linux.cc", -@@ -4088,6 +4088,12 @@ v8_component("v8_libbase") { - "dl", - "rt", - ] -+ } else if (is_bsd) { -+ sources += [ -+ "src/base/debug/stack_trace_posix.cc", -+ "src/base/platform/platform-freebsd.cc", -+ ] -+ libs = [ "rt", "execinfo" ] - } else if (is_android) { - if (current_toolchain == host_toolchain) { - libs = [ -@@ -4431,6 +4437,7 @@ if (v8_monolithic) { - ":v8_libsampler", - "//build/win:default_exe_manifest", - ] -+ libs = ["execinfo"] - - configs = [ ":internal_config" ] - } diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILD.gn deleted file mode 100644 index 95fc73e1b3cc..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILD.gn +++ /dev/null @@ -1,30 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/BUILD.gn.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/BUILD.gn -@@ -133,7 +133,7 @@ config("debug") { - # builds, and we have to tell it to turn it off. - defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] - } -- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) { -+ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { - # Enable libstdc++ debugging facilities to help catch problems early, see - # http://crbug.com/65151 . - # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -231,9 +231,7 @@ config("default_libs") { - ] - } else if (is_linux || is_chromeos) { - libs = [ -- "dl", - "pthread", -- "rt", - ] - } - } -@@ -316,7 +314,7 @@ config("executable_config") { - "//build/config/ios:ios_dynamic_flags", - "//build/config/ios:ios_executable_flags", - ] -- } else if (is_linux || is_chromeos || is_android || current_os == "aix") { -+ } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") { - configs += [ "//build/config/gcc:executable_config" ] - if (is_chromecast) { - configs += [ "//build/config/chromecast:executable_config" ] diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILDCONFIG.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILDCONFIG.gn deleted file mode 100644 index db2b025254dd..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_BUILDCONFIG.gn +++ /dev/null @@ -1,48 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/BUILDCONFIG.gn.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/BUILDCONFIG.gn -@@ -131,10 +131,10 @@ declare_args() { - is_official_build = false - - # Whether we're a traditional desktop unix. -- is_desktop_linux = current_os == "linux" -+ is_desktop_linux = current_os == "linux" || current_os == "freebsd" - - # Set to true when compiling with the Clang compiler. -- is_clang = current_os != "linux" || -+ is_clang = current_os != "linux" || current_os == "freebsd" || - (current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc" && - current_cpu != "mips" && current_cpu != "mips64") -@@ -186,8 +186,8 @@ if (host_toolchain == "") { - # TODO(dpranke): Add some sort of assert here that verifies that - # no toolchain omitted host_toolchain from its toolchain_args(). - -- if (host_os == "linux") { -- if (target_os != "linux") { -+ if (host_os == "linux" || host_os == "freebsd") { -+ if (target_os != "linux" && target_os != "freebsd") { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" - } else if (is_clang) { - host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -224,7 +224,7 @@ if (target_os == "android") { - assert(host_os == "linux" || host_os == "mac", - "Android builds are only supported on Linux and Mac hosts.") - _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" --} else if (target_os == "chromeos" || target_os == "linux") { -+} else if (target_os == "chromeos" || target_os == "linux" || target_os == "freebsd") { - # See comments in build/toolchain/cros/BUILD.gn about board compiles. - if (is_clang) { - _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,10 +288,11 @@ is_android = current_os == "android" - is_chromeos = current_os == "chromeos" - is_fuchsia = current_os == "fuchsia" - is_ios = current_os == "ios" --is_linux = current_os == "linux" -+is_linux = current_os == "linux" || current_os == "freebsd" - is_mac = current_os == "mac" - is_nacl = current_os == "nacl" - is_win = current_os == "win" || current_os == "winuwp" -+is_bsd = current_os == "freebsd" - - is_apple = is_ios || is_mac - is_posix = !is_win && !is_fuchsia diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn deleted file mode 100644 index 5c7fdbe30910..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn +++ /dev/null @@ -1,92 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/compiler/BUILD.gn.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/compiler/BUILD.gn -@@ -128,7 +128,7 @@ declare_args() { - # - # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may - # call an old clang that doesn't support auto-init. -- init_stack_vars = !is_android && !use_xcode_clang -+ init_stack_vars = !is_android && !use_xcode_clang && !is_bsd - - # This argument is to control whether enabling text section splitting in the - # final binary. When enabled, the separated text sections with prefix -@@ -291,7 +291,7 @@ config("compiler") { - } - - # Linker warnings. -- if (fatal_linker_warnings && !is_apple && current_os != "aix") { -+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { - ldflags += [ "-Wl,--fatal-warnings" ] - } - if (fatal_linker_warnings && is_apple && -@@ -389,7 +389,7 @@ config("compiler") { - - # Compiler instrumentation can introduce dependencies in DSOs to symbols in - # the executable they are loaded into, so they are unresolved at link-time. -- if (!using_sanitizer) { -+ if (!using_sanitizer && !is_bsd) { - ldflags += [ - "-Wl,-z,defs", - "-Wl,--as-needed", -@@ -480,7 +480,7 @@ config("compiler") { - ldflags += [ "-Wl,-z,keep-text-section-prefix" ] - } - -- if (is_clang && !is_nacl && !use_xcode_clang) { -+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] - - cflags += [ -@@ -776,7 +776,7 @@ config("compiler_cpu_abi") { - cflags += [ "-mtune=$arm_tune" ] - } - } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { - cflags += [ "--target=aarch64-linux-gnu" ] - ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1129,7 +1129,7 @@ config("compiler_deterministic") { - "-Xclang", - ".", - ] -- if (!is_win) { -+ if (!is_win && !is_bsd) { - # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) - asmflags = [ "-Wa,-fdebug-compilation-dir,." ] - } -@@ -1512,7 +1512,7 @@ config("default_warnings") { - cflags += [ "-Wno-nonportable-include-path" ] - } - -- if (current_toolchain == host_toolchain || !use_xcode_clang) { -+ if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { - # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not - # recognize. - cflags += [ -@@ -1764,7 +1764,7 @@ config("thin_archive") { - # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't - # have a "thin archive" mode (it does accept -T, but it means truncating - # archive names to 16 characters, which is not what we want). -- if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { -+ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { - arflags = [ "-T" ] - } else if (is_win && use_lld) { - arflags = [ "/llvmlibthin" ] -@@ -2297,7 +2297,7 @@ config("symbols") { - # flag, so we can use use -g1 for pnacl and nacl-clang compiles. - # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. - if (!is_nacl || is_clang) { -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } - - # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2339,7 +2339,7 @@ config("symbols") { - # DWARF info may be corrupt; offsets in a range list entry are in different - # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_apple && !is_nacl && current_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_compiler.gni b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_compiler.gni deleted file mode 100644 index 9b95c7d55a7e..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_compiler.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/compiler/compiler.gni.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/compiler/compiler.gni -@@ -192,7 +192,7 @@ declare_args() { - declare_args() { - # Whether to use the gold linker from binutils instead of lld or bfd. - use_gold = -- !use_lld && !(is_chromecast && is_linux && -+ !is_bsd && !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || - current_cpu == "arm" || current_cpu == "arm64" || diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_features.gni b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_features.gni deleted file mode 100644 index 2092b5b4caa8..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_features.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/features.gni.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/features.gni -@@ -26,7 +26,7 @@ declare_args() { - proprietary_codecs = is_chrome_branded || is_chromecast - - # libudev usage. This currently only affects the content layer. -- use_udev = (is_linux || is_chromeos) && !is_chromecast -+ use_udev = (is_linux || is_chromeos) && !is_chromecast && !is_bsd - - use_dbus = (is_linux || is_chromeos) && !is_chromecast - diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_freetype_freetype.gni b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_freetype_freetype.gni deleted file mode 100644 index 2427dffb5596..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_freetype_freetype.gni +++ /dev/null @@ -1,9 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/freetype/freetype.gni.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/freetype/freetype.gni -@@ -10,5 +10,5 @@ declare_args() { - # than version 2.7.1 and have color bitmap support compiled in. WARNING: - # System FreeType configurations other than as described WILL INTRODUCE TEXT - # RENDERING AND SECURITY REGRESSIONS. -- use_system_freetype = false -+ use_system_freetype = true - } diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_BUILD.gn deleted file mode 100644 index edd1f18118ce..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/linux/BUILD.gn.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/linux/BUILD.gn -@@ -30,7 +30,7 @@ config("runtime_library") { - - if ((!(is_chromeos || chromeos_is_browser_only) || - default_toolchain != "//build/toolchain/cros:target") && -- (!use_custom_libcxx || current_cpu == "mipsel")) { -+ (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { - libs = [ "atomic" ] - } - } diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_pkg-config.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_pkg-config.py deleted file mode 100644 index 290a23da7a15..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_linux_pkg-config.py +++ /dev/null @@ -1,26 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/linux/pkg-config.py.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/linux/pkg-config.py -@@ -59,8 +59,12 @@ def SetConfigPath(options): - print("You must specify an architecture via -a if using a sysroot.") - sys.exit(1) - -- libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' -- libdir += ':' + sysroot + '/usr/share/pkgconfig' -+ if "linux" in sys.platform: -+ libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig' -+ libdir += ':' + sysroot + '/usr/share/pkgconfig' -+ elif "bsd" in sys.platform: -+ libdir = sysroot + '/libdata/pkgconfig' -+ libdir += ':' + '/usr/libdata/pkgconfig' - os.environ['PKG_CONFIG_LIBDIR'] = libdir - return libdir - -@@ -109,7 +113,7 @@ def main(): - # If this is run on non-Linux platforms, just return nothing and indicate - # success. This allows us to "kind of emulate" a Linux build from other - # platforms. -- if "linux" not in sys.platform: -+ if "bsd" not in sys.platform: - print("[[],[],[],[],[]]") - return 0 - diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_sysroot.gni b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_sysroot.gni deleted file mode 100644 index c1705ada3b51..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_sysroot.gni +++ /dev/null @@ -1,14 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/config/sysroot.gni.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/config/sysroot.gni -@@ -21,9 +21,9 @@ declare_args() { - - # Controls default is_linux sysroot. If set to true, and sysroot - # is empty, default sysroot is calculated. -- use_sysroot = current_cpu == "x86" || current_cpu == "x64" || -+ use_sysroot = !is_bsd && (current_cpu == "x86" || current_cpu == "x64" || - current_cpu == "arm" || current_cpu == "arm64" || -- current_cpu == "mipsel" || current_cpu == "mips64el" -+ current_cpu == "mipsel" || current_cpu == "mips64el") - } - - if (sysroot == "") { diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_detect__host__arch.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_detect__host__arch.py deleted file mode 100644 index 55faeb679e44..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_detect__host__arch.py +++ /dev/null @@ -1,11 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/detect_host_arch.py.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/detect_host_arch.py -@@ -21,6 +21,8 @@ def HostArch(): - host_arch = 'ia32' - elif host_arch in ['x86_64', 'amd64']: - host_arch = 'x64' -+ elif host_arch.startswith('arm64'): -+ host_arch = 'arm64' - elif host_arch.startswith('arm'): - host_arch = 'arm' - elif host_arch.startswith('aarch64'): diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_gn__run__binary.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_gn__run__binary.py deleted file mode 100644 index 7d3a1c383b1f..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_gn__run__binary.py +++ /dev/null @@ -1,11 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/gn_run_binary.py.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/gn_run_binary.py -@@ -24,7 +24,7 @@ if not os.path.isabs(path): - # The rest of the arguments are passed directly to the executable. - args = [path] + sys.argv[2:] - --ret = subprocess.call(args) -+ret = subprocess.call(args, env={"CHROME_EXE_PATH":"${WRKSRC}/out/Release/chrome"}) - if ret != 0: - if ret <= -100: - # Windows error codes such as 0xC0000005 and 0xC0000409 are much easier to diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_chrome.map b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_chrome.map deleted file mode 100644 index 88d106f80cb0..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_chrome.map +++ /dev/null @@ -1,29 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/linux/chrome.map.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/linux/chrome.map -@@ -1,4 +1,7 @@ - { -+local: -+ *; -+ - global: - __bss_start; - __data_start; -@@ -20,6 +23,10 @@ global: - # Program entry point. - _start; - -+ # FreeBSD specific variables. -+ __progname; -+ environ; -+ - # Memory allocation symbols. We want chrome and any libraries to - # share the same heap, so it is correct to export these symbols. - calloc; -@@ -81,7 +88,4 @@ global: - localtime64; - localtime64_r; - localtime_r; -- --local: -- *; - }; diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_libpci_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_libpci_BUILD.gn deleted file mode 100644 index f08519f80348..000000000000 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_linux_libpci_BUILD.gn +++ /dev/null @@ -1,53 +0,0 @@ ---- core/Common/3dParty/v8/v8/build/linux/libpci/BUILD.gn.orig 2020-11-16 13:30:51 UTC -+++ core/Common/3dParty/v8/v8/build/linux/libpci/BUILD.gn -@@ -3,20 +3,36 @@ - # found in the LICENSE file. - - import("//tools/generate_library_loader/generate_library_loader.gni") -+import("//build/config/linux/pkg_config.gni") - --# This generates a target named "libpci". --generate_library_loader("libpci") { -- name = "LibPciLoader" -- output_h = "libpci.h" -- output_cc = "libpci_loader.cc" -- header = "" -+declare_args() { -+ use_system_libpci = is_bsd -+} - -- functions = [ -- "pci_alloc", *** 1566 LINES SKIPPED ***