git: 210bd08ae292 - main - audio/supercollider: upfate to 3.11.2 release to unbreak build after boost upgrade
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 May 2022 20:17:35 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=210bd08ae29261c014bca5192ee5753b0fc14169
commit 210bd08ae29261c014bca5192ee5753b0fc14169
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2022-05-22 18:07:10 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2022-05-22 20:17:02 +0000
audio/supercollider: upfate to 3.11.2 release to unbreak build after boost upgrade
PR: 246106
---
audio/supercollider/Makefile | 3 +-
audio/supercollider/distinfo | 6 +-
.../patch-QtCollider_primitives_prim__QPen.cpp | 10 ---
.../files/patch-QtCollider_widgets_QcGraph.cpp | 10 ---
.../patch-QtCollider_widgets_QcLevelIndicator.cpp | 10 ---
.../patch-QtCollider_widgets_QcMultiSlider.cpp | 10 ---
.../files/patch-QtCollider_widgets_QcScopeShm.cpp | 10 ---
...patch-QtCollider_widgets_soundfileview_view.cpp | 10 ---
.../supercollider/files/patch-common_SC__Apple.hpp | 22 ++++++
.../supercollider/files/patch-common_SC__Apple.mm | 68 ++++++++++++++++++
.../files/patch-common_SC__AppleEventLoop.hpp | 37 ++++++++++
.../files/patch-common_SC__AppleEventLoop.mm | 83 ++++++++++++++++++++++
.../files/patch-common_SC__EventLoop.hpp | 19 +++++
...t_math_special__functions_detail_fp__traits.hpp | 11 +++
.../files/patch-server_scsynth_CMakeLists.txt | 17 +++++
.../files/patch-server_supernova_CMakeLists.txt | 18 +++++
.../patch-server_supernova_sc_sc__osc__handler.hpp | 27 +++++++
audio/supercollider/pkg-plist | 10 +--
18 files changed, 312 insertions(+), 69 deletions(-)
diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
index 9cd950f971a3..b902676aaa81 100644
--- a/audio/supercollider/Makefile
+++ b/audio/supercollider/Makefile
@@ -1,6 +1,5 @@
PORTNAME= supercollider
-DISTVERSION= 3.11.0
-PORTREVISION= 3
+DISTVERSION= 3.11.2
CATEGORIES= audio
MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
DISTNAME= SuperCollider-${PORTVERSION}-Source
diff --git a/audio/supercollider/distinfo b/audio/supercollider/distinfo
index edf97212fa98..0b6551a1b479 100644
--- a/audio/supercollider/distinfo
+++ b/audio/supercollider/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588924328
-SHA256 (SuperCollider-3.11.0-Source.tar.bz2) = 37592a32108757bf282575f0d3b0e373bae9dbce6cf990282ea85299b13eb250
-SIZE (SuperCollider-3.11.0-Source.tar.bz2) = 18125654
+TIMESTAMP = 1619062594
+SHA256 (SuperCollider-3.11.2-Source.tar.bz2) = c22c32c6bc482671d4fb8f51672df712d97a6a6277235c4da2312910303a0506
+SIZE (SuperCollider-3.11.2-Source.tar.bz2) = 18130954
diff --git a/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp b/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp
deleted file mode 100644
index 659f0a02ea97..000000000000
--- a/audio/supercollider/files/patch-QtCollider_primitives_prim__QPen.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/primitives/prim_QPen.cpp.orig 2020-06-15 00:38:04 UTC
-+++ QtCollider/primitives/prim_QPen.cpp
-@@ -27,6 +27,7 @@
- #include "PyrKernel.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QVector2D>
- #include <QVector3D>
- #include <cmath>
diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp
deleted file mode 100644
index c96ea0711b02..000000000000
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcGraph.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/widgets/QcGraph.cpp.orig 2020-06-15 01:27:43 UTC
-+++ QtCollider/widgets/QcGraph.cpp
-@@ -24,6 +24,7 @@
- #include "../style/routines.hpp"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QApplication>
- #include <QtCore/qmath.h>
diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp
deleted file mode 100644
index e8d262acb9a0..000000000000
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcLevelIndicator.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/widgets/QcLevelIndicator.cpp.orig 2020-06-15 01:16:56 UTC
-+++ QtCollider/widgets/QcLevelIndicator.cpp
-@@ -23,6 +23,7 @@
- #include "../QcWidgetFactory.h"
-
- #include <QPainter>
-+#include <QPainterPath>
-
- QC_DECLARE_QWIDGET_FACTORY(QcLevelIndicator);
-
diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp
deleted file mode 100644
index 13d9eb44dd29..000000000000
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcMultiSlider.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/widgets/QcMultiSlider.cpp.orig 2020-06-15 00:48:09 UTC
-+++ QtCollider/widgets/QcMultiSlider.cpp
-@@ -26,6 +26,7 @@
- #include <QApplication>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <cmath>
-
diff --git a/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp b/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp
deleted file mode 100644
index 8747519c2d45..000000000000
--- a/audio/supercollider/files/patch-QtCollider_widgets_QcScopeShm.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/widgets/QcScopeShm.cpp.orig 2020-06-15 01:00:40 UTC
-+++ QtCollider/widgets/QcScopeShm.cpp
-@@ -25,6 +25,7 @@
- #include "../debug.h"
-
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTimer>
- #include <QResizeEvent>
- #include <QWindow>
diff --git a/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp b/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp
deleted file mode 100644
index 7ab2c8eee956..000000000000
--- a/audio/supercollider/files/patch-QtCollider_widgets_soundfileview_view.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- QtCollider/widgets/soundfileview/view.cpp.orig 2020-06-15 01:36:47 UTC
-+++ QtCollider/widgets/soundfileview/view.cpp
-@@ -24,6 +24,7 @@
-
- #include <QGridLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QApplication>
- #include <QPaintEvent>
- #include <QCursor>
diff --git a/audio/supercollider/files/patch-common_SC__Apple.hpp b/audio/supercollider/files/patch-common_SC__Apple.hpp
new file mode 100644
index 000000000000..3cdb2829f943
--- /dev/null
+++ b/audio/supercollider/files/patch-common_SC__Apple.hpp
@@ -0,0 +1,22 @@
+--- common/SC_Apple.hpp.orig 2020-11-15 17:38:25 UTC
++++ common/SC_Apple.hpp
+@@ -23,19 +23,5 @@ namespace SC { namespace Apple {
+
+ void disableAppNap();
+
+-namespace EventLoop {
+-
+-// Setup the main application. This function must be called in the
+-// main thread and before any other calls to Cocoa methods.
+-void setup();
+-// Run the event loop. This function must be called in the main thread.
+-// It blocks until the event loop finishes.
+-void run();
+-// Ask the event loop to stop and terminate the program.
+-// This function can be called from any thread.
+-void quit();
+-
+-} // EventLoop
+-
+ } // namespace Apple
+ } // namespace SC
diff --git a/audio/supercollider/files/patch-common_SC__Apple.mm b/audio/supercollider/files/patch-common_SC__Apple.mm
new file mode 100644
index 000000000000..7143d22694f1
--- /dev/null
+++ b/audio/supercollider/files/patch-common_SC__Apple.mm
@@ -0,0 +1,68 @@
+--- common/SC_Apple.mm.orig 2020-11-15 17:38:25 UTC
++++ common/SC_Apple.mm
+@@ -42,65 +42,5 @@ void disableAppNap() {
+ }
+ }
+
+-namespace EventLoop {
+-
+-static std::atomic_bool g_running;
+-
+-void setup() {
+- // The following code would transform the process into a foreground application.
+- // For now it's the plugin's responsibility to do this (early or lazily)
+- // because we don't want to always show an icon in the docker.
+- // ProcessSerialNumber psn = { 0, kCurrentProcess };
+- // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+-
+- // Create NSApplication
+- [NSApplication sharedApplication];
+-}
+-
+-void run() {
+-#if 0
+- // this doesn't work...
+- [NSApp run];
+-#else
+- // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
+- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+-
+- [NSApp finishLaunching];
+- g_running = true;
+-
+- while (g_running) {
+- [pool release];
+- pool = [[NSAutoreleasePool alloc] init];
+- NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
+- untilDate:[NSDate distantFuture]
+- inMode:NSDefaultRunLoopMode
+- dequeue:YES];
+- if (event) {
+- [NSApp sendEvent:event];
+- [NSApp updateWindows];
+- }
+- }
+- [pool release];
+-#endif
+-}
+-
+-void quit() {
+- // break from event loop instead of [NSApp terminate:nil]
+- g_running = false;
+- // send dummy event to wake up event loop
+- NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
+- location:NSMakePoint(0, 0)
+- modifierFlags:0
+- timestamp:0
+- windowNumber:0
+- context:nil
+- subtype:0
+- data1:0
+- data2:0];
+- [NSApp postEvent:event atStart:NO];
+-}
+-
+-} // EventLoop
+-
+ } // namespace Apple
+ } // namespace SC
diff --git a/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp b/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp
new file mode 100644
index 000000000000..f38374250805
--- /dev/null
+++ b/audio/supercollider/files/patch-common_SC__AppleEventLoop.hpp
@@ -0,0 +1,37 @@
+--- common/SC_AppleEventLoop.hpp.orig 2021-04-22 03:41:58 UTC
++++ common/SC_AppleEventLoop.hpp
+@@ -0,0 +1,34 @@
++/************************************************************************
++ *
++ * Copyright 2019 Christof Ressi <info@christofressi.com>
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ ************************************************************************/
++
++#pragma once
++
++namespace SC { namespace Apple { namespace EventLoop {
++
++// Setup the main application. This function must be called in the
++// main thread and before any other calls to Cocoa methods.
++void setup();
++// Run the event loop. This function must be called in the main thread.
++// It blocks until the event loop finishes.
++void run();
++// Ask the event loop to stop and terminate the program.
++// This function can be called from any thread.
++void quit();
++
++}}} // namespace SC::Apple::EventLoop
diff --git a/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm b/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm
new file mode 100644
index 000000000000..d0505523b8ae
--- /dev/null
+++ b/audio/supercollider/files/patch-common_SC__AppleEventLoop.mm
@@ -0,0 +1,83 @@
+--- common/SC_AppleEventLoop.mm.orig 2021-04-22 03:41:58 UTC
++++ common/SC_AppleEventLoop.mm
+@@ -0,0 +1,80 @@
++/************************************************************************
++ *
++ * Copyright 2019 Christof Ressi <info@christofressi.com>
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ *
++ ************************************************************************/
++
++#include "SC_AppleEventLoop.hpp"
++#include <atomic>
++
++#import <Cocoa/Cocoa.h>
++
++namespace SC { namespace Apple { namespace EventLoop {
++
++static std::atomic_bool g_running;
++
++void setup() {
++ // The following code would transform the process into a foreground application.
++ // For now it's the plugin's responsibility to do this (early or lazily)
++ // because we don't want to always show an icon in the docker.
++ // ProcessSerialNumber psn = { 0, kCurrentProcess };
++ // TransformProcessType(&psn, kProcessTransformToForegroundApplication);
++
++ // Create NSApplication
++ [NSApplication sharedApplication];
++}
++
++void run() {
++ // this doesn't work...
++ // [NSApp run];
++ // Kudos to https://www.cocoawithlove.com/2009/01/demystifying-nsapplication-by.html
++ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
++
++ [NSApp finishLaunching];
++ g_running = true;
++
++ while (g_running) {
++ [pool release];
++ pool = [[NSAutoreleasePool alloc] init];
++ NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
++ untilDate:[NSDate distantFuture]
++ inMode:NSDefaultRunLoopMode
++ dequeue:YES];
++ if (event) {
++ [NSApp sendEvent:event];
++ [NSApp updateWindows];
++ }
++ }
++ [pool release];
++}
++
++void quit() {
++ // break from event loop instead of [NSApp terminate:nil]
++ g_running = false;
++ // send dummy event to wake up event loop
++ NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
++ location:NSMakePoint(0, 0)
++ modifierFlags:0
++ timestamp:0
++ windowNumber:0
++ context:nil
++ subtype:0
++ data1:0
++ data2:0];
++ [NSApp postEvent:event atStart:NO];
++}
++
++}}} // namespace SC::Apple::EventLoop
diff --git a/audio/supercollider/files/patch-common_SC__EventLoop.hpp b/audio/supercollider/files/patch-common_SC__EventLoop.hpp
new file mode 100644
index 000000000000..cb3e4377bbb2
--- /dev/null
+++ b/audio/supercollider/files/patch-common_SC__EventLoop.hpp
@@ -0,0 +1,19 @@
+--- common/SC_EventLoop.hpp.orig 2020-11-15 17:38:25 UTC
++++ common/SC_EventLoop.hpp
+@@ -2,7 +2,7 @@
+
+ #include <functional>
+ #ifdef __APPLE__
+-# include "SC_Apple.hpp"
++# include "SC_AppleEventLoop.hpp"
+ # include <thread>
+ #endif
+
+@@ -21,6 +21,7 @@ class EventLoop { (public)
+ SC::Apple::EventLoop::setup();
+ #endif
+ }
++
+ // Run the event loop until 'waitFunction' returns.
+ static void run(std::function<void()> waitFunction) {
+ #ifdef __APPLE__
diff --git a/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp b/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp
new file mode 100644
index 000000000000..1dea3fa42625
--- /dev/null
+++ b/audio/supercollider/files/patch-external__libraries_boost_boost_math_special__functions_detail_fp__traits.hpp
@@ -0,0 +1,11 @@
+--- external_libraries/boost/boost/math/special_functions/detail/fp_traits.hpp.orig 2020-04-01 20:16:40 UTC
++++ external_libraries/boost/boost/math/special_functions/detail/fp_traits.hpp
+@@ -24,7 +24,7 @@ With these techniques, the code could be simplified.
+
+ #include <boost/assert.hpp>
+ #include <boost/cstdint.hpp>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef.hpp>
+ #include <boost/static_assert.hpp>
+ #include <boost/type_traits/is_floating_point.hpp>
+
diff --git a/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt b/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt
new file mode 100644
index 000000000000..3cc443c0cc15
--- /dev/null
+++ b/audio/supercollider/files/patch-server_scsynth_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- server/scsynth/CMakeLists.txt.orig 2020-11-15 17:38:26 UTC
++++ server/scsynth/CMakeLists.txt
+@@ -230,7 +230,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ target_link_libraries(libscsynth rt)
+ endif()
+
+-add_executable(scsynth scsynth_main.cpp)
++add_executable(scsynth
++ scsynth_main.cpp
++
++ # these files contain code only used in main()
++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
++ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
++ )
+ target_link_libraries(scsynth libscsynth)
+
+ if (PTHREADS_FOUND)
diff --git a/audio/supercollider/files/patch-server_supernova_CMakeLists.txt b/audio/supercollider/files/patch-server_supernova_CMakeLists.txt
new file mode 100644
index 000000000000..895769be7795
--- /dev/null
+++ b/audio/supercollider/files/patch-server_supernova_CMakeLists.txt
@@ -0,0 +1,18 @@
+--- server/supernova/CMakeLists.txt.orig 2020-11-15 17:38:26 UTC
++++ server/supernova/CMakeLists.txt
+@@ -182,7 +182,14 @@ if(WIN32)
+ endif()
+
+
+-add_executable(supernova server/main.cpp ${supernova_headers})
++add_executable(supernova
++ server/main.cpp
++ ${supernova_headers}
++
++ # these files contain code only used in main()
++ ${CMAKE_SOURCE_DIR}/common/SC_ServerBootDelayWarning.cpp
++ $<$<BOOL:${APPLE}>: ${CMAKE_SOURCE_DIR}/common/SC_AppleEventLoop.mm >
++ )
+ target_link_libraries(supernova libsupernova)
+
+ if(WIN32)
diff --git a/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp b/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp
new file mode 100644
index 000000000000..70b0a05823c8
--- /dev/null
+++ b/audio/supercollider/files/patch-server_supernova_sc_sc__osc__handler.hpp
@@ -0,0 +1,27 @@
+--- server/supernova/sc/sc_osc_handler.hpp.orig 2020-11-15 17:38:26 UTC
++++ server/supernova/sc/sc_osc_handler.hpp
+@@ -229,11 +229,7 @@ class sc_osc_handler : private detail::network_thread,
+ class tcp_connection : public nova_endpoint {
+ public:
+ using pointer = std::shared_ptr<tcp_connection>;
+-#if BOOST_VERSION >= 107000
+- using executor = boost::asio::executor;
+-#else
+- using executor = boost::asio::io_context::executor_type;
+-#endif
++ using executor = tcp::socket::executor_type;
+
+ static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
+
+@@ -244,11 +240,7 @@ class sc_osc_handler : private detail::network_thread,
+ bool operator==(tcp_connection const& rhs) const { return &rhs == this; }
+
+ private:
+-#if BOOST_VERSION >= 107000
+ tcp_connection(const executor& executor): socket_(executor) {}
+-#else
+- tcp_connection(const executor& executor): socket_(executor.context()) {}
+-#endif
+
+ void send(const char* data, size_t length) override final;
+
diff --git a/audio/supercollider/pkg-plist b/audio/supercollider/pkg-plist
index 93575576e858..4d8e444b33bf 100644
--- a/audio/supercollider/pkg-plist
+++ b/audio/supercollider/pkg-plist
@@ -679,6 +679,8 @@ share/SuperCollider/HID_Support/hut/hut_8_ledpage.yaml
%%HELP%%share/SuperCollider/HelpSource/Classes/PdegreeToKey.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pdfsm.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Pdict.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/Pdiff.schelp
+%%HELP%%share/SuperCollider/HelpSource/Classes/Pdrop.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/PdurStutter.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/Peak.schelp
%%HELP%%share/SuperCollider/HelpSource/Classes/PeakFollower.schelp
@@ -1513,10 +1515,10 @@ share/SuperCollider/SCClassLibrary/Common/Math/Number.sc
share/SuperCollider/SCClassLibrary/Common/Math/Polar.sc
share/SuperCollider/SCClassLibrary/Common/Math/Signal.sc
share/SuperCollider/SCClassLibrary/Common/Math/SimpleNumber.sc
+share/SuperCollider/SCClassLibrary/Common/Quarks/GUI/QuarksGui.sc
share/SuperCollider/SCClassLibrary/Common/Quarks/Git.sc
share/SuperCollider/SCClassLibrary/Common/Quarks/Quark.sc
share/SuperCollider/SCClassLibrary/Common/Quarks/Quarks.sc
-share/SuperCollider/SCClassLibrary/Common/Quarks/QuarksGui.sc
share/SuperCollider/SCClassLibrary/Common/Quarks/packages.sc
share/SuperCollider/SCClassLibrary/Common/Streams/BasicOpsStream.sc
share/SuperCollider/SCClassLibrary/Common/Streams/EventStreamCleanup.sc
@@ -1544,9 +1546,9 @@ share/SuperCollider/SCClassLibrary/Common/Streams/Rest.sc
share/SuperCollider/SCClassLibrary/Common/Streams/Stream.sc
share/SuperCollider/SCClassLibrary/Common/Streams/TabFileReader.sc
share/SuperCollider/SCClassLibrary/Common/Streams/TimePatterns.sc
+share/SuperCollider/SCClassLibrary/Common/UnitTesting/GUI/UnitTestGUI.sc
share/SuperCollider/SCClassLibrary/Common/UnitTesting/MixedBundleTester.sc
share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTest.sc
-share/SuperCollider/SCClassLibrary/Common/UnitTesting/UnitTestGUI.sc
share/SuperCollider/SCClassLibrary/Common/Unix/Unix.sc
share/SuperCollider/SCClassLibrary/Common/Unix/UnixFILE.sc
share/SuperCollider/SCClassLibrary/DefaultLibrary/Main.sc
@@ -1587,8 +1589,8 @@ share/SuperCollider/SCClassLibrary/Platform/Platform.sc
share/SuperCollider/SCClassLibrary/Platform/iphone/SystemOverwrites/extFile.sc
share/SuperCollider/SCClassLibrary/Platform/iphone/extMain.sc
share/SuperCollider/SCClassLibrary/Platform/iphone/iPhonePlatform.sc
+share/SuperCollider/SCClassLibrary/Platform/linux/GUI/LIDGui.sc
share/SuperCollider/SCClassLibrary/Platform/linux/LID.sc
-share/SuperCollider/SCClassLibrary/Platform/linux/LIDGui.sc
share/SuperCollider/SCClassLibrary/Platform/linux/LinuxPlatform.sc
share/SuperCollider/SCClassLibrary/Platform/linux/SystemOverwrites/extMIDIOut.sc
share/SuperCollider/SCClassLibrary/Platform/linux/extMain.sc
@@ -1609,9 +1611,9 @@ share/SuperCollider/SCClassLibrary/backwards_compatibility/PMOsc.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/AudioIn.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/File.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/File.sc
+share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/Plotter.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/GUI/QWebView.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/Main.sc
-share/SuperCollider/SCClassLibrary/deprecated/3.10/Plotter.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/deprecated-3.10.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCpathResponder.sc
share/SuperCollider/SCClassLibrary/deprecated/3.10/osc/OSCresponder.sc