From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0HXzDF+psV7JMgAA0tVLHw (envelope-from ) for ; Tue, 05 May 2020 17:58:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KLvBKGqpsV7abQAA1q6Kng (envelope-from ) for ; Tue, 05 May 2020 17:59:06 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 356C09409D0 for ; Tue, 5 May 2020 17:59:02 +0000 (UTC) Received: from localhost ([::1]:49676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW1qO-0003Sc-GM for larch@yhetil.org; Tue, 05 May 2020 13:59:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW1Y2-0007XV-FW for guix-patches@gnu.org; Tue, 05 May 2020 13:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW1Y2-000133-53 for guix-patches@gnu.org; Tue, 05 May 2020 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jW1Y2-00066z-0y for guix-patches@gnu.org; Tue, 05 May 2020 13:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41053] [PATCH 2/2] gnu: supercollider: Update to 3.11.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 May 2020 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41053 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Giacomo Leidi , 41053@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 41053-submit@debbugs.gnu.org id=B41053.158870038123461 (code B ref 41053); Tue, 05 May 2020 17:40:01 +0000 Received: (at 41053) by debbugs.gnu.org; 5 May 2020 17:39:41 +0000 Received: from localhost ([127.0.0.1]:37303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW1Xg-00066K-CV for submit@debbugs.gnu.org; Tue, 05 May 2020 13:39:41 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:48703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jW1Xe-000666-S1 for 41053@debbugs.gnu.org; Tue, 05 May 2020 13:39:39 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id BC8675C00BD; Tue, 5 May 2020 13:39:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 05 May 2020 13:39:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=pequ1VOpF7AqL2TvLPF7jRrXmr kxZ/jqtdNDaFHdEEs=; b=XivasbBD4HlIW4zQjXjymDxw3HjvH/48dH8f8qogm1 x0gr8SdYV3Vdw+8gEAWz6LCkj0xEH+zpmeizA2TXCLiMfCc3ftvGs1l3NAAbnDBF ZIP2u73jM3Kq9Z9Vs9u6sKGuMvgiwP0Iq012bUZq5Dhe0V/MB6aQZlWPwGQ1L3EM A8ipo6bn1L6/cjAhjPuTsgnA5p+PLpZchfRTRYiFaGBnaQzTj0JPMjcq+nYAwQwq TTBQz8cdXMc1t/kI+rxMxCjisn3j+S4QNbVCvoex4UQpS17ncAUWOj0NMyMFLvy5 ekcndeGn3fyt9WR8I4ny3uYobeBpumQjcJ5a6IByIyWQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=pequ1V OpF7AqL2TvLPF7jRrXmrkxZ/jqtdNDaFHdEEs=; b=fTx5i/mJ+V0iAzyPmY/HCR riWzF5T0oTfKr9pl81nu1MmK0aN14Wi1JAiZT2sQrYUlDfct8YyG6e45sqK16TSj 6br4Eirf2l1gnTsFV9Z+Bp+Z0xfzNRwjy76Io2QU2FEoaiWtNphOrgk5Hb15w7CV NXngyks5FEaEBIGzC3bDDbNgtHXeouKFsqJwqfgzObHjSspOhAkh9wilVGTiE/RL lcV/UJ/DmCUfG+6lV0KVN278bD7q648hKaZSXfdoZkFowSKTjNoqG0LBqQgRt+4o iUGaWUY4PYWj7UY6M1C+07GPrPGawYhbDwzcQ9tKpqF2e+6k2pVTMeLdxmkQrimg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrjeeigdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecuggftrfgrthhtvghrnhepjeekfeekleegveejteehleejue etudeuledvffevudefvedtvdefveeifeehvedtnecuffhomhgrihhnpehgihhthhhusgdr tghomhenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 2D71F328005E; Tue, 5 May 2020 13:39:33 -0400 (EDT) From: Marius Bakke In-Reply-To: <20200503160608.5905-2-goodoldpaul@autistici.org> References: <20200503160608.5905-1-goodoldpaul@autistici.org> <20200503160608.5905-2-goodoldpaul@autistici.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Tue, 05 May 2020 19:39:31 +0200 Message-ID: <87zhamxovg.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: -2.01 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=fastmail.com header.s=fm2 header.b=XivasbBD; dkim=fail (rsa verify failed) header.d=messagingengine.com header.s=fm2 header.b=fTx5i/mJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [-2.01 / 13.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; GENERIC_REPUTATION(0.00)[-0.49561719227517]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; FREEMAIL_FROM(0.00)[fastmail.com]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.12), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; R_DKIM_REJECT(1.00)[fastmail.com:s=fm2,messagingengine.com:s=fm2]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; DKIM_TRACE(0.00)[fastmail.com:-,messagingengine.com:-]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[mbakke@fastmail.com,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[autistici.org:email]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_LIST_UNSUB(-0.01)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[fastmail.com : SPF not aligned (relaxed),none] X-TUID: CvqjVKKOCWAX --=-=-= Content-Type: text/plain Giacomo Leidi 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! :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6xpNMACgkQoqBt8qM6 VPqc1wf/XWpAciwjHjqnHMsFe00EA51JU4zUZnqymQbt73fzSKSl1pWc1sgxzE3U 8O5hkKHbfJxhERDZcIR+Ha00ltn2OIBsLuwfmn7jy+Xq64WSX2k+Cq7YTe1U4+qF xFpMkWeGQZFz9cJul32KP8plzkUcxQ+TOxrVKdeqbHmAAv+fJlbmuDevQrOphOB7 75ECOz96/w7kbGVZRuofl7vc+hAoPZmirigYQep87ilox+b1fhAZXAf3d5pY8+sU QjRVwKMX2qYcUS+5W5GY4lP4VBbfQzVU7O44OwkGMOqHw58SkeP95boWGgX5aMPC kGyP9MlmJil7u+81C4dOHvRMmHpUuQ== =9WeQ -----END PGP SIGNATURE----- --=-=-=--