From unknown Sun Jun 15 16:47:56 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#40739 <40739@debbugs.gnu.org> To: bug#40739 <40739@debbugs.gnu.org> Subject: Status: [PATCH] gnu: extempore: Update to 0.8.6 and unbundle dependencies Reply-To: bug#40739 <40739@debbugs.gnu.org> Date: Sun, 15 Jun 2025 23:47:56 +0000 retitle 40739 [PATCH] gnu: extempore: Update to 0.8.6 and unbundle dependen= cies reassign 40739 guix-patches submitter 40739 goodoldpaul@autistici.org severity 40739 normal tag 40739 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:54:53 2020 Received: (at submit) by debbugs.gnu.org; 20 Apr 2020 21:54:54 +0000 Received: from localhost ([127.0.0.1]:48578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeNR-0007lY-N0 for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:54:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:51800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeNQ-0007lP-CX for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:54:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46448) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQeNP-0002yY-Uc for guix-patches@gnu.org; Mon, 20 Apr 2020 17:54:52 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQeNO-0006gI-OD for guix-patches@gnu.org; Mon, 20 Apr 2020 17:54:51 -0400 Received: from devianza.investici.org ([198.167.222.108]:26793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jQeNN-0006dv-WA for guix-patches@gnu.org; Mon, 20 Apr 2020 17:54:50 -0400 Received: from 1.mail-backend.investici.org (unknown [10.0.0.11]) by devianza.investici.org (Postfix) with ESMTP id B6F21E04BD for ; Mon, 20 Apr 2020 21:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419677; bh=1WuywWecJHKGRMzvStA/B5IAGZ00OQSNrvH4ykkKC6c=; h=Date:From:To:Subject:From; b=NrqnzA70w2mSi1Conp/Bos+dft5GqGMKeVTsNq+N/0mYrOff/kW932ABW6/Zt2ZP4 f4/9liLiAIlWrxA6513wfnQlWkT3A0ttkbPft8Y9sli9CaEE+d+aTRA4Vey9LG3GKg hXWHLjpFSlEGRWi69GMsKd82ECIKMo2QWRKsGevg= Received: from 1.webmail.investici.org (localhost [127.0.0.1]) (Authenticated sender: goodoldpaul@autistici.org) by 1.mail-backend.investici.org (Postfix) with ESMTPA id 5F905C1FA7 for ; Mon, 20 Apr 2020 21:54:37 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 20 Apr 2020 21:54:37 +0000 From: goodoldpaul@autistici.org To: guix-patches@gnu.org Subject: [PATCH] gnu: extempore: Update to 0.8.6 and unbundle dependencies User-Agent: Roundcube Webmail Message-ID: X-Sender: goodoldpaul@autistici.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=198.167.222.108; envelope-from=goodoldpaul@autistici.org; helo=devianza.investici.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/20 17:54:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 198.167.222.108 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit 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: -0.8 (/) Hi Guix, I'm sending a patch series to update Extempore to 0.8.6, update its dependencies and remove in-tree libraries (portaudio and pcre). I tested both extempore and emacs-extempore-mode for some days now and I believe they are usable. Thanks for reviewing this, Giacomo From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:56:45 2020 Received: (at 40739) by debbugs.gnu.org; 20 Apr 2020 21:56:45 +0000 Received: from localhost ([127.0.0.1]:48587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQePB-0007pZ-1V for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:45 -0400 Received: from latitanza.investici.org ([82.94.249.234]:39963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeP5-0007p6-Ul for 40739@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:39 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4B870121643; Mon, 20 Apr 2020 21:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419794; bh=4s8KzuGsAVIpVyvtGQRqjEAlaXAlul6I0XkI867MR5w=; h=From:To:Cc:Subject:Date:From; b=suGdspsVGNeDU2BjO9LL8TTx/Tydwi0pKgVA6Bg8oYxAcZaibYaYBj0Ho59TGnYD8 R4GI1J5TMLp9dTm6c0iAFVHzX+6gxXuBMtAxZFjuwFc9K/BpG2NT0my8MOp9fjaZuU h596WjD9JSSmxBLogR8P9FpzMEC4bAh4Bvg9dHAg= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 1B3CE1201B5; Mon, 20 Apr 2020 21:56:33 +0000 (UTC) From: Giacomo Leidi To: 40739@debbugs.gnu.org Subject: [PATCH 1/5] gnu: llvm-for-extempore: Update to 3.8. Date: Mon, 20 Apr 2020 23:56:13 +0200 Message-Id: <20200420215617.12194-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40739 Cc: Giacomo Leidi 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 (-) * gnu/packages/llvm.scm (llvm-for-extempore): Update to 3.8. [source]: Use upstream patched source. * gnu/packages/patches/llvm-for-extempore.patch: Delete due to source being already patched. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/llvm.scm | 11 +- gnu/packages/patches/llvm-for-extempore.patch | 118 ------------------ 3 files changed, 8 insertions(+), 122 deletions(-) delete mode 100644 gnu/packages/patches/llvm-for-extempore.patch diff --git a/gnu/local.mk b/gnu/local.mk index fb0454fd45..196ccc8800 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1176,7 +1176,6 @@ dist_patch_DATA = \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ - %D%/packages/patches/llvm-for-extempore.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lrcalc-includes.patch \ %D%/packages/patches/lrzip-CVE-2017-8842.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 7236567a5e..3af39ea256 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Arm Ltd ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -601,12 +602,16 @@ output), and Binutils.") #:patches '("clang-3.5-libc-search-path.patch"))) (define-public llvm-for-extempore - (package (inherit llvm-3.7) + (package (inherit llvm-3.8) (name "llvm-for-extempore") (source (origin - (inherit (package-source llvm-3.7)) - (patches (list (search-patch "llvm-for-extempore.patch"))))) + (method url-fetch) + (uri (string-append "http://extempore.moso.com.au/extras/" + "llvm-3.8.0.src-patched-for-extempore.tar.xz")) + (sha256 + (base32 + "1svdl6fxn8l01ni8mpm0bd5h856ahv3h9sdzgmymr6fayckjvqzs")))) ;; Extempore refuses to build on architectures other than x86_64 (supported-systems '("x86_64-linux")))) diff --git a/gnu/packages/patches/llvm-for-extempore.patch b/gnu/packages/patches/llvm-for-extempore.patch deleted file mode 100644 index 614682c6cb..0000000000 --- a/gnu/packages/patches/llvm-for-extempore.patch +++ /dev/null @@ -1,118 +0,0 @@ -This patch to LLVM is required by the developers of the Extempore language. -The following explanation was posted to the extemporelang@googlegroups.com -mailing list: - -"There is an assumption in the parser that all definitions occur within the -same compilation unit - i.e. the parser has local state about what has been -parsed in this unit of work. Extempore obviously does lots of little units -rather than one big unit and this causes problems for named types that were -defined in another unit - which they always are. The patch simply checks the -current module to see if the type has been previously defined, and intervenes -appropriately if it has." - -Message-ID: - ---- llvm-3.7.1.src/include/llvm/MC/MCSectionCOFF.h 2015-04-11 12:11:45.000000000 +1000 -+++ llvm-3.7.1.src/include/llvm/MC/MCSectionCOFF.h 2015-09-14 09:22:56.000000000 +1000 -@@ -16,7 +16,6 @@ - - #include "llvm/ADT/StringRef.h" - #include "llvm/MC/MCSection.h" --#include "llvm/Support/COFF.h" - - namespace llvm { - class MCSymbol; - ---- llvm-3.7.1.src/lib/AsmParser/LLParser.cpp 2015-07-11 20:30:36.000000000 +1000 -+++ llvm-3.7.1.src/lib/AsmParser/LLParser.cpp 2015-09-14 09:20:57.000000000 +1000 -@@ -1754,8 +1754,14 @@ - // If the type hasn't been defined yet, create a forward definition and - // remember where that forward def'n was seen (in case it never is defined). - if (!Entry.first) { -- Entry.first = StructType::create(Context, Lex.getStrVal()); -- Entry.second = Lex.getLoc(); -+ // this here for extempore -+ if (M->getTypeByName(Lex.getStrVal())) { -+ Entry.first = M->getTypeByName(Lex.getStrVal()); -+ Entry.second = SMLoc(); -+ } else { -+ Entry.first = StructType::create(Context, Lex.getStrVal()); -+ Entry.second = Lex.getLoc(); -+ } - } - Result = Entry.first; - Lex.Lex(); - ---- llvm-3.7.1.src/lib/CodeGen/TargetLoweringObjectFileImpl.cpp 2015-07-01 05:10:31.000000000 +1000 -+++ llvm-3.7.1.src/lib/CodeGen/TargetLoweringObjectFileImpl.cpp 2015-09-14 09:23:40.000000000 +1000 -@@ -32,6 +32,7 @@ - #include "llvm/MC/MCStreamer.h" - #include "llvm/MC/MCSymbolELF.h" - #include "llvm/MC/MCValue.h" -+#include "llvm/Support/COFF.h" - #include "llvm/Support/Dwarf.h" - #include "llvm/Support/ELF.h" - #include "llvm/Support/ErrorHandling.h" - ---- llvm-3.7.1.src/lib/ExecutionEngine/MCJIT/MCJIT.cpp 2015-07-31 02:31:16.000000000 +1000 -+++ llvm-3.7.1.src/lib/ExecutionEngine/MCJIT/MCJIT.cpp 2015-09-14 09:21:28.000000000 +1000 -@@ -524,6 +524,17 @@ - rv.IntVal = APInt(32, PF(ArgValues[0].IntVal.getZExtValue())); - return rv; - } -+ if (FTy->getNumParams() == 1 && -+ RetTy->isVoidTy() && -+ FTy->getParamType(0)->isPointerTy()) { -+ GenericValue rv; -+ //void (*PF)(char *) = (void(*)(char *))(intptr_t)FPtr; -+ //printf("are symbols available: %d\n",isSymbolSearchingDisabled()); -+ void (*PF)(char *) = (void(*)(char *))FPtr; -+ char* mzone = (char*) GVTOP(ArgValues[0]); -+ PF(mzone); -+ return rv; -+ } - break; - } - } - ---- llvm-3.7.1.src/lib/MC/MCContext.cpp 2015-06-23 21:31:32.000000000 +1000 -+++ llvm-3.7.1.src/lib/MC/MCContext.cpp 2015-09-14 09:24:01.000000000 +1000 -@@ -23,6 +23,7 @@ - #include "llvm/MC/MCSymbolCOFF.h" - #include "llvm/MC/MCSymbolELF.h" - #include "llvm/MC/MCSymbolMachO.h" -+#include "llvm/Support/COFF.h" - #include "llvm/Support/ELF.h" - #include "llvm/Support/ErrorHandling.h" - #include "llvm/Support/FileSystem.h" - ---- llvm-3.7.1.src/lib/MC/MCObjectFileInfo.cpp 2015-06-25 10:28:42.000000000 +1000 -+++ llvm-3.7.1.src/lib/MC/MCObjectFileInfo.cpp 2015-09-14 09:24:17.000000000 +1000 -@@ -16,6 +16,7 @@ - #include "llvm/MC/MCSectionCOFF.h" - #include "llvm/MC/MCSectionELF.h" - #include "llvm/MC/MCSectionMachO.h" -+#include "llvm/Support/COFF.h" - using namespace llvm; - - static bool useCompactUnwind(const Triple &T) { - ---- llvm-3.7.1.src/lib/MC/MCSectionCOFF.cpp 2015-06-09 10:31:39.000000000 +1000 -+++ llvm-3.7.1.src/lib/MC/MCSectionCOFF.cpp 2015-09-14 09:24:25.000000000 +1000 -@@ -11,6 +11,7 @@ - #include "llvm/MC/MCAsmInfo.h" - #include "llvm/MC/MCContext.h" - #include "llvm/MC/MCSymbol.h" -+#include "llvm/Support/COFF.h" - #include "llvm/Support/raw_ostream.h" - using namespace llvm; - ---- llvm-3.7.1.src/lib/Target/X86/X86TargetObjectFile.cpp 2015-06-27 04:55:48.000000000 +1000 -+++ llvm-3.7.1.src/lib/Target/X86/X86TargetObjectFile.cpp 2015-09-14 09:25:03.000000000 +1000 -@@ -16,6 +16,7 @@ - #include "llvm/MC/MCSectionCOFF.h" - #include "llvm/MC/MCSectionELF.h" - #include "llvm/MC/MCValue.h" -+#include "llvm/Support/COFF.h" - #include "llvm/Support/Dwarf.h" - #include "llvm/Target/TargetLowering.h" -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:56:46 2020 Received: (at 40739) by debbugs.gnu.org; 20 Apr 2020 21:56:46 +0000 Received: from localhost ([127.0.0.1]:48589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQePF-0007pp-MI for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:45 -0400 Received: from latitanza.investici.org ([82.94.249.234]:38049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeP7-0007pA-Uc for 40739@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:40 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 5AE6D12164C; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419797; bh=/YVSRj+Ei5lwYYEZ4rY2RHGm5wLjNLm/Mrm81ld7cw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=El0Ku56THdudoQSyEFieltLxTPieZwzman1cqLnVvaUiLVvekBAZkMWhXu3Jt7dCv PfnWMHJ+Xf9guxYivsL6uLPheLR5BhSEJPsqOmWWVqj+oUQVJKzldGlD6l5J345fGC fgVRRGbxF0EP8/9OrjxB7u2eQwrnqd1yeLvBHeQA= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 2B2871201B5; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) From: Giacomo Leidi To: 40739@debbugs.gnu.org Subject: [PATCH 3/5] gnu: portmidi-for-extempore: Update to 217-0.8602f54. Date: Mon, 20 Apr 2020 23:56:15 +0200 Message-Id: <20200420215617.12194-3-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420215617.12194-1-goodoldpaul@autistici.org> References: <20200420215617.12194-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40739 Cc: Giacomo Leidi 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 (-) * gnu/packages/music.scm (portmidi-for-extempore): Update to 217-0.8602f54. [version]: Use git-version to include latest changes. --- gnu/packages/music.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cad6bf35ea..b12b25f030 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1978,24 +1978,27 @@ using a system-independent interface.") (license license:expat))) (define-public portmidi-for-extempore - (package (inherit portmidi) - (name "portmidi-for-extempore") - (version "217") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/extemporelang/portmidi.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1inriyrjf7xx2b7r54x0vmf9ngyqgr7g5060c22bwkbsgg53apzv")))) - (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no tests - (native-inputs '()) - ;; Extempore refuses to build on architectures other than x86_64 - (supported-systems '("x86_64-linux")) - (home-page "https://github.com/extemporelang/portmidi/"))) + (let ((version "217") + (revision "0") + (commit "8602f548f71daf5ef638b2f7d224753400cb2158")) + (package (inherit portmidi) + (name "portmidi-for-extempore") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/portmidi.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qidzl1s3kzhczzm96rcd2ppn27a97k2axgfh1zhvyf0s52d7m4w")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; no tests + (native-inputs '()) + ;; Extempore refuses to build on architectures other than x86_64 + (supported-systems '("x86_64-linux")) + (home-page "https://github.com/extemporelang/portmidi/")))) (define-public python-pyportmidi (package -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:56:46 2020 Received: (at 40739) by debbugs.gnu.org; 20 Apr 2020 21:56:46 +0000 Received: from localhost ([127.0.0.1]:48591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQePF-0007px-WD for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:46 -0400 Received: from latitanza.investici.org ([82.94.249.234]:39145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeP8-0007pE-JB for 40739@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:40 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 03D6D121644; Mon, 20 Apr 2020 21:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419798; bh=K/lRht33FzfauJCcFHvJUs4wi/4DFJpa7u+DSINQ+9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCmhmcwoQewRh2pxnhdDp3HC7iPrxtGrzrktIJbFj8ltvbCmGPdAGS+X1EaLPi0F/ Y48O8E5vLrgSoM0cD4iqmZ92MAMV2nARxVnRzXuODx/Hx/2g5Ayy19xUfuEUNR00S9 MK7In5icV1Vnis8Smgp8LhkedH5aciGP9Jnltpbk= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id C61951201B5; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) From: Giacomo Leidi To: 40739@debbugs.gnu.org Subject: [PATCH 5/5] gnu: emacs-extempore-mode: Update to 0.0.0-1.09518ae. Date: Mon, 20 Apr 2020 23:56:17 +0200 Message-Id: <20200420215617.12194-5-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420215617.12194-1-goodoldpaul@autistici.org> References: <20200420215617.12194-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40739 Cc: Giacomo Leidi 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 (-) * gnu/packages/emacs-xyz.scm (emacs-extempore-mode): Update to to 0.0.0-1.09518ae. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cd80e57efb..95cfda6b4f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2430,7 +2430,7 @@ work with Emacs 24 and 25.") (define-public emacs-extempore-mode ;; Use the latest commit at time of packaging. There are no releases or tags. - (let ((commit "848ad0084f27b92d1cf98dabffbad29f959a642d") + (let ((commit "09518ae6650d7be33a4633a4c0f31b7130d04c6e") (revision "1")) (package (name "emacs-extempore-mode") @@ -2443,7 +2443,7 @@ work with Emacs 24 and 25.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c")))) + (base32 "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp")))) (build-system emacs-build-system) (home-page "https://github.com/extemporelang/extempore-emacs-mode") (synopsis "Emacs major mode for Extempore source files") -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:56:48 2020 Received: (at 40739) by debbugs.gnu.org; 20 Apr 2020 21:56:48 +0000 Received: from localhost ([127.0.0.1]:48593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQePG-0007q4-6k for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:48 -0400 Received: from latitanza.investici.org ([82.94.249.234]:37217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeP8-0007pC-9l for 40739@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:41 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id AE32812164E; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419797; bh=8s41+rVooWeQTKLdnMMYtMs+FVR7nBdFoNPuQmo+M3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kR8nR6oe+YNDl+m1Iryn3yIzep8tAzd5AFg8LNWnVa4d0bnnCvkQrQGyQs/4IvozB B2C+tA2IRKnoRff7I+ABcjnA0ymVpVJa6SXEpLd+vjb+1T/kz/hf4FVoSMPVlU8rEN xfp42PhVrhVq7LDJtSYwzxyJ3mV03Ik8bgPKv9O0= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 725A51201B5; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) From: Giacomo Leidi To: 40739@debbugs.gnu.org Subject: [PATCH 4/5] gnu: extempore: Update to 0.8.6. Date: Mon, 20 Apr 2020 23:56:16 +0200 Message-Id: <20200420215617.12194-4-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420215617.12194-1-goodoldpaul@autistici.org> References: <20200420215617.12194-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40739 Cc: Giacomo Leidi 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 (-) * 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. --- gnu/local.mk | 1 + gnu/packages/music.scm | 87 ++++++----- ...mpore-unbundle-external-dependencies.patch | 138 ++++++++++++++++++ 3 files changed, 186 insertions(+), 40 deletions(-) create mode 100644 gnu/packages/patches/extempore-unbundle-external-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 196ccc8800..fcc3a251c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,6 +871,7 @@ dist_patch_DATA = \ %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exiv2-CVE-2017-14860.patch \ %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ + %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b12b25f030..3bafbe5c15 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2019, 2020 Alexandros Theodotou ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -624,63 +625,73 @@ MusePack, Monkey's Audio, and WavPack files.") (define-public extempore (package (name "extempore") - (version "0.7.0") + (version "0.8.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/digego/extempore.git") - (commit version))) + (commit (string-append "v" version)))) (sha256 (base32 - "12fsp7zkfxb9kykwq46l88kcbbici9arczrrsl4qn87m6vm5349l")) - (file-name (string-append name "-" version "-checkout")))) + "182jy23qv115dipny7kglwbn21z55dp253w1ykm0kh8n6vkgs7gp")) + (file-name (git-file-name name version)) + (patches (list (search-patch + "extempore-unbundle-external-dependencies.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled sources. + (map delete-file-recursively + '("src/portaudio" + "src/pcre")) + #t)))) (build-system cmake-build-system) (arguments - `(;; The default target also includes ahead-of-time compilation of the - ;; standard libraries. However, during the "install" phase this would - ;; happen *again* for unknown reasons. Hence we only build the - ;; extempore executable during the build phase. - #:make-flags '("extempore") - #:configure-flags '("-DJACK=ON" - ;; We want to distribute. - "-DIN_TREE=OFF" - ;; Don't download any dependencies. - "-DBUILD_DEPS=OFF") + `(#:configure-flags (list "-DJACK=ON" + "-DPACKAGE=ON" + "-DEXTERNAL_SHLIBS_AUDIO=OFF" + "-DEXTERNAL_SHLIBS_GRAPHICS=OFF" + "-DCMAKE_BUILD_TYPE=Release" + (string-append "-DEXT_SHARE_DIR=" + (assoc-ref %outputs "out") + "/share")) #:modules ((ice-9 match) (guix build cmake-build-system) (guix build utils)) #:phases (modify-phases %standard-phases + (add-after 'build 'build-aot-libs + (lambda _ + (for-each (lambda (target) + (invoke "make" target)) + '("aot_base" + "aot_math" + "aot_instruments")) + #t)) + (add-after 'unpack 'patch-install-locations + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("EXT_SHARE_DIR=\"\\.\"\\)") + "EXT_SHARE_DIR=\"${EXT_SHARE_DIR}/extempore\")") + (("DESTINATION \"\\.\"\\)") "DESTINATION bin)") + (("DESTINATION \"\\.\"\n") "DESTINATION share/extempore\n")) + #t)) (add-after 'unpack 'patch-directories (lambda* (#:key outputs #:allow-other-keys) - ;; Rewrite default path to runtime directory - (substitute* "src/Extempore.cpp" - (("runtimedir \\+= \"runtime\"") - (string-append "runtimedir = \"" - (assoc-ref outputs "out") - "/lib/extempore/runtime\""))) (substitute* "extras/extempore.el" (("\\(runtime-directory \\(concat default-directory \"runtime\"\\)\\)") (string-append "(runtime-directory \"" (assoc-ref outputs "out") - "/lib/extempore/runtime" + "/share/extempore/runtime" "\")"))) #t)) (add-after 'unpack 'link-with-additional-libs (lambda _ ;; The executable must be linked with libffi and zlib. (substitute* "CMakeLists.txt" - (("add_dependencies\\(aot_extended extended_deps\\)") "") (("target_link_libraries\\(extempore PRIVATE dl" line) (string-append line " ffi z"))) #t)) - ;; FIXME: AOT compilation of the nanovg bindings fail with the error: - ;; "Compiler Error could not bind _nvgLinearGradient" - (add-after 'unpack 'disable-nanovg - (lambda _ - (substitute* "CMakeLists.txt" - (("aotcompile_lib\\(libs/external/nanovg.xtm.*") "")) - #t)) ;; FIXME: All examples that are used as tests segfault for some ;; unknown reason. (add-after 'unpack 'disable-broken-tests @@ -709,20 +720,16 @@ MusePack, Monkey's Audio, and WavPack files.") ("gl/glcompat-directbind" "libGL.so" "mesa"))) #t)) (add-after 'unpack 'use-own-llvm - (lambda* (#:key inputs #:allow-other-keys) - (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm")) - ;; Our LLVM builds shared libraries, so Extempore should use - ;; those. - (substitute* "CMakeLists.txt" - (("CMAKE_STATIC_LIBRARY") "CMAKE_SHARED_LIBRARY")) - #t)) + (lambda* (#:key inputs #:allow-other-keys) + (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm")) + ;; Our LLVM builds shared libraries, so Extempore should use + ;; those. + (substitute* "CMakeLists.txt" + (("CMAKE_STATIC_LIBRARY") "CMAKE_SHARED_LIBRARY")) + #t)) (add-after 'unpack 'fix-aot-compilation (lambda* (#:key outputs #:allow-other-keys) (substitute* "CMakeLists.txt" - ;; EXT_SHARE_DIR does not exist before installation, so the - ;; working directory should be the source directory instead. - (("WORKING_DIRECTORY \\$\\{EXT_SHARE_DIR\\}") - "WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}") ;; Extempore needs to be told where the runtime is to be found. ;; While we're at it we disable automatic tuning for a specific ;; CPU to make binary substitution possible. diff --git a/gnu/packages/patches/extempore-unbundle-external-dependencies.patch b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch new file mode 100644 index 0000000000..64d6dcaf15 --- /dev/null +++ b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch @@ -0,0 +1,138 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 89e6125e..c5e90750 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + if(PACKAGE) + # this needs to be set before project() is called + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12) +- set(ASSETS ON) # necessary for packaging ++ set(ASSETS OFF) # necessary for packaging + message(STATUS "Building Extempore for binary distribution (assets directory will be downloaded)") + endif() + +@@ -134,71 +134,6 @@ else() + message(FATAL_ERROR "Sorry, Extempore isn't supported on this platform - macOS, Linux & Windows only.") + endif() + +-######## +-# PCRE # +-######## +- +-# current in-tree PCRE version: 8.38 +- +-add_library(pcre STATIC +- # headers +- src/pcre/config.h +- src/pcre/pcre.h +- src/pcre/ucp.h +- # source files +- src/pcre/pcre_chartables.c +- src/pcre/pcre_compile.c +- src/pcre/pcre_exec.c +- src/pcre/pcre_globals.c +- src/pcre/pcre_internal.h +- src/pcre/pcre_newline.c +- src/pcre/pcre_tables.c +- ) +- +-target_compile_definitions(pcre +- PRIVATE -DHAVE_CONFIG_H +- ) +- +-if(PACKAGE) +- target_compile_options(pcre +- PRIVATE -mtune=generic) +-endif() +- +-############# +-# portaudio # +-############# +- +-add_library(portaudio STATIC +- src/portaudio/src/common/pa_allocation.c +- src/portaudio/src/common/pa_allocation.h +- src/portaudio/src/common/pa_converters.c +- src/portaudio/src/common/pa_converters.h +- src/portaudio/src/common/pa_cpuload.c +- src/portaudio/src/common/pa_cpuload.h +- src/portaudio/src/common/pa_debugprint.c +- src/portaudio/src/common/pa_debugprint.h +- src/portaudio/src/common/pa_dither.c +- src/portaudio/src/common/pa_dither.h +- src/portaudio/src/common/pa_endianness.h +- src/portaudio/src/common/pa_front.c +- src/portaudio/src/common/pa_hostapi.h +- src/portaudio/src/common/pa_memorybarrier.h +- src/portaudio/src/common/pa_process.c +- src/portaudio/src/common/pa_process.h +- src/portaudio/src/common/pa_ringbuffer.c +- src/portaudio/src/common/pa_ringbuffer.h +- src/portaudio/src/common/pa_stream.c +- src/portaudio/src/common/pa_stream.h +- src/portaudio/src/common/pa_trace.c +- src/portaudio/src/common/pa_trace.h +- src/portaudio/src/common/pa_types.h +- src/portaudio/src/common/pa_util.h +- ) +- +-target_include_directories(portaudio +- PRIVATE src/portaudio/include +- PRIVATE src/portaudio/src/common) +- + # platform-specific + + if(APPLE) +@@ -224,25 +159,8 @@ if(APPLE) + + elseif(UNIX AND NOT APPLE) + # use ALSA on Linux +- target_sources(portaudio +- PRIVATE src/portaudio/src/hostapi/alsa/pa_linux_alsa.c +- PRIVATE src/portaudio/src/os/unix/pa_unix_hostapis.c +- PRIVATE src/portaudio/src/os/unix/pa_unix_util.c +- ) +- target_include_directories(portaudio +- PRIVATE src/portaudio/src/os/unix) +- target_compile_definitions(portaudio +- PRIVATE -DPA_USE_ALSA) +- target_link_libraries(portaudio +- PRIVATE asound) + + if(JACK) +- target_sources(portaudio +- PRIVATE src/portaudio/src/hostapi/jack/pa_jack.c) +- target_compile_definitions(portaudio +- PRIVATE -DPA_USE_JACK) +- target_link_libraries(portaudio +- PRIVATE jack) + endif() + + elseif(WIN32) +@@ -292,8 +210,6 @@ if(ASIO) + endif() + + if(PACKAGE) +- target_compile_options(portaudio +- PRIVATE -mtune=generic) + endif() + + ############## +@@ -411,8 +327,6 @@ endif() + + # dependencies + +-add_dependencies(extempore pcre portaudio) +- + if(BUILD_LLVM) + if(WIN32) + add_dependencies(extempore LLVM-install) +@@ -553,7 +467,7 @@ else() + install(TARGETS extempore + RUNTIME + DESTINATION ".") +- install(DIRECTORY assets runtime libs examples tests ++ install(DIRECTORY runtime libs examples + DESTINATION "." + PATTERN ".DS_Store" EXCLUDE) + endif() -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 20 17:56:49 2020 Received: (at 40739) by debbugs.gnu.org; 20 Apr 2020 21:56:49 +0000 Received: from localhost ([127.0.0.1]:48595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQePI-0007qD-Gv for submit@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:48 -0400 Received: from latitanza.investici.org ([82.94.249.234]:49545) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQeP7-0007p9-M6 for 40739@debbugs.gnu.org; Mon, 20 Apr 2020 17:56:45 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 11B0A12164A; Mon, 20 Apr 2020 21:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1587419797; bh=5ALkoCLYgH9YcZu+uSkJouBRBrgLjZbKYRNEYUc7iyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A3EePnWIaWgsDhrdf4O88GMNirKUcpGF6BsSvRxTEhWocNG3zhnPKpDJJWSlajCWz Jqm2T0TLtJLoNI6dhYkAzznz2iiJJV/+jHXdEV6YB+orGC0IP0hSsj8RyUVl7Ffdsh H+ZoNRrvnth+hd2BU0/yHRqnC1vsamgZw4RRq3VQ= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id BB9CA1201B5; Mon, 20 Apr 2020 21:56:36 +0000 (UTC) From: Giacomo Leidi To: 40739@debbugs.gnu.org Subject: [PATCH 2/5] gnu: nanovg-for-extempore: Update to 0.7.1-0.3c60175. Date: Mon, 20 Apr 2020 23:56:14 +0200 Message-Id: <20200420215617.12194-2-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420215617.12194-1-goodoldpaul@autistici.org> References: <20200420215617.12194-1-goodoldpaul@autistici.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: * gnu/packages/gl.scm (nanovg-for-extempore): Update to 0.7.1-0.3c60175. [source]: Switch to Git source to include latest changes. [version]: Use git-version. --- gnu/packages/gl.scm | 47 ++++++++++++ [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: autistici.org] 0.0 T_SPF_HELO_TEMPERROR SPF: test of HELO record failed (temperror) -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] X-Debbugs-Envelope-To: 40739 Cc: Giacomo Leidi 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 (+) * gnu/packages/gl.scm (nanovg-for-extempore): Update to 0.7.1-0.3c60175. [source]: Switch to Git source to include latest changes. [version]: Use git-version. --- gnu/packages/gl.scm | 47 +++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01241cd88e..fd2e543461 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -742,30 +743,34 @@ and surfaces, receiving input and events.") (license license:zlib))) (define-public nanovg-for-extempore - (package - (name "nanovg-for-extempore") - (version "0.7.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/extemporelang/nanovg/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0ivs1sagq19xiw8jxd9f8w2b39svi0n9hrbmdvckwvqg95r8701g")))) - (build-system cmake-build-system) - (arguments `(#:tests? #f)) ; no tests included - (inputs - `(("mesa" ,mesa))) - ;; Extempore refuses to build on architectures other than x86_64 - (supported-systems '("x86_64-linux")) - (home-page "https://github.com/extemporelang/nanovg") - (synopsis "2D vector drawing library on top of OpenGL") - (description "NanoVG is small antialiased vector graphics rendering + (let ((version "0.7.1") + (revision "0") + (commit "3c60175fcc2e5fe305b04355cdce35d499c80310")) + (package + (name "nanovg-for-extempore") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/extemporelang/nanovg.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ddn3d3mxqn8hj9967v3pss7lz1wn08pcdnqzc118g7yjkq7hxzy")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; no tests included + (inputs + `(("mesa" ,mesa))) + ;; Extempore refuses to build on architectures other than x86_64 + (supported-systems '("x86_64-linux")) + (home-page "https://github.com/extemporelang/nanovg") + (synopsis "2D vector drawing library on top of OpenGL") + (description "NanoVG is small antialiased vector graphics rendering library for OpenGL. It has lean API modeled after HTML5 canvas API. It is aimed to be a practical and fun toolset for building scalable user interfaces and visualizations.") - (license license:zlib))) + (license license:zlib)))) (define-public gl2ps (package -- 2.26.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 10:19:16 2020 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: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Giacomo Leidi Subject: Re: [bug#40739] [PATCH 4/5] gnu: extempore: Update to 0.8.6. 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 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40739 Cc: 40739@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 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Pa= tch > 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=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 10:20:30 2020 Received: (at 40739-done) by debbugs.gnu.org; 2 May 2020 14:20:30 +0000 Received: from localhost ([127.0.0.1]:53582 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUt0I-0000DS-7y for submit@debbugs.gnu.org; Sat, 02 May 2020 10:20:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUt0G-0000DD-Pr for 40739-done@debbugs.gnu.org; Sat, 02 May 2020 10:20:29 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58381) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUt0B-0006cS-H2; Sat, 02 May 2020 10:20:23 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47766 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jUt05-0005nl-Cy; Sat, 02 May 2020 10:20:21 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Giacomo Leidi Subject: Re: [bug#40739] [PATCH 5/5] gnu: emacs-extempore-mode: Update to 0.0.0-1.09518ae. References: <20200420215617.12194-1-goodoldpaul@autistici.org> <20200420215617.12194-5-goodoldpaul@autistici.org> Date: Sat, 02 May 2020 16:20:16 +0200 In-Reply-To: <20200420215617.12194-5-goodoldpaul@autistici.org> (Giacomo Leidi's message of "Mon, 20 Apr 2020 23:56:17 +0200") Message-ID: <871ro2771b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40739-done Cc: 40739-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: -3.3 (---) Giacomo Leidi skribis: > * gnu/packages/emacs-xyz.scm (emacs-extempore-mode): Update to to 0.0.0-1= .09518ae. And applied. Thanks for the patches! Ludo=E2=80=99. From unknown Sun Jun 15 16:47:56 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, 31 May 2020 11:24:06 +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