<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99db21abde652a021b33c4c9f4c99326e895301d">https://github.com/macports/macports-ports/commit/99db21abde652a021b33c4c9f4c99326e895301d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 99db21abde652a021b33c4c9f4c99326e895301d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Dec 31 21:04:45 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> CsoundQt: new port in aqua/audio
</span>---
aqua/CsoundQt/Portfile | 101 +++++++++++++++++
aqua/CsoundQt/files/patch-fix-includes.diff | 22 ++++
aqua/CsoundQt/files/patch-qcs-macx-qt5.diff | 159 +++++++++++++++++++++++++++
aqua/CsoundQt/files/patch-qcs-macx.diff | 165 ++++++++++++++++++++++++++++
aqua/CsoundQt/files/patch-qt4-compat.diff | 47 ++++++++
5 files changed, 494 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/CsoundQt/Portfile b/aqua/CsoundQt/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e8169f675af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/CsoundQt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup CsoundQt CsoundQt 0.9.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 de2e910e66ae1f9290091b11168a5a6515c183f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c12242d4e1f745ac2c1ae23d1ef72661d68cb51baf110c17140deb1c994cfa1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66170886
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qcs-macx.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-includes.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qt4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup CsoundQt CsoundQt 1.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c274b03cccda9092311a477d1f12058391c0cbbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 652fa51dc19acae031919216ec8043cb3767763008a62a134854940e2d065326 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 67621515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtxmlpatterns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qcs-macx-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories aqua audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description ${name} is a frontend for Csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description} featuring a highlighting editor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with autocomplete, interactive widgets and integrated help. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It is cross-platform and aims to be a simple yet powerful \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and complete development environment for Csound.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://csoundqt.github.io
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:csound \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsndfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix},g" ${worksrcpath}/qcs-macx.pro ${worksrcpath}/qcs.pro ${worksrcpath}/config.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CC@,${configure.cc},g" ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CXX@,${configure.cxx},g" ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@DESTDIR@,${worksrcpath}," ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CFLAGS@,${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]," ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@CXXFLAGS@,${configure.cppflags} ${configure.cxxflags} [get_canonical_archflags cxx]," ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@LFLAGS@,[get_canonical_archflags ld]," ${worksrcpath}/qcs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} ni [list arm i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +double
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if [variant_isset double] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cs_conf CONFIG+=build64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libname CsoundLib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appname ${name}-d-cs6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cs_conf CONFIG+=build32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libname CsoundLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appname ${name}-f-cs6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${qt_qmake_cmd} qcs.pro ${cs_conf}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cs_framework_path ${libname}.framework/Versions/6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set csoundlib ${cs_framework_path}/${libname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "install_name_tool -change ${prefix}/lib/${csoundlib} ${frameworks_dir}/${csoundlib} ./${appname}.app/Contents/MacOS/${appname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/${appname}.app ${destroot}${applications_dir}/${name}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant double description "Use double precision" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:csound double
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set result [active_variants csound double]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset double]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "csound has been built with double precision, please install ${name} with +double."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/CsoundQt/files/patch-fix-includes.diff b/aqua/CsoundQt/files/patch-fix-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3bc834905df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/CsoundQt/files/patch-fix-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/csoundengine.cpp 2020-01-16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/csoundengine.cpp 2023-12-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02111-1307 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_QT5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtConcurrent>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/widgetlayout.cpp 2020-01-16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/widgetlayout.cpp 2023-12-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdlib>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QThread>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/CsoundQt/files/patch-qcs-macx-qt5.diff b/aqua/CsoundQt/files/patch-qcs-macx-qt5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d77c8a8d989
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/CsoundQt/files/patch-qcs-macx-qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,159 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qcs-macx.pro.orig 2023-12-31 21:39:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qcs-macx.pro 2023-12-31 22:03:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,40 +5,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(Building CsoundQt for Macintosh OS X.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build32: MAC_LIB = CsoundLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build64: MAC_LIB = CsoundLib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#paths set up for using the csound from installed package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# paths set up for using the csound from installed package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOME_DIRECTORY =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set default paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CSOUND_FRAMEWORK_DIR = Library/Frameworks/$${MAC_LIB}.framework/Versions/Current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_CSOUND_API_INCLUDE_DIRS = $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/include/csound \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/csound/Frameworks/CsoundLib64.framework/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_FRAMEWORK_DIR = @PREFIX@/Library/Frameworks/$${MAC_LIB}.framework/Versions/6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_CSOUND_API_INCLUDE_DIRS = $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PREFIX@/include/csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_CSOUND_INTERFACES_INCLUDE_DIRS = $${DEFAULT_CSOUND_API_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_CSOUND_LIBRARY_DIRS = $${HOME_DIRECTORY}/$${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /$${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/csound/Frameworks/CsoundLib64.framework/Versions/Current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_CSOUND_LIBRARY_DIRS = $${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build32:DEFAULT_CSOUND_LIBS = CsoundLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build64:DEFAULT_CSOUND_LIBS = CsoundLib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# For OS X, the PythonQt.1.0.0.dylib and the libPythonQt.1.dylib must be on /usr/local/lib or other lib path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_PYTHON_INCLUDE_DIR = /usr/local/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_PYTHONQT_LIBRARY_DIRS = /usr/local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# For OS X, the PythonQt.1.0.0.dylib and the libPythonQt.1.dylib must be on @PREFIX@/lib or other lib path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_PYTHON_INCLUDE_DIR = @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_PYTHONQT_LIBRARY_DIRS = @PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONQT_VARIANTS = "pythonqt" "PythonQt3.2" "PythonQt3.1" "PythonQt3.0" "PythonQt" "PythonQt2.0.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for (pyqtdir, PYTHONQT_VARIANTS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for(pyqtdir, PYTHONQT_VARIANTS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_PYTHONQT_SRC_DIRS += ../../../$$pyqtdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../$$pyqtdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$pyqtdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,9 +60,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #LIBS += -framework QtCore -framework QtGui -framework QtXml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LCSOUND = -F$${HOME_DIRECTORY}/Library/Frameworks -F/Library/Frameworks -F/usr/local/opt/csound/Frameworks -framework $${MAC_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LCSOUND = -F@PREFIX@/Library/Frameworks -framework $${MAC_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LCSND = -L/usr/local/lib -lcsnd6.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LCSND = -L@PREFIX@/lib -lcsnd6.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_INFO_PLIST = $${PWD}/src/MyInfo.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ICON = $${PWD}/images/qtcs.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qcs.pro.orig 2023-12-31 21:39:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qcs.pro 2023-12-31 22:08:38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qmake qcs.pro INSTALL_DIR=~ SHARE_DIR=~/.local/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS=@CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS=@CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS=@LFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_C=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_C_SHLIB=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_SHLIB=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Support for Qt4 dropped from v0.9.8 de facto, v1.0.0 declaring it here:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lessThan(QT_MAJOR_VERSION,5): error("Qt5 or higher required. Use CsoundQt 0.9.7 or earlier to build for Qt4.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,13 +172,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_API_INCLUDE_DIR = @PREFIX@/Library/Frameworks/$${MAC_LIB}.framework/Versions/6.0/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_INTERFACES_INCLUDE_DIR = @PREFIX@/include/csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH *= $${CSOUND_API_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH *= $${CSOUND_INTERFACES_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH += $$PWD/csound/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#DESTDIR = $${_PRO_FILE_PWD_}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DESTDIR = bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DESTDIR = @DESTDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOC_DIR = build/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UI_DIR = build/ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RCC_DIR = build/rc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,10 +200,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use 'sudo make install' for system wide installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix:!macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(INSTALL_DIR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_DIR=/usr/local # ~ #for HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL_DIR=@PREFIX@ # ~ #for HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(SHARE_DIR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHARE_DIR=/usr/share # ~/.local/share for HOME install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHARE_DIR=@PREFIX@/share # ~/.local/share for HOME install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.path = $$INSTALL_DIR/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALLS += target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postInstall.path = $$INSTALL_DIR/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- postInstall.commands = cd $(INSTALL_ROOT)/$$INSTALL_DIR/bin; ln -sf $$TARGET csoundqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ postInstall.commands = cd $(INSTALL_ROOT)/$$INSTALL_DIR/bin; ln -sf $$TARGET csoundqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALLS += postInstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see comments: https://github.com/CsoundQt/CsoundQt/issues/258
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.pri.orig 2023-12-31 21:39:25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.pri 2023-12-31 21:58:26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_RTMIDI_DIRS = "rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RTMIDI_VERSIONS = "rtmidi-5.0.0" "rtmidi-4.0.0" "rtmidi-3.0.0" "rtmidi-2.1.1" "rtmidi-2.1.0" "rtmidi-2.0.1" "rtmidi-1.0.15"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for (rtdir, RTMIDI_VERSIONS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for(rtdir, RTMIDI_VERSIONS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_RTMIDI_DIRNAME=$$rtdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_RTMIDI_DIRS += $${DEFAULT_RTMIDI_DIRNAME} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../$${DEFAULT_RTMIDI_DIRNAME} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,19 +129,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rtmidi {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check if RTMIDI is found in system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix:!macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exists("/usr/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RTMIDI_DIR = "/usr/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no_messages:message(RtMidi found in /usr/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exists("@PREFIX@/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RTMIDI_DIR = "@PREFIX@/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !no_messages:message(RtMidi found in @PREFIX@/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += system_rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exists("/usr/local/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RTMIDI_DIR = "/usr/local/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no_messages:message(RtMidi found in /usr/local/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG -= rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += system_rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(RTMIDI_DIR) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/CsoundQt/files/patch-qcs-macx.diff b/aqua/CsoundQt/files/patch-qcs-macx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2c0ae01abe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/CsoundQt/files/patch-qcs-macx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,165 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes paths, drops hardcoded archs, fixes unknown test function error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://forum.qt.io/topic/35403/qmake-gives-unknown-test-function-for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Notice that in the context of this port build64 does not necessarily mean 64-bit arch,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but just uses doubles. CsoundLib64 builds fine on 32-bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qcs-macx.pro 2020-07-03 05:55:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qcs-macx.pro 2023-12-31 14:53:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,18 +5,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(Building CsoundQt for Macintosh OS X.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-i386: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} else:universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -arch i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG += x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -arch x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build32: MAC_LIB = CsoundLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build64: MAC_LIB = CsoundLib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,25 +12,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOME_DIRECTORY =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set default paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CSOUND_FRAMEWORK_DIR = /Library/Frameworks/$${MAC_LIB}.framework/Versions/Current
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_CSOUND_API_INCLUDE_DIRS = $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/include/csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_FRAMEWORK_DIR = @PREFIX@/Library/Frameworks/$${MAC_LIB}.framework/Versions/6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_CSOUND_API_INCLUDE_DIRS = $${CSOUND_FRAMEWORK_DIR}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PREFIX@/include/csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_CSOUND_INTERFACES_INCLUDE_DIRS = $${DEFAULT_CSOUND_API_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_CSOUND_LIBRARY_DIRS = $${HOME_DIRECTORY}/$${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_CSOUND_LIBRARY_DIRS = $${CSOUND_FRAMEWORK_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build32:DEFAULT_CSOUND_LIBS = CsoundLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build64:DEFAULT_CSOUND_LIBS = CsoundLib64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For OS X, the PythonQt.1.0.0.dylib and the libPythonQt.1.dylib must be on /usr/local/lib or other lib path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_PYTHON_INCLUDE_DIR = /usr/local/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_PYTHONQT_LIBRARY_DIRS = /usr/local/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_PYTHON_INCLUDE_DIR = @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_PYTHONQT_LIBRARY_DIRS = @PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PYTHONQT_VARIANTS = "PythonQt3.2" "PythonQt3.1" "PythonQt3.0" "PythonQt" "PythonQt2.0.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for (pyqtdir, PYTHONQT_VARIANTS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYTHONQT_VARIANTS = "PythonQt3.2" "PythonQt3.1" "PythonQt3.0" "PythonQt" "PythonQt2.0.1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for(pyqtdir, PYTHONQT_VARIANTS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_PYTHONQT_SRC_DIRS += ../../../$$pyqtdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../$$pyqtdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$pyqtdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,8 +53,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESOURCES += "src/quteapp_d_osx.qrc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #LIBS += -framework QtCore -framework QtGui -framework QtXml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LCSOUND = -F$${HOME_DIRECTORY}/Library/Frameworks -F/Library/Frameworks -framework $${MAC_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-csound6: LCSND = -L/usr/local/lib -lcsnd6.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LCSOUND = -F@PREFIX@/Library/Frameworks -framework $${MAC_LIB}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++csound6: LCSND = -L@PREFIX@/lib -lcsnd6.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else: LCSND = -l_csnd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_INFO_PLIST = $${PWD}/src/MyInfo.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qcs.pro 2020-07-03 05:55:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qcs.pro 2023-12-31 18:20:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qmake qcs.pro INSTALL_DIR=~ SHARE_DIR=~/.local/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ################################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CC=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXX=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CFLAGS=@CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS=@CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LFLAGS=@LFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_C=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_C_SHLIB=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_LINK_SHLIB=@CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFINES += NOMINMAX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DEFINES += USE_WIDGET_MUTEX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ greaterThan(QT_MAJOR_VERSION, 4){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE_CXXFLAGS += -std=c++0x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE_CXXFLAGS += -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !csound5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,11 +179,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_API_INCLUDE_DIR = @PREFIX@/Library/Frameworks/$${MAC_LIB}.framework/Versions/6.0/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CSOUND_INTERFACES_INCLUDE_DIR = @PREFIX@/include/csound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH *= $${CSOUND_API_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDEPATH *= $${CSOUND_INTERFACES_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #DESTDIR = $${_PRO_FILE_PWD_}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DESTDIR = bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DESTDIR = @DESTDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOC_DIR = build/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UI_DIR = build/ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RCC_DIR = build/rc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,10 +206,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use 'sudo make install' for system wide installation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix:!macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(INSTALL_DIR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_DIR=/usr/local # ~ #for HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL_DIR=@PREFIX@ # ~ #for HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(SHARE_DIR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHARE_DIR=/usr/share # ~/.local/share for HOME install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHARE_DIR=@PREFIX@/share # ~/.local/share for HOME install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.path = $$INSTALL_DIR/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.pri 2020-07-03 05:55:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.pri 2023-12-31 14:55:46.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECTS_DIR = "$${TMPDIR}/obj"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RTMIDI_VERSIONS = "rtmidi-4.0.0" "rtmidi-3.0.0" "rtmidi-2.1.1" "rtmidi-2.1.0" "rtmidi-2.0.1" "rtmidi-1.0.15"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for (rtdir, RTMIDI_VERSIONS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++for(rtdir, RTMIDI_VERSIONS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_RTMIDI_DIRNAME=$$rtdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_RTMIDI_DIRS += $${DEFAULT_RTMIDI_DIRNAME} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../$${DEFAULT_RTMIDI_DIRNAME} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,19 +128,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rtmidi {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check if RTMIDI is found in system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix:!macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exists("/usr/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RTMIDI_DIR = "/usr/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no_messages:message(RtMidi found in /usr/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exists("@PREFIX@/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RTMIDI_DIR = "@PREFIX@/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !no_messages:message(RtMidi found in @PREFIX@/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG -= rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG += system_rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exists("/usr/local/include/rtmidi") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RTMIDI_DIR = "/usr/local/include/rtmidi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- !no_messages:message(RtMidi found in /usr/local/include/rtmidi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG -= rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += system_rtmidi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(RTMIDI_DIR) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/CsoundQt/files/patch-qt4-compat.diff b/aqua/CsoundQt/files/patch-qt4-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d92f33392b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/CsoundQt/files/patch-qt4-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reverts a broken commit: https://github.com/CsoundQt/CsoundQt/commit/9da46b9e139a869416fb85568568b57392a2de43
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+And masks some corrupt code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qutecsound.cpp 2020-01-16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qutecsound.cpp 2023-12-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5665,21 +5665,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QListWidgetItem *item = list->currentItem();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!item) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qDebug() << "Empty list. Create empty score file";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString companion = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (documentPages[curPage]->getFileName().endsWith(".orc")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // create an empty score file to run the orchestra scorelessly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef USE_QT5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- companion = QStandardPaths::writableLocation(QStandardPaths::TempLocation) + "/empty.sco"; // QT >5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QFile f(companion); // does it create it here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- companion = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/empty.sco";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- f.open(QIODevice::ReadWrite | QIODevice::Text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- f.close();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- qDebug() << "Created empty score file as companion: " << companion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- documentPages[curPage]->setCompanionFileName(companion);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ documentPages[curPage]->setCompanionFileName("");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString itemText = item->text();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/qutewidget.cpp 2020-01-16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/qutewidget.cpp 2023-12-31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,10 +311,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menu.addSeparator();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (acceptsMidi()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu.addAction(tr("Midi learn"), this, &QuteWidget::openMidiDialog ); //midi learn act
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu.addSeparator();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// The following code is broken, no matching function available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if (acceptsMidi()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// menu.addAction(tr("Midi learn"), this, &QuteWidget::openMidiDialog ); //midi learn act
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// menu.addSeparator();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QList<QAction *> actionList = getParentActionList();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>