From patchwork Sat May 2 14:18:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 21841 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 85BC227BBE4; Sat, 2 May 2020 15:22:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id F002427BBE1 for ; Sat, 2 May 2020 15:22:06 +0100 (BST) Received: from localhost ([::1]:58272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUt1q-0003Ip-IJ for patchwork@mira.cbaines.net; Sat, 02 May 2020 10:22:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUszt-00019T-J3 for guix-patches@gnu.org; Sat, 02 May 2020 10:20:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUszr-0006Kz-1w for guix-patches@gnu.org; Sat, 02 May 2020 10:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUszq-0006Ko-Lz for guix-patches@gnu.org; Sat, 02 May 2020 10:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUszq-0000C7-EJ for guix-patches@gnu.org; Sat, 02 May 2020 10:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40739] [PATCH 4/5] gnu: extempore: Update to 0.8.6. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 May 2020 14:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40739 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Giacomo Leidi Cc: 40739@debbugs.gnu.org Received: via spool by 40739-submit@debbugs.gnu.org id=B40739.1588429156682 (code B ref 40739); Sat, 02 May 2020 14:20:02 +0000 Received: (at 40739) by debbugs.gnu.org; 2 May 2020 14:19:16 +0000 Received: from localhost ([127.0.0.1]:53569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUsyu-0000Ab-Mb for submit@debbugs.gnu.org; Sat, 02 May 2020 10:19:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUsyr-00009x-2d for 40739@debbugs.gnu.org; Sat, 02 May 2020 10:19:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58337) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUsyl-0002if-Ka; Sat, 02 May 2020 10:18:55 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47756 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jUsyk-0005by-Vg; Sat, 02 May 2020 10:18:55 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20200420215617.12194-1-goodoldpaul@autistici.org> <20200420215617.12194-4-goodoldpaul@autistici.org> Date: Sat, 02 May 2020 16:18:53 +0200 In-Reply-To: <20200420215617.12194-4-goodoldpaul@autistici.org> (Giacomo Leidi's message of "Mon, 20 Apr 2020 23:56:16 +0200") Message-ID: <875zde773m.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 Hi, Giacomo Leidi skribis: > * gnu/packages/music.scm (extempore): Update to 0.8.6. > [snippets]: Delete bundled dependencies. > [patches]: Add it. > * gnu/packages/patches/extempore-unbundle-external-dependencies.patch: Patch > CMakeLists.txt to use system libraries. > * gnu/local.mk (dist_patch_DATA): Add it. Applied this (and the previous patches) with the minor change below. Thanks, Ludo’. diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 456a90a642..d6a9afe319 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -636,8 +636,8 @@ MusePack, Monkey's Audio, and WavPack files.") (base32 "182jy23qv115dipny7kglwbn21z55dp253w1ykm0kh8n6vkgs7gp")) (file-name (git-file-name name version)) - (patches (list (search-patch - "extempore-unbundle-external-dependencies.patch"))) + (patches (search-patches + "extempore-unbundle-external-dependencies.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/extempore-unbundle-external-dependencies.patch b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch index 64d6dcaf15..e9484f7994 100644 --- a/gnu/packages/patches/extempore-unbundle-external-dependencies.patch +++ b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch @@ -1,3 +1,5 @@ +Remove build machinery for bundled dependencies. + diff --git a/CMakeLists.txt b/CMakeLists.txt index 89e6125e..c5e90750 100644 --- a/CMakeLists.txt