From patchwork Sat Jan 2 23:51:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 26181 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 B8C5D27BC08; Sat, 2 Jan 2021 23:53:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B6A627BC0C for ; Sat, 2 Jan 2021 23:53:38 +0000 (GMT) Received: from localhost ([::1]:44690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvqiH-0002Ph-H1 for patchwork@mira.cbaines.net; Sat, 02 Jan 2021 18:53:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kvqhl-0001pB-6x for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49648) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kvqhk-00036y-Rm for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kvqhk-0006gW-QP for guix-patches@gnu.org; Sat, 02 Jan 2021 18:53:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45616] [PATCH 7/9] gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Jan 2021 23:53:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45616 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45616@debbugs.gnu.org Received: via spool by 45616-submit@debbugs.gnu.org id=B45616.160963155725592 (code B ref 45616); Sat, 02 Jan 2021 23:53:04 +0000 Received: (at 45616) by debbugs.gnu.org; 2 Jan 2021 23:52:37 +0000 Received: from localhost ([127.0.0.1]:32944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqhJ-0006ec-5U for submit@debbugs.gnu.org; Sat, 02 Jan 2021 18:52:37 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:6438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kvqhE-0006dt-6J for 45616@debbugs.gnu.org; Sat, 02 Jan 2021 18:52:33 -0500 Received: from localhost.localdomain (217-149-174-13.nat.highway.telekom.at [217.149.174.13]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4D7dws64HKz3wYf for <45616@debbugs.gnu.org>; Sun, 3 Jan 2021 00:52:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1609631549; bh=aMUaI90gAVllp5dljQ2fF0aoIhAqUrYPTwhleOgNWIU=; h=From:To:Subject:Date:In-Reply-To:References; b=E8gYV58Bq0/qLeY9TSGF6w0JrsBzv5oGXBaHtLkeiM9sDBZ2aEAU2SE0UL5ZYISO6 iYIMiwoVJ0iodIW8bfIdO2j9Gz40yb6EqlZVxDIGJW2JEXASqaP7NyZtkgdab3gVmg FkXl3NVOdpM1+GaTHGJQOM6AhWGJ8kRLFXf2Ba1w= From: Leo Prikler Date: Sun, 3 Jan 2021 00:51:56 +0100 Message-Id: <20210102235157.9726-7-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210102235157.9726-1-leo.prikler@student.tugraz.at> References: <20210102235157.9726-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches They seem to need to be moved together, as the latter inherits the former. * gnu/packages/gnome.scm (faba-icon-theme, moka-icon-theme): Move from here... * gnu/packages/gnome-xyz.scm (faba-icon-theme, moka-icon-theme): to here. --- gnu/packages/gnome-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 56 -------------------------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 9dcaa69af7..4c7ab729bc 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -163,6 +163,62 @@ which haven't been updated for some years. The new app icons are ported from the Obsidian icon theme.") (license license:gpl3))) +(define-public faba-icon-theme + (package + (name "faba-icon-theme") + (version "4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snwh/faba-icon-theme") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'disable-post-install + (lambda _ + (substitute* "meson.build" + (("meson.add_install_script.*") ""))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (synopsis "Faba icon theme") + (description + "Faba is a minimal icon set used as a basis for other themes such as +Moka") + (home-page "https://snwh.org/moka") + (license (list license:lgpl3+ + license:cc-by-sa4.0)))) + +(define-public moka-icon-theme + (package + (inherit faba-icon-theme) + (name "moka-icon-theme") + (version "5.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snwh/moka-icon-theme") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd")))) + (propagated-inputs + ;; Moka is based on Faba by using it as a fallback icon set instead of + ;; bundling it, so we need to add it as a propagated input. + `(("faba-icon-theme" ,faba-icon-theme))) + (synopsis "Moka icon theme") + (description "Moka is a stylized desktop icon set, designed to be clear, +simple and consistent.") + (license (list license:gpl3+ + license:cc-by-sa4.0)))) + (define-public gnome-shell-extension-appindicator (package (name "gnome-shell-extension-appindicator") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9c36ba0519..d278fa6753 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9570,62 +9570,6 @@ functionality and behavior.") (home-page "https://extensions.gnome.org/") (license license:gpl3+))) -(define-public faba-icon-theme - (package - (name "faba-icon-theme") - (version "4.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/snwh/faba-icon-theme") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n")))) - (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-post-install - (lambda _ - (substitute* "meson.build" - (("meson.add_install_script.*") ""))))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - (synopsis "Faba icon theme") - (description - "Faba is a minimal icon set used as a basis for other themes such as -Moka") - (home-page "https://snwh.org/moka") - (license (list license:lgpl3+ - license:cc-by-sa4.0)))) - -(define-public moka-icon-theme - (package - (inherit faba-icon-theme) - (name "moka-icon-theme") - (version "5.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/snwh/moka-icon-theme") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd")))) - (propagated-inputs - ;; Moka is based on Faba by using it as a fallback icon set instead of - ;; bundling it, so we need to add it as a propagated input. - `(("faba-icon-theme" ,faba-icon-theme))) - (synopsis "Moka icon theme") - (description "Moka is a stylized desktop icon set, designed to be clear, -simple and consistent.") - (license (list license:gpl3+ - license:cc-by-sa4.0)))) - (define-public folks (package (name "folks")