From patchwork Thu Apr 24 23:04:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 41990 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 569A927BC4B; Fri, 25 Apr 2025 00:05:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7413A27BC49 for ; Fri, 25 Apr 2025 00:05:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u85cz-000733-CI; Thu, 24 Apr 2025 19:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u85cu-0006w3-Bg for guix-patches@gnu.org; Thu, 24 Apr 2025 19:05:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u85ct-0005Sa-S4 for guix-patches@gnu.org; Thu, 24 Apr 2025 19:05:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=fxh2+H43mHv44A5k/ZppQO5vUtxhPxtrHeFxp+0LpSU=; b=iLW0RDem2woqvSZept3qpuU4uc5t4qV6A3vG4UPdcpAPszljJGwxzHy4qdM/55KmRPsQ3MGxYHcY3Wn/a3mJ9UiRe12P4bawqqO4pzssp1uZexJlR3ucJThnjYQST1+80Tzm5bv+EFk2isFv3Ftuz/hahyQk6HwcTCwy2H7QAidRxp8y+qdxDnRhGC2AU/jV7YyVtzpnG5/psXYkfiwaWq0IY2Q1m6ScbfQjTdhDQkn4nmvF3+OG9uTh3LxMTiMnRSKHTn1PP1LuT01vy1NaeMGPsytkFY0c2SSBE30vtTXDZTv9ZrGsT3y2pNDw8c+R8FZ0gOABucT/nuhEKN3bjw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u85cs-0007fV-SZ for guix-patches@gnu.org; Thu, 24 Apr 2025 19:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78052] [PATCH] gnu: ungoogled-chromium: Fix WebRTC. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Apr 2025 23:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78052 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78052@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174553589029443 (code B ref -1); Thu, 24 Apr 2025 23:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2025 23:04:50 +0000 Received: from localhost ([127.0.0.1]:42705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u85cf-0007eo-Fa for submit@debbugs.gnu.org; Thu, 24 Apr 2025 19:04:49 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34828) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u85cc-0007eX-7b for submit@debbugs.gnu.org; Thu, 24 Apr 2025 19:04:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u85cW-0006pJ-Qo for guix-patches@gnu.org; Thu, 24 Apr 2025 19:04:40 -0400 Received: from barb.cherry.relay.mailchannels.net ([23.83.223.10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u85cU-0005Rp-Sq for guix-patches@gnu.org; Thu, 24 Apr 2025 19:04:40 -0400 X-Sender-Id: dreamhost|x-authsender|dannym@friendly-machines.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 650321C2B2B; Thu, 24 Apr 2025 23:04:37 +0000 (UTC) Received: from pdx1-sub0-mail-a239.dreamhost.com (100-103-158-130.trex-nlb.outbound.svc.cluster.local [100.103.158.130]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1612B1C2859; Thu, 24 Apr 2025 23:04:37 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1745535877; a=rsa-sha256; cv=none; b=r5Z5i6NMLNXrJ56EXv+zCfaUsZ5skbp/2ROsgr7mT5AqfQe9OB8YuFLRkAche2eVcT+L21 +opZ09VMZoaVKIF0WB5l/tnQ2vXpqeSkz03gsZK7S0bnOXJuQuYQGhuHgHB1Jwy0rGDf/z uwhqHkPNtppNVuTB1ih7QV87VsWQE2DsIylp/10FONaPpUjUfcGgZ0LUrULdK7z8JbGaGk F0Yuv64nFZ1EyNTuJz+cccBrVNzOl6DtX3IwiyOWGHSYwuntp9FlDPw0NWL68zoB6IsjwG XNPGtKSz7XgQzQsn05sLwvyI06BAdSeJuibUwb5rUCOjYtdLdUESi1qv8E5rNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1745535877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=fxh2+H43mHv44A5k/ZppQO5vUtxhPxtrHeFxp+0LpSU=; b=Hp3mHekh+mmgIqPsXgtmihum2OPlm6mhnhlDY2xmD1tu854IpK/32xlAPyIOLoYg37W/E6 85lGJ21tS8HddMY4aMPGnpTIiKRbqG7M+qeOk94l2dSIDb31LMvsW0F1p/nF5iqWbbsSca zIvrsiDa0g15fDqx/MpsoQOuab0pl5UtTBReTMHEln2wDqUTXgsuMpDnyHhaPe63VLWoGL U2en4eOBiNLtYRtIRBDyzt0TXg4MYe5EgIJ7BrUlGQY/GiD3TpBVyaFaBilUmMq5LUWuD7 I394QBUjmLKUkyXKjARpttA5INXM5sUw6UleWb5DJk7iw+APYyKFc4s4q2HNSA== ARC-Authentication-Results: i=1; rspamd-5b8599699-6m4nc; auth=pass smtp.auth=dreamhost smtp.mailfrom=dannym@friendly-machines.com X-Sender-Id: dreamhost|x-authsender|dannym@friendly-machines.com X-MC-Relay: Bad X-MC-Copy: stored-urls X-MailChannels-SenderId: dreamhost|x-authsender|dannym@friendly-machines.com X-MailChannels-Auth-Id: dreamhost X-Invention-Share: 3d92ad22506aa80a_1745535877299_162467897 X-MC-Loop-Signature: 1745535877298:3288421483 X-MC-Ingress-Time: 1745535877298 Received: from pdx1-sub0-mail-a239.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.103.158.130 (trex/7.0.3); Thu, 24 Apr 2025 23:04:37 +0000 Received: from localhost (84-115-226-251.cable.dynamic.surfer.at [84.115.226.251]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dannym@friendly-machines.com) by pdx1-sub0-mail-a239.dreamhost.com (Postfix) with ESMTPSA id 4ZkBPc4SJqz9y; Thu, 24 Apr 2025 16:04:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=friendly-machines.com; s=dreamhost; t=1745535876; bh=fxh2+H43mHv44A5k/ZppQO5vUtxhPxtrHeFxp+0LpSU=; h=From:To:Cc:Subject:Date:Content-Transfer-Encoding; b=WVDfC74m2FtDnuwSIzlogu/sHmADUrY/okPKirgIQhNEbKkkvitK2V3esaQCP6uNX doLoMyUVBscZQUOabf7GpPdwJGw5rJ8RDzVy6ExOF5g3z1CrSKPgZ/yWaWhTxIeK+O bPP+1HL/1IokL38NaGxmgOZJVxPwtAo6Vn/yz0mc9bolc+saqX5T4O7VeczvfkQ8Ng G+JX3Fl+2dmx0xLTqC4ooce0VCriSf4eAkXWQG2zylgRTyaFReyNW4TXbaVXudPvzG 8BcglGngtcbLG22Ui/BpvFuR5PSVbkhIK2+ftHvSuoW3/Wj+5ktSLRNrRyqpNl9Tw9 JLU0zMDT5JOiw== From: Danny Milosavljevic Date: Fri, 25 Apr 2025 01:04:29 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=23.83.223.10; envelope-from=dannym@friendly-machines.com; helo=barb.cherry.relay.mailchannels.net X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/ungoogled-chromium-fcntl-fix.patch: New file. * gnu/packages/chromium.scm (%guix-patches): Add reference to it. * gnu/local.mk (dist_patch_DATA): Add reference to it. Change-Id: I91b7c3243345f6f1eda71aa4ec68faf3ef4a98f4 --- gnu/local.mk | 1 + gnu/packages/chromium.scm | 3 ++ .../ungoogled-chromium-fcntl-fix.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 gnu/packages/patches/ungoogled-chromium-fcntl-fix.patch base-commit: a36ff7d51110403295a359e7f40c3eb42ccfd509 diff --git a/gnu/local.mk b/gnu/local.mk index 62cfe230bb..582296e3c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2344,6 +2344,7 @@ dist_patch_DATA = \ %D%/packages/patches/uftrace-fix-tests.patch \ %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ + %D%/packages/patches/ungoogled-chromium-fcntl-fix.patch \ %D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \ %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ %D%/packages/patches/ungoogled-chromium-system-ffmpeg.patch \ diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 5da5f10da6..45fd719822 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -385,6 +385,9 @@ (define %guix-patches (list (local-file (assume-valid-file-name (search-patch "ungoogled-chromium-extension-search-path.patch"))) + (local-file + (assume-valid-file-name + (search-patch "ungoogled-chromium-fcntl-fix.patch"))) (local-file (assume-valid-file-name (search-patch "ungoogled-chromium-RUNPATH.patch"))) diff --git a/gnu/packages/patches/ungoogled-chromium-fcntl-fix.patch b/gnu/packages/patches/ungoogled-chromium-fcntl-fix.patch new file mode 100644 index 0000000000..e9e8664b6f --- /dev/null +++ b/gnu/packages/patches/ungoogled-chromium-fcntl-fix.patch @@ -0,0 +1,28 @@ +From 7b0d7f48fbffb412f0c485f86ef33b0dea605d1d Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Fri, 12 May 2023 20:59:06 +0200 +Subject: [PATCH] PipeWire capturer: fix fcntl call when duplicating a file descriptor + +The fcntl() call has variable arguments, therefore we need to pass 0 to +specify there are no other arguments for this call, otherwise we might +end up with an argument that is random garbage. + +Bug: webrtc:15174 +Change-Id: I34f16a942d80913b667d8ade7eed557b0233be01 +Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/305120 +Reviewed-by: Alexander Cooper +Commit-Queue: Jan Grulich +Cr-Commit-Position: refs/heads/main@{#40060} +--- + +--- ./third_party/webrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc.orig 2024-11-18 21:48:23.280303055 +0100 ++++ ./third_party/webrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc 2024-11-18 21:48:24.860287444 +0100 +@@ -447,7 +447,7 @@ + + if (fd >= 0) { + pw_core_ = pw_context_connect_fd( +- pw_context_, fcntl(fd, F_DUPFD_CLOEXEC), nullptr, 0); ++ pw_context_, fcntl(fd, F_DUPFD_CLOEXEC, 0), nullptr, 0); + } else { + pw_core_ = pw_context_connect(pw_context_, nullptr, 0); + }