From patchwork Sun Apr 30 18:53:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 49716 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 77E1C27BBEA; Sun, 30 Apr 2023 19:55:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 D473A27BBE2 for ; Sun, 30 Apr 2023 19:55:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ptCCO-00031a-07; Sun, 30 Apr 2023 14:55:04 -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 1ptCCM-00031P-IF for guix-patches@gnu.org; Sun, 30 Apr 2023 14:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ptCCM-0001Qx-69 for guix-patches@gnu.org; Sun, 30 Apr 2023 14:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ptCCL-0002kV-TC for guix-patches@gnu.org; Sun, 30 Apr 2023 14:55:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63193] [PATCH 2/2] gnu: mupdf: Simplify snippet. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Apr 2023 18:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63193 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63193@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 63193-submit@debbugs.gnu.org id=B63193.168288084710449 (code B ref 63193); Sun, 30 Apr 2023 18:55:01 +0000 Received: (at 63193) by debbugs.gnu.org; 30 Apr 2023 18:54:07 +0000 Received: from localhost ([127.0.0.1]:38361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptCBS-0002iT-IB for submit@debbugs.gnu.org; Sun, 30 Apr 2023 14:54:06 -0400 Received: from araneo.si ([90.157.193.204]:46938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptCBP-0002he-02 for 63193@debbugs.gnu.org; Sun, 30 Apr 2023 14:54:03 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id b4323239 for <63193@debbugs.gnu.org>; Sun, 30 Apr 2023 18:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=Ti3LnAhRmmRrLr5z2dqs1 S0l53w=; b=CbpSe1w4eN3773zNkWDbh94t4H1+yJZTdyC001p6EjFBqRLHh4q28 TSYh29HK/bYKOVTCf6J/9OWJlYLGQOFa4O3Bv0PcT0p65litx98Vgzydc4J3rVrt EUnfD8o2oTlZnDT7STzwiKw8ARgfPOlTr6IDF4cTVIm8OxBPoMT2MyYjG+rtlLAI rSTap/WpRWzeMsRhL6ru9Z4Wno1U6iBGT9+h9w0v1RskeP/ogBfwRkLTcW+jI9IS /QP3eTPuxwMYbmp6M4ix8RN02wh3gi3p1Uzdu7RZXHJmDxkCiFIz3HBnwJe9M3fT KmlX2/ElL34kSG5Fp7LoIsMDSW3f1o1mQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 30bc91f3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 30 Apr 2023 18:54:01 +0000 (UTC) From: Timotej Lazar Date: Sun, 30 Apr 2023 20:53:54 +0200 Message-Id: <20230430185354.4704-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230430185354.4704-1-timotej.lazar@araneo.si> References: <20230430185354.4704-1-timotej.lazar@araneo.si> 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/pdf.scm (mupdf)[source]: Simplify code to remove unused thirdparty libs. --- gnu/packages/pdf.scm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6c44952583..1608c49127 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -804,20 +804,17 @@ (define-public mupdf "mupdf-" version "-source.tar.lz")) (sha256 (base32 "0ghwam1c1izks1n2zq2pr8z67nvrx4njk5rla86b75l4pw58mmxy")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) (snippet - #~(begin - ;; Remove bundled software. Keep patched variants. - (let* ((keep (list "extract" "freeglut" "lcms2")) - (from "thirdparty") - (kept (string-append from "~temp"))) - (mkdir-p kept) - (for-each (lambda (file) - (rename-file (string-append from "/" file) - (string-append kept "/" file))) - keep) - (delete-file-recursively from) - (rename-file kept from)))))) + ;; Remove bundled software. Keep patched variants. + #~(with-directory-excursion "thirdparty" + (let ((keep '("README" "extract" "freeglut" "lcms2"))) + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))))))) (build-system gnu-build-system) (inputs (list curl