[bug#41053] [PATCH 2/2] gnu: supercollider: Update to 3.11.0.

[Marius Bakke]

Giacomo Leidi <address@hidden> writes:

> This also restores IDE support.
>
> * gnu/packages/audio.scm (supercollider): Update to 3.11.0.
> [outputs]: Add an "ide" output.
> [phases]: Add an 'install-ide phase.
> [native-inputs]: Add qttools and ableton-link.
> [inputs]: Add qtbase, qtdeclarative, qtsvg, qtwebchannel and qtwebsockets.
> [propagated-inputs]: Add qtwebengine.

[...]

>      (build-system cmake-build-system)
> +    (outputs
> +     '("out"   ;; Core language
> +       "ide")) ;; Qt5 IDE

Neat.  Again use just a single semicolon for margin comments, without
capitalization of the comment text.

>      (arguments
>       `(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on"
> -                           "-DSC_QT=off" "-DCMAKE_BUILD_TYPE=Release"
> +                           "-DSC_QT=ON" "-DCMAKE_BUILD_TYPE=Release"
> +                           "-DFORTIFY=ON" "-DLIBSCSYNTH=ON"

Please mention these changes in the commit message.

>                             "-DSC_EL=off") ;scel is packaged individually as
>                                            ;emacs-scel
>         #:modules ((guix build utils)
> @@ -2356,6 +2360,9 @@ background file post-processing.")
>                             (lambda (x)
>                               (and (eq? (stat:type (stat x)) 'directory)
>                                    (not (member (basename x) keep-dirs))))))))
> +             (substitute* "lang/CMakeLists.txt"
> +               
> (("include\\(\\.\\./external_libraries/link/AbletonLinkConfig\\.cmake\\)")
> +                "find_package(AbletonLink NAMES AbletonLink ableton-link 
> link REQUIRED)"))
>               #t))
>           ;; Some tests are broken (see:
>           ;; https://github.com/supercollider/supercollider/issues/3555 and
> @@ -2367,8 +2374,6 @@ background file post-processing.")
>                  "")
>                 (("perf_counter_test.cpp")
>                  ""))
> -             (delete-file "testsuite/server/supernova/server_test.cpp")
> -             (delete-file "testsuite/server/supernova/perf_counter_test.cpp")

...and this.

>               (substitute* "testsuite/CMakeLists.txt"
>                 (("add_subdirectory\\(sclang\\)")
>                  ""))
> @@ -2385,9 +2390,20 @@ background file post-processing.")
>                      "SC_Filesystem::instance\\(\\)\\.getDirectory"
>                      "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
>                    (string-append "Path(\"" scclass-dir "\")")))
> +               #t)))
> +         (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)
>                 #t))))))
>      (native-inputs
> -     `(("pkg-config" ,pkg-config)))
> +     `(("ableton-link" ,ableton-link)

Is this only used a build-time and not runtime?

> +       ("pkg-config" ,pkg-config)
> +       ("qttools" ,qttools)))
>      (inputs
>       `(("jack" ,jack-1)
>         ("libsndfile" ,libsndfile)
> @@ -2400,7 +2416,14 @@ background file post-processing.")
>         ("icu4c" ,icu4c)
>         ("boost" ,boost)
>         ("boost-sync" ,boost-sync)
> -       ("yaml-cpp" ,yaml-cpp)))
> +       ("yaml-cpp" ,yaml-cpp)
> +       ("qtbase" ,qtbase)
> +       ("qtdeclarative" ,qtdeclarative)
> +       ("qtsvg" ,qtsvg)
> +       ("qtwebchannel" ,qtwebchannel)
> +       ("qtwebsockets" ,qtwebsockets)))
> +    (propagated-inputs                  ; To get native-search-path
> +     `(("qtwebengine" ,qtwebengine)))

Is it possible to wrap the executable with the required variables
instead of propagating here?

Can you send updated patches?  Thanks in advance!  :-)

signature.asc
Description: PGP signature