From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 25 10:37:14 2025 Received: (at submit) by debbugs.gnu.org; 25 Mar 2025 14:37:14 +0000 Received: from localhost ([127.0.0.1]:39537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tx5Oz-0007nL-Ly for submit@debbugs.gnu.org; Tue, 25 Mar 2025 10:37:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47608) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tx5Ow-0007mu-MD for submit@debbugs.gnu.org; Tue, 25 Mar 2025 10:37:11 -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 1tx5Oo-0006nI-Tb for guix-patches@gnu.org; Tue, 25 Mar 2025 10:37:03 -0400 Received: from ditigal.xyz ([2a01:4f8:1c1b:6a1c::] helo=mail.ditigal.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1tx5On-00031k-7F for guix-patches@gnu.org; Tue, 25 Mar 2025 10:37:02 -0400 Received: by cerebrum (OpenSMTPD) with ESMTPSA id 1a32f836 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 25 Mar 2025 14:36:56 +0000 (UTC) From: Rutherther To: guix-patches@gnu.org Subject: [PATCH] guix: gtk-icon-themes: produce only cache in output Date: Tue, 25 Mar 2025 15:36:53 +0100 Message-ID: <10f30ed116239fcdbfe9db9e98b01fd36471c9e7.1742838314.git.rutherther@ditigal.xyz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: =?utf-8?q?Christopher_Baines_=3Cguix=40cbaines=2Enet=3E=2C_Josselin_Poiret_=3Cdev=40jpoiret=2Exyz=3E=2C_Ludovic_Court=C3=83=C2=A8s_=3Cludo=40gnu=2Eorg=3E=2C_Mathieu_Othacehe_=3Cothacehe=40gnu=2Eorg=3E=2C_Simon_Tournier_=3Czimon=2Etoutoune=40gmail=2Ecom=3E=2C_Tobias_Geerinckx-Rice_=3Cme=40tobias=2Egr=3E?= Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ditigal.xyz; i=@ditigal.xyz; q=dns/txt; s=20240917; t=1742913416; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : from; bh=ertbxQu6PDXwATy9yWQJVjeXFbHnA5tqdWzIBt0erqI=; b=KH8DEAk9lbUNJLL2+szVx89ERydNkFPn0rn3Pqm+W86bjS7Zpdoz2WNUQgD10xjrfAx0J AHiCXHg3WWBNXi7cKpNDtASV0Ud1Sl2wp2HyAvN/mTst7HUhPl9WyWF8fZrCycQq5zZIXzU vUUYJNwAFKTOIfRs19IUcRPFYZ+ohyI= Received-SPF: pass client-ip=2a01:4f8:1c1b:6a1c::; envelope-from=rutherther@ditigal.xyz; helo=mail.ditigal.xyz X-Spam_score_int: 16 X-Spam_score: 1.6 X-Spam_bar: + X-Spam_report: (1.6 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.179, PDS_OTHER_BAD_TLD=1.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 4.6 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This patch changes the behavior of gtk-icon-themes to produce only the icon-theme.cache cache files, instead of producing the whole union. The reason for this is that by producing the whole union, the [...] Content analysis details: (4.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ditigal.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=rutherther%40ditigal.xyz; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.2 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit Cc: Rutherther X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.4 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This patch changes the behavior of gtk-icon-themes to produce only the icon-theme.cache cache files, instead of producing the whole union. The reason for this is that by producing the whole union, the [...] Content analysis details: (2.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ditigal.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=rutherther%40ditigal.xyz;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager This patch changes the behavior of gtk-icon-themes to produce only the icon-theme.cache cache files, instead of producing the whole union. The reason for this is that by producing the whole union, the icons are put to the profile twice. This throws off the union build of the profile and symlinks all the individual files instead of symlinking folders. This means unnecessarily high numbers of symlinks are produced. * guix/profiles.scm (gtk-icon-themes): Produce only caches Change-Id: Ia452565768753b8a60baf4fc075f6fe5ebb4fa39 --- guix/profiles.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index fb4dbc5bd0..2dda574e03 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1382,23 +1382,32 @@ (define* (gtk-icon-themes manifest #:optional system) (let* ((destdir (string-append #$output "/share/icons")) (icondirs (filter file-exists? (map (cut string-append <> "/share/icons") - '#$(manifest-inputs manifest))))) + '#$(manifest-inputs manifest)))) + (cache-file-name "icon-theme.cache") + (scratchdir (string-append (getcwd) "/icons"))) + + (mkdir-p destdir) ;; Union all the icons. - (mkdir-p (string-append #$output "/share")) - (union-build destdir icondirs + (union-build scratchdir icondirs #:log-port (%make-void-port "w")) ;; Update the 'icon-theme.cache' file for each icon theme. (for-each (lambda (theme) - (let ((dir (string-append destdir "/" theme))) - ;; Occasionally DESTDIR contains plain files, such as + (let* ((dir (string-append scratchdir "/" theme)) + (cache-file (string-append dir "/" cache-file-name))) + ;; Occasionally SCRATCHDIR contains plain files, such as ;; "abiword_48.png". Ignore these. (when (file-is-directory? dir) (ensure-writable-directory dir) - (system* #+gtk-update-icon-cache "-t" dir "--quiet")))) - (scandir destdir (negate (cut member <> '("." ".."))))))))) + (system* #+gtk-update-icon-cache "-t" dir "--quiet") + (when (file-exists? cache-file) + (mkdir-p (string-append destdir "/" theme)) + (copy-file + cache-file + (string-append destdir "/" theme "/" cache-file-name)))))) + (scandir scratchdir (negate (cut member <> '("." ".."))))))))) ;; Don't run the hook when there's nothing to do. (if %gtk+ base-commit: fbfd2b93831978aadbb96f32cafdab997b04c6c6 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 26 22:35:34 2025 Received: (at 77251-done) by debbugs.gnu.org; 27 Apr 2025 02:35:34 +0000 Received: from localhost ([127.0.0.1]:37103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8rrh-0001lB-Gu for submit@debbugs.gnu.org; Sat, 26 Apr 2025 22:35:33 -0400 Received: from mail.envs.net ([5.199.136.28]:51672) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8rre-0001kx-FB; Sat, 26 Apr 2025 22:35:31 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 15EEC38A40E9; Sun, 27 Apr 2025 02:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1745721328; bh=d4c2m73e7d06kglydq7ck8nWyWXuteYDjHA1HXh+S/8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ffQULb1oOM6rNfh7OOrkymcQxWPUSqYLifWg5rQD2i7cWZDLd4eTFXbr9lH9+OlzS MguC0Iwc8cZiW31JR5zQzrYdxfjRIAWVw3eM9e08/us2UV2/lr6IVUbHEavaeRwofn NGcNw9g1wMkBinl4kR/STMQJvropybXKdySpoXOXsDYR0hW1kavqxMrhSj1t50Y4I7 Z/yRhYQyVeQIJAnO78UsS1XMNKnh4zFTWgKu09h0s7c/uipOJ0G9kuWB/xN4k3+Yb8 ngY8iVAgFSvDkNrbVBl8fPFOWWmDWUAQZoDqn8IP0ImD4lm1JyS5Mu46elNU8nFDQY M52brWjMcymRpKY2JTrkj40M95VTaKAkSjM2p/vs+aD/a/wWqE21Ig5QoFEl2jQCcK DWmrZFfFV5E25iqQz0xIsAz0qYZCNWj+pXL2iQ8jpz8JIx0bTk5q3P9ZMyecML5b7k MwdnAAUPgCwB9trX4kK9wM78LLCZV6QtE+t5EHk0Nq4esf291MhvJnEdfZ7XLJSZU/ c+GEjPPZ8OXDu4RIZqfQ8pPfIpcWSwIWcjPP1w8j86WZg3rLPXx56DzKCZ6ijxqSKB GWpEGJoPpQ4dpcdDaoTeuld6SbrH16u3SeXfKlHl7/LqZpD3ym9kmvNsj5RtU+T2Me doPdcidLUZNyPw7ypLsJwbAU= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id L7DJzWY5S6Qc; Sun, 27 Apr 2025 02:35:23 +0000 (UTC) Received: from localhost (unknown [112.44.100.90]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 27 Apr 2025 02:35:23 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e62fb838; Sun, 27 Apr 2025 02:40:22 +0000 (UTC) From: =?utf-8?B?5a6L5paH5q2m?= To: Rutherther Subject: Re: [bug#77251] [PATCH] guix: gtk-icon-themes: produce only cache in output In-Reply-To: <10f30ed116239fcdbfe9db9e98b01fd36471c9e7.1742838314.git.rutherther@ditigal.xyz> (rutherther@ditigal.xyz's message of "Tue, 25 Mar 2025 15:36:53 +0100") References: <10f30ed116239fcdbfe9db9e98b01fd36471c9e7.1742838314.git.rutherther@ditigal.xyz> Date: Sun, 27 Apr 2025 10:40:22 +0800 Message-ID: <87v7qqjpih.fsf@envs.net> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Rutherther writes: > This patch changes the behavior of gtk-icon-themes to produce only the > icon-theme.cache cache files, instead of producing the whole union. > The reason for this is that by producing the whole unio [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [5.199.136.28 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [5.199.136.28 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ditigal.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-Debbugs-Envelope-To: 77251-done Cc: 77487-done@debbugs.gnu.org, 77251-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Rutherther writes: > This patch changes the behavior of gtk-icon-themes to produce only the > icon-theme.cache cache files, instead of producing the whole union. > The reason for this is that by producing the whole union, the icons are put to > the profile twice. This throws off the union build of the profile and symlinks > all the individual files instead of symlinking folders. This means > unnecessarily high numbers of symlinks are produced. > > * guix/profiles.scm (gtk-icon-themes): Produce only caches Pushed to master as commit 32575294, with simplified commit message. Thank you! From unknown Tue Jun 17 03:39:39 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 25 May 2025 11:24:20 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator