From patchwork Fri Jan 6 06:07:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 45876 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 F413727BBEB; Fri, 6 Jan 2023 06:08:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 ACBAA27BBE9 for ; Fri, 6 Jan 2023 06:08:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDftc-0002S0-5F; Fri, 06 Jan 2023 01:08:04 -0500 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 1pDfta-0002Rm-RW for guix-patches@gnu.org; Fri, 06 Jan 2023 01:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDfta-0005BZ-J1 for guix-patches@gnu.org; Fri, 06 Jan 2023 01:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDfta-0001Hc-2U for guix-patches@gnu.org; Fri, 06 Jan 2023 01:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60593] [PATCH] gnu: picom: Update to 10.2. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Jan 2023 06:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60593 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60593@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16729852704910 (code B ref -1); Fri, 06 Jan 2023 06:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2023 06:07:50 +0000 Received: from localhost ([127.0.0.1]:53559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDftN-0001H8-R7 for submit@debbugs.gnu.org; Fri, 06 Jan 2023 01:07:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:58814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDftL-0001H0-U5 for submit@debbugs.gnu.org; Fri, 06 Jan 2023 01:07:48 -0500 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 1pDftL-0002R9-L9 for guix-patches@gnu.org; Fri, 06 Jan 2023 01:07:47 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDftJ-0005AX-95 for guix-patches@gnu.org; Fri, 06 Jan 2023 01:07:47 -0500 Date: Fri, 06 Jan 2023 06:07:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1672985261; x=1673244461; bh=LWPgLIKTyZdWeVnW7nbCx0Cv8Jn1WSJfqAUIAN+OzBs=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=T64oYxszf4lTvC16gJRo8YAHNfPXyYGgryyfIj51tDdU1HYTG5rhO/pZxN2iuAE0g rFIlLm4s5ydwMGltoZn1jLJUiaweRud+hB4Hby10/0e8v7sw9BF2HDfjyRUbjaqT0v HCbwohFhPVvN2ZmklTUtDKAQHm8E5B3rj9p4Xz30ws85r8NMzE4BwcYYNiKurMHhpm rT8gywfMaW6gZ5+zrCoEiiiUtw18ugFnw9oL2mb/Kcqo03uHVZQDNtL1/9dVFSR2JU eXdOXE0mPT8xwec+fK1+8FDoYV2jG9V5+EhvXKfSmq1y7I/8mDKv+vOekxua3y64jL 8LaHsjbTYYwGQ== Message-ID: <87358ojiw2.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias 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 Hi Guix, Here's a patch to update picom to the latest release. An autostart file was added, which needs to be patched for the 'Exec' lines (the patch desktop files phase only looks in share/applications). Checked that it builds, lints, runs. John From aaaf4d84ce9c54ce079eb1cf44c7bcf44bc2bc8e Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 6 Jan 2023 01:01:55 -0500 Subject: [PATCH] gnu: picom: Update to 10.2. * gnu/packages/compton.scm (picom): Update to 10.2. [arguments]: Use a plain list and adjust accordingly. [phases]{patch-autostart-files}: New phase. --- gnu/packages/compton.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm index 16feae4f2f..42af93aa31 100644 --- a/gnu/packages/compton.scm +++ b/gnu/packages/compton.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Alexandru-Sergiu Marton ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2023 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ (define-module (gnu packages compton) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -111,7 +113,7 @@ (define-public compton (define-public picom (package (name "picom") - (version "9.1") + (version "10.2") (source (origin (method git-fetch) @@ -120,7 +122,7 @@ (define-public picom (commit (string-append "v" version)))) (sha256 (base32 - "0q7j6kh9k7i201cwhnfc3bmp0hqrx7ngk3v4qsp8k0qfy1n3ma8n")) + "1vd4nhvfykwdhpyhb0jmcj333zxhm6dyikafd76fa4z4fhjrrs0b")) (file-name (string-append "picom-" version)))) (build-system meson-build-system) (inputs @@ -140,8 +142,20 @@ (define-public picom (native-inputs (list asciidoc pkg-config xorgproto)) (arguments - `(#:build-type "release" - #:configure-flags '("-Dwith_docs=true"))) + (list #:build-type "release" + #:configure-flags #~'("-Dwith_docs=true") + #:phases + #~(modify-phases %standard-phases + ;; This file would be patched by 'patch-dot-desktop-files but + ;; only in share/applications and not etc/xdg/autostart, so + ;; manually patch it before it is installed in either location. + ;; The 'patch-dot-desktop-files phase is still needed for other + ;; .desktop files. + (add-after 'unpack 'patch-autostart-files + (lambda _ + (substitute* "picom.desktop" + (("Exec=") + (string-append "Exec=" #$output "/bin/")))))))) (home-page "https://github.com/yshui/picom") (synopsis "Compositor for X11, forked from Compton") (description -- 2.38.1