From nobody Wed Dec 1 06:54:56 2021 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 9D68918B5E71; Wed, 1 Dec 2021 06:54:56 +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 4J3qb42QCvz4vBN; Wed, 1 Dec 2021 06:54:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2912825409; Wed, 1 Dec 2021 06:54:56 +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 1B16sukb099926; Wed, 1 Dec 2021 06:54:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B16susO099924; Wed, 1 Dec 2021 06:54:56 GMT (envelope-from git) Date: Wed, 1 Dec 2021 06:54:56 GMT Message-Id: <202112010654.1B16susO099924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 88ea3be30866 - main - devel/electron13: fix ENOTTY error on uv_pipe_open 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88ea3be30866a0abf0d1fa2ec6c12f0b8dfecc57 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638341696; 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=GvZzMUHTigpMlWdqvV/SpOPfJ66VfauzgVGaJ3FS3nc=; b=OYggxwE2CKytGIxzLUatfyJXl4UDiYBF5ooLMpg4BZpdQ8/m0nmvqguWOuEhq3XytChzV5 w23pL6iWYrNXGGxH9wuVSqvmH/swSMerv1mB/uaH5BJqGcUMzrtb8iS+hpHiixLaojKnXf vCitSCGGDpVqgHLFC6ct8tF3L8HxgmQfgiqfgx8In0UymXC6yzKdXm2MUFRWA5bbeGu9+p 4fFEIp4h0LlgraeYCIJkjsU9SX4cJnpRYf1zh2l5RY4ropN0urmShUXkeQ38Jl4Z9SZRzv m7oMEL9vrBBUef9rcznOQsAsmG9kR//O4lVwS+HcvbtJnXFY5/TAe2N6cCR4XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638341696; a=rsa-sha256; cv=none; b=p7+OlBfX70YVH4ZWW+wbw45GuW6PNKu4E4Foj7YH1SBigor9laZ0Auraj260ulD/bemeRN qJY/pbBLRNLpqsQmLSkX3p1VN9atpQzFjf7+FlubyJ8ebNrx9naDMLgDyx6nVeM7vZzJZy pXXhVEF/HWJ2AdpdlKjUnAOwdNu2ogu7t2NMqaNZMn0VpHni1frm9osgQc6o7rsdcz8/iv dJpQtRS5T9WPyr2RSLwRKsrRRCwpGfKKBQhZaMJL1o6jMapg8OSiJLsW/j1ODTiXA4g4dr BewPQfCxcji42PhFAHTgdgJnyvUbaMgFtUIlUDZbSUI09SfOIqKOGeOqh6E+hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=88ea3be30866a0abf0d1fa2ec6c12f0b8dfecc57 commit 88ea3be30866a0abf0d1fa2ec6c12f0b8dfecc57 Author: Mikael Urankar AuthorDate: 2021-12-01 06:52:28 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-01 06:54:31 +0000 devel/electron13: fix ENOTTY error on uv_pipe_open This patch was introduced for electron11 and slipped out when creating ports for electron 12 and 13. --- devel/electron13/Makefile | 2 +- ...third__party_electron__node_deps_uv_src_unix_pipe.c | 18 ++++++++++++++++++ editors/vscode/Makefile | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/devel/electron13/Makefile b/devel/electron13/Makefile index e9f6a03054ce..60c3bd0000ca 100644 --- a/devel/electron13/Makefile +++ b/devel/electron13/Makefile @@ -1,7 +1,7 @@ PORTNAME= electron DISTVERSIONPREFIX= v DISTVERSION= ${ELECTRON_VER:S/-beta./.b/} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \ https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts diff --git a/devel/electron13/files/patch-third__party_electron__node_deps_uv_src_unix_pipe.c b/devel/electron13/files/patch-third__party_electron__node_deps_uv_src_unix_pipe.c new file mode 100644 index 000000000000..d01c2065440c --- /dev/null +++ b/devel/electron13/files/patch-third__party_electron__node_deps_uv_src_unix_pipe.c @@ -0,0 +1,18 @@ +--- third_party/electron_node/deps/uv/src/unix/pipe.c.orig 2020-07-22 14:57:01 UTC ++++ third_party/electron_node/deps/uv/src/unix/pipe.c +@@ -150,9 +150,13 @@ int uv_pipe_open(uv_pipe_t* handle, uv_file fd) { + if (mode == -1) + return UV__ERR(errno); /* according to docs, must be EBADF */ + ++ /* If ioctl(FIONBIO) reports ENOTTY, try fcntl(F_GETFL) + fcntl(F_SETFL). ++ * Workaround for e.g. kqueue fds not supporting ioctls. ++ */ + err = uv__nonblock(fd, 1); +- if (err) +- return err; ++ if (err == UV_ENOTTY) ++ if (uv__nonblock == uv__nonblock_ioctl) ++ err = uv__nonblock_fcntl(fd, 1); + + #if defined(__APPLE__) + err = uv__stream_try_select((uv_stream_t*) handle, &fd); diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index 1a73f478d679..ccdd0a127eda 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,6 +1,6 @@ PORTNAME= vscode DISTVERSION= 1.62.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \ https://nodejs.org/dist/v${NODE_VER}/:node_headers \