From patchwork Wed Jun 19 04:43:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 14345 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 656971711D; Wed, 19 Jun 2019 05:45:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E79A11711B for ; Wed, 19 Jun 2019 05:45:08 +0100 (BST) Received: from localhost ([::1]:35076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdST6-0003Dc-4E for patchwork@mira.cbaines.net; Wed, 19 Jun 2019 00:45:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58899) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdST2-0003DJ-Iw for guix-patches@gnu.org; Wed, 19 Jun 2019 00:45:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdST1-0005uv-9j for guix-patches@gnu.org; Wed, 19 Jun 2019 00:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdST1-0005uU-6F for guix-patches@gnu.org; Wed, 19 Jun 2019 00:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hdST0-0004Q5-QH for guix-patches@gnu.org; Wed, 19 Jun 2019 00:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36285] [PATCH] gnu: ungoogled-chromium: Install icons. Resent-From: "Alex Griffin" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2019 04:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36285@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156091945216892 (code B ref -1); Wed, 19 Jun 2019 04:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jun 2019 04:44:12 +0000 Received: from localhost ([127.0.0.1]:45862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdSSC-0004OO-GU for submit@debbugs.gnu.org; Wed, 19 Jun 2019 00:44:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:33639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdSSA-0004OG-9Q for submit@debbugs.gnu.org; Wed, 19 Jun 2019 00:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58802) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdSS8-00039f-Uk for guix-patches@gnu.org; Wed, 19 Jun 2019 00:44:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdSS7-0005bS-Lb for guix-patches@gnu.org; Wed, 19 Jun 2019 00:44:08 -0400 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:46035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdSS7-0005aj-2e for guix-patches@gnu.org; Wed, 19 Jun 2019 00:44:07 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 41AC040C for ; Wed, 19 Jun 2019 00:44:03 -0400 (EDT) Received: from imap6 ([10.202.2.56]) by compute6.internal (MEProxy); Wed, 19 Jun 2019 00:44:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; h= mime-version:message-id:date:from:to:subject:content-type; s= fm3; bh=ytr9Cbb6YuWn53fy6D9Avn1saSeRd/JwGXBIgV1yeG0=; b=ic/Hvtg/ jrPKaQo4LXMiaqP7/LUzBGv/2Zoh+GX6bZfpgOm2XLRhTCax7iZuuLIp1df187Ud 1miZZ5+/yuQxqOIhjf7chs/9+xcAX7ag1eREw5wMwjQt+bJlisnABR5WevGJdreO uUHtIbKXE39IF0TQcVSHO/kTadwS8mousB1CtoT7W19NWUyadZsMU1nHQyIPVxcU YX/yWfsoYbnZs5ya6TPrfihOZAU7cNHHPGg7cl95hFT8mOc7bkdUL513ieGW1D3O cWTZHTHSdKtpIMBc4dSJT6sOhMDM4IKETxvI0jJDvt36D8/bPUfhgU1DM1ih2w9O lbBbLdCnj8W9Kg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=ytr9Cbb6YuWn53fy6D9Avn1saSeRd /JwGXBIgV1yeG0=; b=chJ3X+KlBJtQPjh2VTuy3zKc5mKdCG9ThkPuVj2+P9+na +eoz50zlNFvOIDILHmgwSHaJR0YpSSg6U6dZbXFMXeHBuPleH1mVR9sAeqr+mUWN Ydpvq1lGx91mu6atavpHZmTfYLnumEsmJ6RAWLOCyctD70M5jubYNzLcg/gimY7E PJ4vIROE36uaEzCYkHk7BkVeSNKVXK3ns+/53g1QZFd2+qPkZcRgumC4JUoRQszO 4YvMa67yHED8ik0OuDJksJVQJ16Ch58UNPnFPzanEkhEplPf7mMAjXR80zb9/EgJ QRlY5mgNgNB8rxxXvg+ckXKxQ++vvnidqSqokm82A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtddugdekiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkfffhvffutgesmhdtreerre ertdenucfhrhhomhepfdetlhgvgicuifhrihhffhhinhdfuceorgesrghjghhrfhdrtgho mheqnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrsegrjhhgrhhfrdgtohhmnecuvehluh hsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 909A81400A0; Wed, 19 Jun 2019 00:44:02 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-666-gb2312fa-fmstable-20190614v4 Mime-Version: 1.0 Message-Id: Date: Wed, 19 Jun 2019 04:43:49 +0000 From: "Alex Griffin" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 This patch installs the application icons in the ungoogled-chromium package. From 605782cf5da5faa668692ea31834dcfe324a357e Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Tue, 18 Jun 2019 14:55:30 -0500 Subject: [PATCH] gnu: ungoogled-chromium: Install icons. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Install icons. --- gnu/packages/chromium.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 2127e402d7..3a242220f6 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -650,12 +651,6 @@ from forcing GEXP-PROMISE." (scandir "." (cut regexp-exec install-regexp <>))) (copy-file "chrome" (string-append lib "/chromium")) - ;; TODO: Install icons from "../../chrome/app/themes" into - ;; "out/share/icons/hicolor/$size". - (install-file - "product_logo_48.png" - (string-append out "/share/icons/48x48/chromium.png")) - (copy-recursively "locales" locales) (copy-recursively "resources" resources) @@ -669,8 +664,18 @@ from forcing GEXP-PROMISE." (,(string-append lib ":" nss "/lib/nss:" mesa "/lib:" udev "/lib"))) ;; Avoid file manager crash. See . - `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))) - #t))))))) + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))) + + (with-directory-excursion "chrome/app/theme/chromium" + (for-each + (lambda (size) + (let ((icons (string-append out "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file (string-append "product_logo_" size ".png") + (string-append icons "/chromium.png")))) + '("22" "24" "48" "64" "128" "256"))) + #t)))))) (native-inputs `(("bison" ,bison) ("gcc" ,gcc-8) -- 2.22.0