From patchwork Tue Jun 21 18:21:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40211 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 8ADDB27BBEA; Tue, 21 Jun 2022 19:23:26 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 BEADB27BBE9 for ; Tue, 21 Jun 2022 19:23:25 +0100 (BST) Received: from localhost ([::1]:48156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3iX6-0008Vc-TO for patchwork@mira.cbaines.net; Tue, 21 Jun 2022 14:23:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3iWk-0008TU-Ul for guix-patches@gnu.org; Tue, 21 Jun 2022 14:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o3iWk-0001qm-M5 for guix-patches@gnu.org; Tue, 21 Jun 2022 14:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o3iWk-0007Dz-Iz for guix-patches@gnu.org; Tue, 21 Jun 2022 14:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56127] [PATCH] gnu: polybar: Update to 3.6.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jun 2022 18:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56127 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56127@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.165583573827677 (code B ref -1); Tue, 21 Jun 2022 18:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jun 2022 18:22:18 +0000 Received: from localhost ([127.0.0.1]:33273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3iVy-0007CH-MD for submit@debbugs.gnu.org; Tue, 21 Jun 2022 14:22:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:53960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o3iVo-0007C0-6o for submit@debbugs.gnu.org; Tue, 21 Jun 2022 14:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3iVm-0007JQ-5J for guix-patches@gnu.org; Tue, 21 Jun 2022 14:22:03 -0400 Received: from mail-0201.mail-europe.com ([51.77.79.158]:56788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3iVi-0001hw-Qp for guix-patches@gnu.org; Tue, 21 Jun 2022 14:22:01 -0400 Date: Tue, 21 Jun 2022 18:21:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1655835712; x=1656094912; bh=SBtDAoo3D2qL+xKjF1DpsNsP2R10f9CscEjY+wPaZqg=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=DCCwjBjNpF5mjZa8f5L0X82e0b2HXbHVhz/qOcPDKRpGckmtsKUeyQA4kJxpd76Pw K854LdJ/aXFs4/eka4dzgNwIKLpJ12TDVNCztfSTB5XpKDOMDY+ZfEEXyTMWzHquB6 Vfki/EKIHtEEahB7TsDP1BiYDuBupBQVgkQQAHHkaOfifPffOjiuAdu58FEwwQXVlN ZUExAom+5vN7J77kSS6yMKNa5SJSZKfrkCEdL0diXY9zuNCooVPDhMGYNcf84vR1BS yCLcwbjTcv+fKEr8R5hTMmD28mF7ENGaC1i+P2gmv8LaBB2PBXOIFfW6dnwzYTzZHG ZNJuuu5ij+DmQ== Message-ID: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=51.77.79.158; envelope-from=john.kehayias@protonmail.com; helo=mail-0201.mail-europe.com 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" 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 X-getmail-retrieved-from-mailbox: Patches Hi Guix, Here is a patch to update polybar. There were some slight tweaks needed: new input, remove unneeded native-input, and change where the default configuration file is installed (from /etc) to #$output/etc/xdg. This last change may look slightly different from the default behavior, but this will put it where it should be found using XDG_CONFIG_DIRS. This was made in the change to polybar that also moved/altered the configuration installation: https://github.com/polybar/polybar/commit/282b0f4e73e9cbb68afd6e168c472e3f422e9a6f#diff-6b4c594394f4751f9012dc3889b278312f0e7275ab48edbe3b02d434e183aa52 I tested that it builds and polybar will find this default configuration file when no config is otherwise found or specified. The default bar looked fine to me. Note that I did test this where I do have XDG_CONFIG_DIRS set for that profile anyway. Thanks! John From 672bbe6f7d622dae75f1202482785540b22a8314 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 21 Jun 2022 14:14:08 -0400 Subject: [PATCH] gnu: polybar: Update to 3.6.3. * gnu/packages/wm.scm (polybar): Update to 3.6.3. [phases]: Add patch-config-path to install the default configuration file where it can be found by polybar. [inputs]: Add libuv, required to build polybar. [native-inputs]: Remove python-2, no longer needed. --- gnu/packages/wm.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d816bad871..adbade7ba6 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1469,19 +1469,27 @@ (define-public nitrogen (define-public polybar (package (name "polybar") - (version "3.5.7") + (version "3.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar.gz")) (sha256 - (base32 "1nr386jdlm8qkbdf23w7lyvbfhr362s90f957fawnyi1finhw8bk")))) + (base32 "19azx5dpfyfh0pv4q2fcrf4p7a0pc5d13m7lnv3qy8376mbmhmzj")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the ;; Internet. - '(#:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Install the default configuration file to where polybar + ;; can find it, through XDG_CONFIG_DIRS. + (add-after 'unpack 'patch-config-path + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") (string-append #$output "/etc/xdg")))))))) (inputs (list alsa-lib cairo @@ -1489,6 +1497,7 @@ (define-public polybar jsoncpp libmpdclient libnl + libuv libxcb pulseaudio xcb-proto @@ -1500,9 +1509,6 @@ (define-public polybar (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ; for the manual - ;; XXX: "python" input must be located after "python-2", or the package - ;; fails to build with "missing required python module: xcbgen". - ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") (synopsis "Fast and easy-to-use status bar") -- 2.36.1