From patchwork Mon Aug 26 01:27:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 67285 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 7ECD927BBEA; Mon, 26 Aug 2024 02:29:29 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 860DC27BBE2 for ; Mon, 26 Aug 2024 02:29:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siOXi-0008H2-FX; Sun, 25 Aug 2024 21:29:14 -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 1siOXg-0008GQ-DI for guix-patches@gnu.org; Sun, 25 Aug 2024 21:29:12 -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 1siOXg-0000jZ-1Y for guix-patches@gnu.org; Sun, 25 Aug 2024 21:29:12 -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:In-Reply-To:References:Subject; bh=QTnYoDN4WzEPmDPr2Npvg7gXPlY2XhChc6fY+pUMT6U=; b=RmjPuY7YIAQptewcPRDzQBUMlCrzaoLGygJOtjFk2kakodJgTREJxqrfsbTykl/bdr+b82Ia56oetPdE/g7/pTtt6WWKDEs+vPLkbnqMkHnmo80mjOwmERgD5k2WpfdVp6fo5u5nV+DNc7mHcrkbL21xLjdxB6mtNHSn7xOwyhMrYX1wKAqNGDmeengH1wor4y5t+Aad0L2bh5ix5WMk6LPbZZpSSN5AGBPeJWiW+QOdZEh32YKiqtyCh3aUWGS3mCJT1WZOeXXJW0FlqKY8QpBJrqq77Jbiq/e+h3INSUzE4+40Hlnfw6MbfhTBeD1KqQMcQoXZ6Tl/k7zyIyS+fQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1siOYU-0001P8-JW for guix-patches@gnu.org; Sun, 25 Aug 2024 21:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72812] [PATCH 1/2] gnu: guix-simplyblack-sddm-theme: Update to 0.2. References: In-Reply-To: Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 01:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72812@debbugs.gnu.org Cc: Fredrik Salomonsson Received: via spool by 72812-submit@debbugs.gnu.org id=B72812.17246357505286 (code B ref 72812); Mon, 26 Aug 2024 01:30:02 +0000 Received: (at 72812) by debbugs.gnu.org; 26 Aug 2024 01:29:10 +0000 Received: from localhost ([127.0.0.1]:43477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siOXd-0001NB-L4 for submit@debbugs.gnu.org; Sun, 25 Aug 2024 21:29:10 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siOXZ-0001MZ-7Z for 72812@debbugs.gnu.org; Sun, 25 Aug 2024 21:29:08 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 76055240101 for <72812@debbugs.gnu.org>; Mon, 26 Aug 2024 03:28:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1724635687; bh=3rGdNzJseFEJysLk/kYjfhIPdnBimT6s9PuZpLu5ysg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Ft8ksaFeom8MGxb6Blij3aTBTA8M9rszZRX4V+SaYYr8u+5PkG6QULH6aQrYCtJjF 40TMQxhMNAPVuZjOAygaflumr7rzT/Ly0B99VGIerqRItPf0i3Y7gEj+O4c2cdJFgY +NVoO2p6yXmXzHwtr++CGlRSYDlZxPDIYSivFZbqZa0LXmyLn2CiYmn6GmbZuMG8uq 2mCt+jbgdMK5aULS7OTDAyuiayHo+kx9WFNTNg8R11eeuM7KzDxD64GPvVHTQbAhZs 7cMUIkRJia9tl2rmjFNYxDPU/fBffhzXVq2fv/8/DWITo06kSzIG6CKQgdHHo/4Pt4 +l/5OK2h8PNEA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WsY2t3vt5z6tm4; Mon, 26 Aug 2024 03:28:06 +0200 (CEST) From: Fredrik Salomonsson Date: Mon, 26 Aug 2024 01:27:24 +0000 Message-ID: <4ee247e52d08cf517911feac7d1678f0d1e78ad5.1724635645.git.plattfot@posteo.net> MIME-Version: 1.0 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/display-managers.scm (guix-simplyblack-sddm-theme): Update to 0.2. Change-Id: I2332f51da9c9a41bdd9a55af2a5d2f3336e6c586 --- gnu/packages/display-managers.scm | 45 ++++++++++++++++++------------- 1 file changed, 26 insertions(+), 19 deletions(-) base-commit: 9640f4a01ab9d895f8a4d448ccdcbe538aaa4630 diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index eccf2e199e..55c50d59d0 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 L p R n d n -;;; Copyright © 2020 Fredrik Salomonsson +;;; Copyright © 2020, 2024 Fredrik Salomonsson ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021-2023 Efraim Flashner @@ -221,26 +221,33 @@ (define-public dexy-color-sddm-theme (define-public guix-simplyblack-sddm-theme (package (name "guix-simplyblack-sddm-theme") - (version "0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/plattfot/guix-simplyblack-sddm") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fwny6b0xpjs8ad2b16pyxd27gf0sr0nillmhc2h5k0q7dva21vi")))) + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/plattfot/guix-simplyblack-sddm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09vb9b0pmyhj6fh0b6by59bykszbkdayhz678pnb4pyrdmlvv1am")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((out (assoc-ref %outputs "out")) - (sddm-themes (string-append out "/share/sddm/themes"))) - (mkdir-p sddm-themes) - (copy-recursively (assoc-ref %build-inputs "source") - (string-append sddm-themes "/guix-simplyblack-sddm")))))) + `(#:modules ((guix build utils) + (srfi srfi-26)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + (let* ((out (assoc-ref %outputs "out")) + (themes-dir (string-append out + "/share/sddm/themes/guix-simplyblack-sddm/"))) + (mkdir-p themes-dir) + (copy-recursively (assoc-ref %build-inputs "source") + themes-dir) + (substitute* (map (cut string-append themes-dir <>) + '("Main.qml" "theme.conf")) + (("file:") + themes-dir)))))) (home-page "https://github.com/plattfot/guix-simplyblack-sddm") (synopsis "Guix based theme for SDDM") (description From patchwork Mon Aug 26 01:27:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fredrik Salomonsson X-Patchwork-Id: 67286 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 DF6D527BBEA; Mon, 26 Aug 2024 02:29:31 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 72E0527BBE2 for ; Mon, 26 Aug 2024 02:29:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1siOXi-0008H8-VM; Sun, 25 Aug 2024 21:29:14 -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 1siOXh-0008Gc-E6 for guix-patches@gnu.org; Sun, 25 Aug 2024 21:29:13 -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 1siOXg-0000je-TK for guix-patches@gnu.org; Sun, 25 Aug 2024 21:29:12 -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:References:In-Reply-To:Date:From:To:Subject; bh=mVMbFLesFrjpLsfrZncFk12DNqKMyzPFz461552V6Oo=; b=OstfH2jAqYC1wkLqaJWmONoC3ncjJwSBoJT8Zd9seIlSoFDmOW8U40Wl6H5BOZpHzfHm3aRa0qhmhsxIEU7dNiANvsd6QjaLIi32Fr0t+ZyFCEqTWsMM5md1mBRmqnVnTV4UbZXNfZZJLtgjZmp/3JGQmQVW/jtR3wS8MzNgNdSZOPbZSZrG04b7ulXYOf2zLrcPy19FIzUJsaaT0oeV1UGvPInKfb5iwqpRjkOvt4HhBJbDFBfOLrOcDep9be/LvF5uA2HRUITRaC1EZZWZwMXIRoZYX3hFDeSHrjqO5aDUiUOvMZeag1g8QleJrUp2/62gaOW8YIOUvXfsotyNMw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1siOYV-0001PF-2c for guix-patches@gnu.org; Sun, 25 Aug 2024 21:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72812] [PATCH 2/2] gnu: Add guix-simplyblack-sddm-theme-qt5. Resent-From: Fredrik Salomonsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 01:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72812 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72812@debbugs.gnu.org Cc: Fredrik Salomonsson Received: via spool by 72812-submit@debbugs.gnu.org id=B72812.17246357555306 (code B ref 72812); Mon, 26 Aug 2024 01:30:03 +0000 Received: (at 72812) by debbugs.gnu.org; 26 Aug 2024 01:29:15 +0000 Received: from localhost ([127.0.0.1]:43480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siOXi-0001NU-I6 for submit@debbugs.gnu.org; Sun, 25 Aug 2024 21:29:14 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1siOXg-0001N3-Gx for 72812@debbugs.gnu.org; Sun, 25 Aug 2024 21:29:12 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E3E33240027 for <72812@debbugs.gnu.org>; Mon, 26 Aug 2024 03:28:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1724635695; bh=HPMKoinZQ6IIvN2JJtt++ABiV1cdqKz3B/NSblCFikI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=gYFOZONadnVQyJjkcemLEj7/if5NAC32nIYJhuv4PZiklqgUOE6J4k7EcJBdQirTP O6S3i5W2GxLHy1pjytWque+l7FsbwF+FoChXtk48ACiMBZlouCbM/IVBAIiW8qkoHA sk9gvD7YD374qkANWT5lzvAegB6IlCHuZMQUSQZMS2fZjS5lcKqkR0zvO+Su9Se+3+ d6qLfBbXvA9qGwJqb3Kq89yHQO+qNsGT9Ti1CA90akrcONc1NaMUtzyaYNBLaV1VTg 3bGg3ZJwrxBgO9KqUyOPvIjlfvoAbYjm5/QiTrdD4poSPYr4VXVIuymITEtChCLkXo Vnk79+1ubENlQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WsY32624xz6tvl; Mon, 26 Aug 2024 03:28:14 +0200 (CEST) From: Fredrik Salomonsson Date: Mon, 26 Aug 2024 01:27:25 +0000 Message-ID: <8ce7d877f79811619bddf641158a00e86053a6c3.1724635645.git.plattfot@posteo.net> In-Reply-To: <4ee247e52d08cf517911feac7d1678f0d1e78ad5.1724635645.git.plattfot@posteo.net> References: <4ee247e52d08cf517911feac7d1678f0d1e78ad5.1724635645.git.plattfot@posteo.net> MIME-Version: 1.0 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/display-managers.scm (guix-simplyblack-sddm-theme-qt5): New variable. Change-Id: Ia4caa3126a37b8b4f885286d60a27cd72272a75b --- gnu/packages/display-managers.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 55c50d59d0..9fef85d71f 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -256,6 +256,19 @@ (define-public guix-simplyblack-sddm-theme ;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0 (license (list license:cc-by-sa3.0 license:cc-by-sa4.0)))) +(define-public guix-simplyblack-sddm-theme-qt5 + (package + (inherit guix-simplyblack-sddm-theme) + (name "guix-simplyblack-sddm-theme-qt5") + (source + (origin + (inherit (package-source guix-simplyblack-sddm-theme)) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "metadata.desktop" + (("QtVersion=6") + "QtVersion=5")))))))) + (define-public chili-sddm-theme (package (name "chili-sddm-theme")