From nobody Fri Feb 2 14:03:35 2024 X-Original-To: dev-commits-ports-main@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 4TRHYh0c1Hz58pMw; Fri, 2 Feb 2024 14:03:36 +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 4TRHYg6mCRz4CxF; Fri, 2 Feb 2024 14:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706882616; 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=pQgp0f98W2D6HWD8Yl5EErpzEjadCucYWInuhQhCC6A=; b=ILXyVKj9UC/h54eSmlPj4S+iBGarPEDDht/9qwYLu5I8OXXNC2wtgVx6U/csm4GZSG1/yh g00BcQi0e6MHNSNtPMGVvlzKU0ZC88ikaxOW6p+RtQxsH/fT5sc6kRgty2JtKVttiJ2Bsp TrTXLDdCsrbj08O0TaogicVRmKw8gn46Lv0g01UcvzPedkgFAOJ3FZikHeHVHYZV4lKnnp /qpp/7AhtRrohR8zL/LqhfYttGwgdCB4xsf0F+35CtWfVdpRRPvBY6UqHG98HyeGWAQZOP cRy9NMxg8/eH0UsV7h30slUf434XnDoX8XWsGdgNOUpdrsep+7WKufqbx0ka0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706882615; 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=pQgp0f98W2D6HWD8Yl5EErpzEjadCucYWInuhQhCC6A=; b=Or2BQ15+YrztDWTyrtiycqWuxBWfc4BPDpT5PjJTD6R/zAmkLXWyKlKqQcqpSj9/nuW1L0 1D2s2+PsmhrtaFnAVCJgUFew5HzNcL+yqsZIEcCyI+B07gNMcRrnlHN7sdieXBHZMrDZR8 1OUwmbD8YdSlJwuOOx2u7NQkzxx6OBRE7e9pa/w2YHj+nZLzrfOsP0pUiVadrngloynwuu t8jiZTbUY91kPDAbuZlvyrtdkaG6zfqTXl5yx8/VS9ETNeu2eynRVuXk5iuuO74Pbb9OTp Qv27IX7cPraD2KAdAu+s1zHTbHDOHpqkagB0APsl74OeoZ+pAPIqCI+z+7QDZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706882615; a=rsa-sha256; cv=none; b=Io9mH3JzJAUfZmMo5ot6d1DjZyxc72aLr+zO8vI/k765w+OX7c9gGF4Mrn0lj+KbIlYgIe yWTnitRhbDLtGbXxHz7dcJGzHGnJf2coYJ1NxySDLOMBASR29n7qBVcLuuZPIPJk2J/wmj 1cYJ31d+EU1/e6AdBzaLCeWcxfIIV64i41rhzNQz3A1xsYNpC78fOMWVI9NkwVEjw4fx6m SFyF+5ZN47rxEtWottgATr7iqa9863I/nwEB4Q6SzU10txNQUKbLwJoZX5o5NA7/YQUim5 Poo5m5/v6vr9N1erQFKGxBg7SV63OweyBRMJx5QwnijUaFb081vvMZLANKXxSw== 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 4TRHYg5pk1zYhK; Fri, 2 Feb 2024 14:03:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412E3ZLv049800; Fri, 2 Feb 2024 14:03:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412E3Zi3049797; Fri, 2 Feb 2024 14:03:35 GMT (envelope-from git) Date: Fri, 2 Feb 2024 14:03:35 GMT Message-Id: <202402021403.412E3Zi3049797@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: 81ddc72fda1f - main - www/onlyoffice-documentserver: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 81ddc72fda1f56d86dd0f4166edeb1ac8e331a6e Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=81ddc72fda1f56d86dd0f4166edeb1ac8e331a6e commit 81ddc72fda1f56d86dd0f4166edeb1ac8e331a6e Author: Mikael Urankar AuthorDate: 2024-02-02 14:02:12 +0000 Commit: Mikael Urankar CommitDate: 2024-02-02 14:03:31 +0000 www/onlyoffice-documentserver: Fix build Fix nodejs version in USES and regen yao-pkg patch --- www/onlyoffice-documentserver/Makefile | 3 +-- .../files/extra-patch-pkg-fetch_lib-es5_build.js | 19 ++++++++++++++----- ...ra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch | 6 +++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 2e9574442e7b..9a7379657084 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,4 +1,3 @@ -# hyphen PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v DISTVERSION= 7.5.1.23 @@ -41,7 +40,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLA rabbitmq>0:net/rabbitmq \ webfonts>=0:x11-fonts/webfonts -USES= autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:16,build pkgconfig \ +USES= autoreconf:build dos2unix fakeroot gmake gnome iconv localbase nodejs:18,build pkgconfig \ python:3.9+,build qt:5 trigger USE_QT= qmake:build USE_GITHUB= yes diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js index aa81e8db03d8..b45253b02607 100644 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_lib-es5_build.js @@ -1,6 +1,6 @@ ---- server/node_modules/pkg-fetch/lib-es5/build.js.orig 2021-12-31 17:50:57.174508000 +0100 -+++ server/node_modules/pkg-fetch/lib-es5/build.js 2021-12-31 17:50:42.893063000 +0100 -@@ -98,18 +98,14 @@ function getConfigureArgs(major, targetPlatform) { +--- server/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js.orig 2024-01-25 21:40:25.773587000 +0100 ++++ server/node_modules/@yao-pkg/pkg-fetch/lib-es5/build.js 2024-01-25 21:41:12.907517000 +0100 +@@ -99,12 +99,6 @@ function getConfigureArgs(major, targetPlatform) { if (targetPlatform === 'linuxstatic') { args.push('--fully-static'); } @@ -10,8 +10,10 @@ - args.push('--enable-lto'); - } - } - // DTrace - args.push('--without-dtrace'); + // production binaries do NOT take NODE_OPTIONS from end-users + args.push('--without-node-options'); + // The dtrace and etw support was removed in https://github.com/nodejs/node/commit/aa3a572e6bee116cde69508dc29478b40f40551a +@@ -115,7 +109,9 @@ function getConfigureArgs(major, targetPlatform) { // bundled npm package manager args.push('--without-npm'); // Small ICU @@ -22,3 +24,10 @@ // Workaround for nodejs/node#39313 // All supported macOS versions have zlib as a system library if (targetPlatform === 'macos') { +@@ -433,4 +429,4 @@ exports.default = build; + }); + } + exports.default = build; +-//# sourceMappingURL=build.js.map +\ No newline at end of file ++//# sourceMappingURL=build.js.map diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch index bb6f26770a3b..3bce0f0eb59d 100644 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch @@ -1,9 +1,9 @@ -https://github.com/vercel/pkg-fetch/blob/main/patches/node.v18.5.0.cpp.patch +https://github.com/yao-pkg/pkg-fetch/blob/main/patches/node.v18.18.2.cpp.patch + local FreeBSD patches ---- server/node_modules/pkg-fetch/patches/node.v18.5.0.cpp.patch.orig 2021-12-30 20:04:18.203959000 +0100 -+++ server/node_modules/pkg-fetch/patches/node.v18.5.0.cpp.patch 2021-12-30 20:09:53.210319000 +0100 +--- server/node_modules/@yao-pkg/pkg-fetch/patches/node.v18.18.2.cpp.patch 2021-12-30 20:04:18.203959000 +0100 ++++ server/node_modules/@yao-pkg/pkg-fetch/patches/node.v18.18.2.cpp.patch @@ -11,6 +11,15 @@ + 'lto': ' -flto=4 -ffat-lto-objects ', # }, { 'lto': ' -flto ', # Clang