* [bug#63147] [PATCH 1/2] gnu: supercollider: Use G-expressions.
@ 2023-04-28 13:33 Zhu Zihao
2023-04-28 13:33 ` [bug#63148] [PATCH 2/2] gnu: supercollider: Update to 3.13.0 Zhu Zihao
[not found] ` <handler.63147.B.16826889031823.ack@debbugs.gnu.org>
0 siblings, 2 replies; 5+ messages in thread
From: Zhu Zihao @ 2023-04-28 13:33 UTC (permalink / raw)
To: 63147; +Cc: Zhu Zihao
* gnu/packages/audio.scm (supercollider)[source]: Use G-expression in snippet.
[arguments]: Use G-expressions.
<#:phases>: Replace `(assoc-ref outputs ...)` with `#$output`.
---
gnu/packages/audio.scm | 102 ++++++++++++++++++++---------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dca5e516a1..69570109d9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3460,64 +3460,64 @@ (define-public supercollider
;; The build system doesn't allow us to unbundle the following
;; libraries. hidapi is also heavily patched and upstream not
;; actively maintained.
- '(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi"
- "TLSF-2.4.6" "oscpack_1_1_0" "." "..")))
- (with-directory-excursion "./external_libraries"
- (for-each
- delete-file-recursively
- (scandir "."
- (lambda (x)
- (and (eq? (stat:type (stat x)) 'directory)
- (not (member (basename x) keep-dirs)))))))
- ;; To find the Guix provided ableton-link library.
- (substitute* "lang/CMakeLists.txt"
- (("include\\(\\.\\./external_libraries/link/\
+ #~(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi"
+ "TLSF-2.4.6" "oscpack_1_1_0" "." "..")))
+ (with-directory-excursion "./external_libraries"
+ (for-each
+ delete-file-recursively
+ (scandir "."
+ (lambda (x)
+ (and (eq? (stat:type (stat x)) 'directory)
+ (not (member (basename x) keep-dirs)))))))
+ ;; To find the Guix provided ableton-link library.
+ (substitute* "lang/CMakeLists.txt"
+ (("include\\(\\.\\./external_libraries/link/\
AbletonLinkConfig\\.cmake\\)")
- "find_package(AbletonLink NAMES AbletonLink ableton-link \
+ "find_package(AbletonLink NAMES AbletonLink ableton-link \
link REQUIRED)"))))))
(build-system cmake-build-system)
(outputs
'("out" ;core language
"ide")) ;qt ide
(arguments
- `(#:configure-flags '("-DSYSTEM_BOOST=ON"
- "-DSYSTEM_YAMLCPP=ON"
- "-DSC_QT=ON"
- "-DCMAKE_BUILD_TYPE=Release"
- "-DFORTIFY=ON"
- ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable?
- "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
- #:phases
- (modify-phases %standard-phases
- ;; HOME must be defined otherwise supercollider throws a "ERROR:
- ;; Primitive '_FileMkDir' failed." error when generating the doc.
- ;; The graphical tests also hang without it.
- (add-after 'unpack 'set-home-directory
- (lambda _
- (setenv "HOME" (getcwd))))
- (add-after 'unpack 'patch-scclass-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (scclass-dir
- (string-append out
- "/share/SuperCollider/SCClassLibrary")))
- (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
- (((string-append
- "SC_Filesystem::instance\\(\\)\\.getDirectory"
- "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
- (string-append "Path(\"" scclass-dir "\")"))))))
- (add-before 'build 'prepare-x
- (lambda _
- (system "Xvfb &")
- (setenv "DISPLAY" ":0")))
- (add-before 'install 'install-ide
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (ide (assoc-ref outputs "ide"))
- (scide "editors/sc-ide/scide"))
- (install-file scide
- (string-append ide "/bin"))
- (delete-file scide)))))))
+ (list
+ #:configure-flags
+ #~(list "-DSYSTEM_BOOST=ON"
+ "-DSYSTEM_YAMLCPP=ON"
+ "-DSC_QT=ON"
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DFORTIFY=ON"
+ ;; "-DLIBSCSYNTH=ON" ; TODO: Re-enable?
+ "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; HOME must be defined otherwise supercollider throws a "ERROR:
+ ;; Primitive '_FileMkDir' failed." error when generating the doc.
+ ;; The graphical tests also hang without it.
+ (add-after 'unpack 'set-home-directory
+ (lambda _
+ (setenv "HOME" (getcwd))))
+ (add-after 'unpack 'patch-scclass-dir
+ (lambda _
+ (let* ((scclass-dir
+ (string-append #$output
+ "/share/SuperCollider/SCClassLibrary")))
+ (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
+ (((string-append
+ "SC_Filesystem::instance\\(\\)\\.getDirectory"
+ "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
+ (string-append "Path(\"" scclass-dir "\")"))))))
+ (add-before 'build 'prepare-x
+ (lambda _
+ (system "Xvfb &")
+ (setenv "DISPLAY" ":0")))
+ (add-before 'install 'install-ide
+ (lambda _
+ (let* ((ide #$output:ide)
+ (scide "editors/sc-ide/scide"))
+ (install-file scide
+ (string-append ide "/bin"))
+ (delete-file scide)))))))
(native-inputs
(list ableton-link pkg-config qttools-5 xorg-server-for-tests))
(inputs (list jack-1
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#63148] [PATCH 2/2] gnu: supercollider: Update to 3.13.0.
2023-04-28 13:33 [bug#63147] [PATCH 1/2] gnu: supercollider: Use G-expressions Zhu Zihao
@ 2023-04-28 13:33 ` Zhu Zihao
[not found] ` <handler.63148.B.16826889061845.ack@debbugs.gnu.org>
[not found] ` <handler.63147.B.16826889031823.ack@debbugs.gnu.org>
1 sibling, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2023-04-28 13:33 UTC (permalink / raw)
To: 63148; +Cc: Zhu Zihao
* gnu/packages/audio.scm (supercollider): Update to 3.13.0.
---
gnu/packages/audio.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 69570109d9..c3db095007 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3441,7 +3441,7 @@ (define-public qjackrcd
(define-public supercollider
(package
(name "supercollider")
- (version "3.12.1")
+ (version "3.13.0")
(source
(origin
(method git-fetch)
@@ -3453,7 +3453,7 @@ (define-public supercollider
(file-name (git-file-name name version))
(sha256
(base32
- "0id522338a464j1slcspajwc7klypbc9qpigw5mqjhrw970wij5z"))
+ "1dkpnaly4m2j41ypy7xj5m2yhbl4ykw3vbnam345z4dk6qhyj9b1"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <handler.63147.B.16826889031823.ack@debbugs.gnu.org>]
* [bug#63147] [PATCH 2/2] gnu: supercollider: Update to 3.13.0.
[not found] ` <handler.63147.B.16826889031823.ack@debbugs.gnu.org>
@ 2023-04-28 15:10 ` Zhu Zihao
2023-05-11 10:47 ` bug#63147: [PATCH 1/2] gnu: supercollider: Use G-expressions 宋文武 via Guix-patches via
0 siblings, 1 reply; 5+ messages in thread
From: Zhu Zihao @ 2023-04-28 15:10 UTC (permalink / raw)
To: 63147
[-- Attachment #1.1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-supercollider-Update-to-3.13.0.patch --]
[-- Type: text/x-patch, Size: 1095 bytes --]
From 4bf2a1cfc6b5633ad1c6cb1a6e302bc36cd24ab6 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 28 Apr 2023 21:17:54 +0800
Subject: [PATCH 2/2] gnu: supercollider: Update to 3.13.0.
* gnu/packages/audio.scm (supercollider): Update to 3.13.0.
---
gnu/packages/audio.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 69570109d9..c3db095007 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3441,7 +3441,7 @@ (define-public qjackrcd
(define-public supercollider
(package
(name "supercollider")
- (version "3.12.1")
+ (version "3.13.0")
(source
(origin
(method git-fetch)
@@ -3453,7 +3453,7 @@ (define-public supercollider
(file-name (git-file-name name version))
(sha256
(base32
- "0id522338a464j1slcspajwc7klypbc9qpigw5mqjhrw970wij5z"))
+ "1dkpnaly4m2j41ypy7xj5m2yhbl4ykw3vbnam345z4dk6qhyj9b1"))
(modules '((guix build utils)
(ice-9 ftw)))
(snippet
--
2.39.2
[-- Attachment #3: Type: text/plain, Size: 100 bytes --]
--
Retrieve my PGP public key:
gpg --recv-keys B3EBC086AB0EBC0F45E0B4D433DB374BCEE4D9DC
Zihao
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-11 10:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-28 13:33 [bug#63147] [PATCH 1/2] gnu: supercollider: Use G-expressions Zhu Zihao
2023-04-28 13:33 ` [bug#63148] [PATCH 2/2] gnu: supercollider: Update to 3.13.0 Zhu Zihao
[not found] ` <handler.63148.B.16826889061845.ack@debbugs.gnu.org>
2023-04-28 15:09 ` bug#63148: Acknowledgement ([PATCH 2/2] gnu: supercollider: Update to 3.13.0.) Zhu Zihao
[not found] ` <handler.63147.B.16826889031823.ack@debbugs.gnu.org>
2023-04-28 15:10 ` [bug#63147] [PATCH 2/2] gnu: supercollider: Update to 3.13.0 Zhu Zihao
2023-05-11 10:47 ` bug#63147: [PATCH 1/2] gnu: supercollider: Use G-expressions 宋文武 via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).