From patchwork Tue Dec 14 21:47:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35226 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 B030027BBEA; Tue, 14 Dec 2021 21:49:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 829EA27BBE9 for ; Tue, 14 Dec 2021 21:49:31 +0000 (GMT) Received: from localhost ([::1]:45032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFfu-0001oc-Nl for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfS-0001OG-Kt for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48260) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfS-0005ir-C1 for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfS-0000Q6-8F for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 1/7] gnu: pipewire-0.3: Use new input style Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184881486 (code B ref 52492); Tue, 14 Dec 2021 21:49:02 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:08 +0000 Received: from localhost ([127.0.0.1]:59786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeZ-0000Nn-I8 for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:07 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeX-0000NY-EG for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:05 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 8E628184F5F; Tue, 14 Dec 2021 21:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518484; 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: in-reply-to:in-reply-to:references:references; bh=NsltZXGo9WGAgg1rQjeckXOMTa+5x0qI9/lWq9qBk8c=; b=woseT05wcoguoATIrRgO+rbe1XpYu2J8E8srP4aTigOQ/JNDiQSKoQx/si8jXrTHi0f/GT o5T6+plGP2QdhjKQrMDRyqSQ4J4ANrVaLbNS2jFZE0fcILV/vaJIJTSnvnadV70tzhLdAn YCLr2EwqaEi6hO31Ooh9pNSnzWhtbJfxb3DCGADUOdQFA705aDd1a5bOZhF37zqPk3bDL3 e8GV6kAQe3UUWhfTDn9T+e5N3H2mvZlBUBdhf3odMDaM9DmsaXatdsnHeEvaObAQdGknTV pZqOiM3DkZVoWXxszdYHn2TCNEzsOaYUWByDkQMvvmKITAVZAT+cQlulvW5zUA== Date: Tue, 14 Dec 2021 22:47:46 +0100 Message-Id: <20211214214752.25096-1-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (pipewire-0.3): Refactor it. --- gnu/packages/linux.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c752df7996..191ab757e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8134,15 +8134,14 @@ (define-public pipewire-0.3 (modify-phases %standard-phases ;; Skip shrink-runpath, otherwise validate-runpath fails. (delete 'shrink-runpath)))) - (inputs - (append (package-inputs pipewire) - `(("avahi" ,avahi) - ("bluez" ,bluez) - ("jack" ,jack-2) - ("ldacbt" ,ldacbt) - ("pulseaudio" ,pulseaudio) - ("vulkan-loader" ,vulkan-loader) - ("vulkan-headers" ,vulkan-headers)))))) + (inputs (modify-inputs (package-inputs pipewire) + (prepend avahi + bluez + jack-2 + ldacbt + pulseaudio + vulkan-loader + vulkan-headers))))) (define-public ell (package From patchwork Tue Dec 14 21:47:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35224 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 87A0527BBEB; Tue, 14 Dec 2021 21:49:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 4EE3027BBE9 for ; Tue, 14 Dec 2021 21:49:21 +0000 (GMT) Received: from localhost ([::1]:44462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFfk-0001QZ-GL for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfS-0001OH-Uv for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfS-0005jI-MP for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfS-0000QD-LT for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 2/7] gnu: pipewire-0.3: Update to 0.3.41 Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184881494 (code B ref 52492); Tue, 14 Dec 2021 21:49:02 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:08 +0000 Received: from localhost ([127.0.0.1]:59788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeZ-0000Nv-Qo for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:08 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeY-0000Nf-8W for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:06 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 5A76C184F6A; Tue, 14 Dec 2021 21:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518485; 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: in-reply-to:in-reply-to:references:references; bh=3MGhyaFQmU3XJX+dCTGZsHvps0HUFmqHT3aNEPX+UBI=; b=QxuTqbHVzas2l/ZJEjz+moHKHsY/E3Uwi91SHq1DrRRceeaHxAeIdiV3V3s4g+fgyJ2bGP nnqQl8MrJbsGA6qB8gW3iQKrdQR8sz6tSdNTw9aGtpVnK7ea37YKPlwv4v+ODVJztvm6hS 15/1n0J9Lm3R6VX/ZlYAyaRJbDxRB95PLNjOQ6TINPQZUAqmyzsSIArMyy7kaGR0ZlOZba IxuXeh2824R+oDB5vKHf4GNj9EMWHb9aLSan6MAYZvLrJTC6WCtKJ4/+lMpazuXtXE8vEW U8QJJuShT5UdjMPxpAwKlbshy46IcEia72zUKMX0peP20VMvsHixuSTL0QEx4Q== Date: Tue, 14 Dec 2021 22:47:47 +0100 Message-Id: <20211214214752.25096-2-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (pipewire-0.3): Update it. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 191ab757e4..77632c51c9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8114,7 +8114,7 @@ (define-public pipewire-0.3 (package (inherit pipewire) (name "pipewire") - (version "0.3.40") + (version "0.3.41") (source (origin (method git-fetch) (uri (git-reference @@ -8123,7 +8123,7 @@ (define-public pipewire-0.3 (file-name (git-file-name name version)) (sha256 (base32 - "1c6gni23l5w3ghwqnfs712kjj6l1825f0ib8a6r2xc1ymr0sx3kr")))) + "05ksl2nbn00gvdmnmffa8q8r3z29ip75554d36xchsrhqq4sxdcm")))) (arguments '(#:configure-flags (list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out") From patchwork Tue Dec 14 21:47:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35223 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 84FB427BBEA; Tue, 14 Dec 2021 21:49:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 4E6EF27BBE9 for ; Tue, 14 Dec 2021 21:49:20 +0000 (GMT) Received: from localhost ([::1]:44422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFfj-0001Ov-Et for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfT-0001OI-B5 for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfT-0005jX-2e for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfT-0000QL-1l for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 3/7] gnu: Add wireplumber Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184911528 (code B ref 52492); Tue, 14 Dec 2021 21:49:03 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:11 +0000 Received: from localhost ([127.0.0.1]:59798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFed-0000OY-6n for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:11 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeZ-0000Nl-4I for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:07 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 277EB184F5F; Tue, 14 Dec 2021 21:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518486; 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: in-reply-to:in-reply-to:references:references; bh=T+lwAqNg7bFiGRB8bkg3JkNkGiweZ+6ut0G/4iKXGMA=; b=bgcLVy6dPSICHcsg9TAoo0u0gLTP+iXu77O+O+wihQDp2qILNYGjCByXZh0y9xXIHGViky hwTfaNOUyVYgKqlnnkdV1KbEAPUCRVKFSlGvPLKkLj1atiDLQTHDjZGNWPokrXy2f5PZzC enxiYz04jkcZHwoyLhrrTIQAehrhEHwIzdV9Do8jn+pAwen7us/QUNzoDBj+iT+9KSwVMQ groYilHGXs/6evE2LErYIpFW9v2nvWpkw1IaP+Q4tlagX8E+Wd7b5om0e3rgX7rFUXtkPN 5FmgHipzv0yaaZK5ik23X2C1AjSIyPJgNC7iJjLSfcnXpONz4hV6IfnCyRSg9w== Date: Tue, 14 Dec 2021 22:47:48 +0100 Message-Id: <20211214214752.25096-3-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (wireplumber): Add it. --- gnu/packages/linux.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 77632c51c9..ec41a5450b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -88,6 +88,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages build-tools) #:use-module (gnu packages calendar) #:use-module (gnu packages check) #:use-module (gnu packages cpio) @@ -8143,6 +8144,36 @@ (define-public pipewire-0.3 vulkan-loader vulkan-headers))))) +(define-public wireplumber + (package + (name "wireplumber") + (version "0.4.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://gitlab.freedesktop.org/pipewire/wireplumber.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k56i5cardwr03vkldg68714hyksyp1vb0b315yw1bilaj2ka30i")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Dsystemd=disabled" + "-Dsystem-lua=true"))) + (native-inputs + `(("glib-bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs (list dbus elogind glib lua pipewire-0.3)) + (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") + (synopsis "Session / policy manager implementation for PipeWire") + (description "WirePlumber is a modular session / policy manager for +PipeWire and a GObject-based high-level library that wraps PipeWire's API, +providing convenience for writing the daemon's modules as well as external +tools for managing PipeWire.") + (license license:expat))) + (define-public ell (package (name "ell") From patchwork Tue Dec 14 21:47:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35228 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 86BB427BBEA; Tue, 14 Dec 2021 21:49:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5B67227BBE9 for ; Tue, 14 Dec 2021 21:49:37 +0000 (GMT) Received: from localhost ([::1]:45482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFg0-00027V-IR for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0001OJ-2p for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfT-0005jc-F0 for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfT-0000QS-Eu for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 4/7] gnu: xdg-desktop-portal-wlr: Update to 0.5.0 Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184911535 (code B ref 52492); Tue, 14 Dec 2021 21:49:03 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:11 +0000 Received: from localhost ([127.0.0.1]:59800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFed-0000Ob-Hu for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:11 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeZ-0000No-QY for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:08 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 15A3F184F6A; Tue, 14 Dec 2021 21:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518487; 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: in-reply-to:in-reply-to:references:references; bh=49bcdKBM8JPJCehkMtMpA+yGlTHLc3hfDSiyC0vGjyc=; b=ICjgsrS9WafSlf5bnZMYCVFWLQmP4rosBgLGIToCf0qtP395zCtaBIwtA/dHmKt0dKfd2m hz1/VuFfYCqcO6BMClZnykZoQGenE3nwBRBbmzmxcRJQJhDiqcwQPY4O2cI9kw24ZkQ4gT hGnbUHmK8WxrUP8HLH/se3zMOYdGoBt5YxOtvBK/LLybUw9jjyT0ufTzOcnz48/3JvS/k7 2aZRaOlv5gU6YfegKHXnSUS98Me442d4QlURhEM0J4xLdslFfdOH+sO695ePg8SRsvLml1 +9mQ4eMs7/hwO5P+Qt0d7FJRYfvwxJOsJyk4lk/5NbHyskrC/gmZ+5orBFWfzg== Date: Tue, 14 Dec 2021 22:47:49 +0100 Message-Id: <20211214214752.25096-4-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Update it. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a14fba862c..a1608cbb70 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2378,7 +2378,7 @@ (define-public xdg-desktop-portal-gtk (define-public xdg-desktop-portal-wlr (package (name "xdg-desktop-portal-wlr") - (version "0.4.0") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -2387,7 +2387,7 @@ (define-public xdg-desktop-portal-wlr (file-name (git-file-name name version)) (sha256 (base32 - "13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv")))) + "1ipg35gv8ja39ijwbyi96qlyq2y1fjdggl40s38rv68bsya8zry1")))) (build-system meson-build-system) (arguments `(#:configure-flags From patchwork Tue Dec 14 21:47:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35229 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 B219A27BBEA; Tue, 14 Dec 2021 21:49:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 7E93C27BBE9 for ; Tue, 14 Dec 2021 21:49:50 +0000 (GMT) Received: from localhost ([::1]:45720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFgC-0002J4-HT for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0001Og-9V for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfT-0005jn-RW for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfT-0000QZ-Qu for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 5/7] gnu: xdg-desktop-portal-wlr: Use new input style Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184921542 (code B ref 52492); Tue, 14 Dec 2021 21:49:03 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:12 +0000 Received: from localhost ([127.0.0.1]:59802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFed-0000Oi-RH for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:12 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFea-0000OE-KK for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:09 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C693D184F5F; Tue, 14 Dec 2021 21:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518487; 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: in-reply-to:in-reply-to:references:references; bh=d7SA2O6r9rBOAEmLvOShaOhHNMOnlP1KlOYtMEc8ozo=; b=v9V1wAiicwzmjxFGyV+7IkRjK/1C3oixTRxO/VjtaR080phW5Hxq/3TvTDhC5GB6n4PzIp moVeyTa5E9Svgj0BZGORaci2cta4lNPIxN0y7Mt+zBYOByvx/AqUCZQIiCAraA477BrHk6 RzC3cyLK8yWsmWcJO659+H8pRi5v2Al3kO196Qu2UtLnBcy1eT4QN67deizyG1GNf3Zhox 3iV5Bkeo1wRzgSuQKmr/Uxq3AJ4+aXKSQUeTDJgYpMe/P5aIJfI60XNfLbsO/p2ybZNf89 Dfkf3cxh4tSHY/rm90JH2OUmjwcqGMeI9gzUHLjD4uHRPW5vaQfe2XjjISdXeQ== Date: Tue, 14 Dec 2021 22:47:50 +0100 Message-Id: <20211214214752.25096-5-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Refactor it. --- gnu/packages/freedesktop.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a1608cbb70..e1827ffdad 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2395,13 +2395,12 @@ (define-public xdg-desktop-portal-wlr "-Dsd-bus-provider=libelogind"))) (native-inputs (list cmake pkg-config)) - (inputs - `(("elogind" ,elogind) - ("iniparser" ,iniparser) - ("pipewire" ,pipewire-0.3) - ("inih" ,libinih) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols))) + (inputs (list elogind + iniparser + libinih + pipewire-0.3 + wayland + wayland-protocols)) (home-page "https://github.com/emersion/xdg-desktop-portal-wlr") (synopsis "@code{xdg-desktop-portal} backend for wlroots") (description From patchwork Tue Dec 14 21:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35227 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 B6D8E27BBEA; Tue, 14 Dec 2021 21:49:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 35FC927BBE9 for ; Tue, 14 Dec 2021 21:49:32 +0000 (GMT) Received: from localhost ([::1]:45092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFfv-0001rH-Dh for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0001Oq-Gf for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0005jz-7x for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfU-0000Qh-6v for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 6/7] gnu: xdg-desktop-portal-wlr: Add binary dependencies Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184921548 (code B ref 52492); Tue, 14 Dec 2021 21:49:04 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:12 +0000 Received: from localhost ([127.0.0.1]:59804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFee-0000Op-3D for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:12 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFeb-0000OL-PP for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:10 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 993AF184F6A; Tue, 14 Dec 2021 21:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518488; 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: in-reply-to:in-reply-to:references:references; bh=atIsfDklZavhciZY5eJ4rmy1VaWohh2jqaoOD+lljYc=; b=WQgJ0KfEywelEj3qlxQ/7Kq/4OnXh1WDQIYrH6Gf96LC0QA1FlO2/7jqPv66g7aa5DNhhL bQ7VoXrdpHiXzoGGvRbjXr2EeuapXEetlIOqB5uXtmFqLz68yrau8i26pGnuvib+SoHHCq N+O9lrLXsiYWkdieMPqJ9IBmzGpXHLQu65XiJjE8vjOO5kdg6DOZ7GQwSRGlvr8jQK3yAS NSAA7w5U7yiJBBLmI+NZE0rM9LGGV7V5Grb5lxEl1nHE9fluzfsWV5XdpjiNh+xl87ZYen L6dx3BvKD8dbK7HeMmxRTTirhKS6sa0jvY9kNZcSMQWjeZ9MOqndVeB8izcSgA== Date: Tue, 14 Dec 2021 22:47:51 +0100 Message-Id: <20211214214752.25096-6-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch: Add it. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/freedesktop.scm (xdg-desktop-portal-wlr): Add dependencies on bash-minimal, grim and slurp, and hardcode the paths in source. --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 23 +++++++++++++-- ...g-desktop-portal-wlr-harcoded-length.patch | 28 +++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch diff --git a/gnu/local.mk b/gnu/local.mk index a138e574d0..9bbcd42733 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1914,6 +1914,7 @@ dist_patch_DATA = \ %D%/packages/patches/wpa-supplicant-CVE-2021-27803.patch \ %D%/packages/patches/wpa-supplicant-CVE-2021-30004.patch \ %D%/packages/patches/x265-arm-flags.patch \ + %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-bool-to-boolean.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e1827ffdad..1ed09dbf2c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2387,18 +2387,37 @@ (define-public xdg-desktop-portal-wlr (file-name (git-file-name name version)) (sha256 (base32 - "1ipg35gv8ja39ijwbyi96qlyq2y1fjdggl40s38rv68bsya8zry1")))) + "1ipg35gv8ja39ijwbyi96qlyq2y1fjdggl40s38rv68bsya8zry1")) + (patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Dsystemd=disabled" - "-Dsd-bus-provider=libelogind"))) + "-Dsd-bus-provider=libelogind") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'hardcode-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((sh (search-input-file inputs "/bin/sh")) + (grim (search-input-file inputs "/bin/grim")) + (slurp (search-input-file inputs "/bin/slurp"))) + (substitute* "src/screenshot/screenshot.c" + (("grim") grim) + (("slurp") slurp) + (("execl\\(\"/bin/sh\", \"/bin/sh\"") + (string-append "execl(\"" sh "\", \"" sh "\""))) + (substitute* "src/screencast/screencast.c" + (("execvp\\(\"sh") + (string-append "execvp(\"" sh))))))))) (native-inputs (list cmake pkg-config)) (inputs (list elogind + bash-minimal + grim iniparser libinih pipewire-0.3 + slurp wayland wayland-protocols)) (home-page "https://github.com/emersion/xdg-desktop-portal-wlr") diff --git a/gnu/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch b/gnu/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch new file mode 100644 index 0000000000..b499a039e8 --- /dev/null +++ b/gnu/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch @@ -0,0 +1,28 @@ +From 3121eeb5e68bedd6e2398f35b9bd60b69709a47e Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Tue, 14 Dec 2021 18:49:54 +0100 +Subject: [PATCH] Replace hardcoded command length + +--- + src/screenshot/screenshot.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/screenshot/screenshot.c b/src/screenshot/screenshot.c +index 9df0ea7..5f27681 100644 +--- a/src/screenshot/screenshot.c ++++ b/src/screenshot/screenshot.c +@@ -42,8 +42,9 @@ static bool exec_screenshooter_interactive(const char *path) { + perror("fork"); + return false; + } else if (pid == 0) { +- char cmd[strlen(path) + 25]; +- snprintf(cmd, sizeof(cmd), "grim -g \"$(slurp)\" -- %s", path); ++ const char cmd_fmt[] = "grim -g \"$(slurp)\" -- %s"; ++ char cmd[strlen(path) + sizeof(cmd_fmt)]; ++ snprintf(cmd, sizeof(cmd), cmd_fmt, path); + execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); + perror("execl"); + exit(127); +-- +2.34.0 + From patchwork Tue Dec 14 21:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 35225 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 B9E1127BBE9; Tue, 14 Dec 2021 21:49:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 6A41427BBEA for ; Tue, 14 Dec 2021 21:49:21 +0000 (GMT) Received: from localhost ([::1]:44456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxFfk-0001QU-K8 for patchwork@mira.cbaines.net; Tue, 14 Dec 2021 16:49:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0001PP-SY for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxFfU-0005kF-K4 for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxFfU-0000Qo-Ji for guix-patches@gnu.org; Tue, 14 Dec 2021 16:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52492] [PATCH 7/7] gnu: flameshot: Update to 0.10.2 Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Dec 2021 21:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52492 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 52492@debbugs.gnu.org Received: via spool by 52492-submit@debbugs.gnu.org id=B52492.16395184981563 (code B ref 52492); Tue, 14 Dec 2021 21:49:04 +0000 Received: (at 52492) by debbugs.gnu.org; 14 Dec 2021 21:48:18 +0000 Received: from localhost ([127.0.0.1]:59806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFek-0000P9-GZ for submit@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:18 -0500 Received: from jpoiret.xyz ([206.189.101.64]:42764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxFec-0000ON-Gb for 52492@debbugs.gnu.org; Tue, 14 Dec 2021 16:48:10 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B14C8184F5F; Tue, 14 Dec 2021 21:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1639518489; 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: in-reply-to:in-reply-to:references:references; bh=ufsMphc1ecug6X9ZuLlcZwVSktZnkOgqHCZpl6WWbjQ=; b=gSYzhPist2tT1hlJAMgsCP6Nkn63Jvc5/+fHj6X/V88Rn1bC+thk+JfYdSFaggAkoGMnnh WAnnL/tpjlpQK94+7MBdRyr0po+sk4ERBvPuyyIJ4tbLfKJM8cbgtDHdzGvh/C9wy7+RjJ pbW4yVuBP59Xzq2hkYKhsLwnfePssdNvZlL9XfhM+klqe8jI9rb3dGwTEG64d+zdf/SQ3j AErzVA85jJYYqWN2m0E6JvaK0Hzi+LWKXy9S4gpEQUdkhDvENsDBpa0JkXgg/0yp7MiCD8 CIbHe5dAjUgpsAv/r1Ze57K4fU9gUb6lg9xqlxjkVMGU87/6F6fJOQHcKp/dxw== Date: Tue, 14 Dec 2021 22:47:52 +0100 Message-Id: <20211214214752.25096-7-dev@jpoiret.xyz> In-Reply-To: <20211214214502.24913-1-dev@jpoiret.xyz> References: <20211214214502.24913-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (flameshot): Update it. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b6378a3890..8bed2da65c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1823,7 +1823,7 @@ (define-public libiptcdata (define-public flameshot (package (name "flameshot") - (version "0.8.5") + (version "0.10.2") (source (origin (method git-fetch) @@ -1833,7 +1833,7 @@ (define-public flameshot (file-name (git-file-name name version)) (sha256 (base32 - "1z77igs60lz106vsf6wsayxjafxm3llf2lm4dpvsqyyrxybfq191")))) + "07n98pp5i6i51g7a4vqwbd6xarihzl7r714r2knvw2zn5mlj55dd")))) (build-system qt-build-system) (native-inputs (list qttools))