From ab1336a4048de1a10cf8d821997f757623eb3f70 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Fri, 2 Sep 2022 20:13:59 +0200 Subject: [PATCH 1/6] Mac: Enable Darkmode support for non legacy builds Since we compile with Qt 5.15 or later on non legacy builds, there is no need to disable darkmode anymore. Only the legacy build will opt out from now on. --- mac/Info-make-legacy.plist | 2 +- mac/Info-make.plist | 3 --- mac/Info-xcode.plist | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mac/Info-make-legacy.plist b/mac/Info-make-legacy.plist index 874ebe5275..ecdf2c55e9 100644 --- a/mac/Info-make-legacy.plist +++ b/mac/Info-make-legacy.plist @@ -34,7 +34,7 @@ NSApplication NSMicrophoneUsageDescription Jamulus needs access to the microphone to record and stream your music to other musicians - + NSRequiresAquaSystemAppearance true diff --git a/mac/Info-make.plist b/mac/Info-make.plist index 3504c37c16..564a40419a 100644 --- a/mac/Info-make.plist +++ b/mac/Info-make.plist @@ -34,8 +34,5 @@ NSApplication NSMicrophoneUsageDescription Jamulus needs access to the microphone to record and stream your music to other musicians - - NSRequiresAquaSystemAppearance - true diff --git a/mac/Info-xcode.plist b/mac/Info-xcode.plist index 2a05b9d825..ddfc001b8f 100644 --- a/mac/Info-xcode.plist +++ b/mac/Info-xcode.plist @@ -34,7 +34,5 @@ NSApplication NSMicrophoneUsageDescription Jamulus needs access to the microphone to record and stream your music to other musicians - NSRequiresAquaSystemAppearance - true From f8745635454d5665d26d6393c7daa1a516dde5b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 21 Apr 2023 19:40:43 +0000 Subject: [PATCH 2/6] Build: Bump aqt from 3.1.4 to 3.1.5 --- .github/autobuild/android.sh | 2 +- .github/autobuild/ios.sh | 2 +- .github/autobuild/mac.sh | 2 +- .github/autobuild/windows.ps1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/autobuild/android.sh b/.github/autobuild/android.sh index b6905c2cf6..06267845f7 100755 --- a/.github/autobuild/android.sh +++ b/.github/autobuild/android.sh @@ -7,7 +7,7 @@ COMMANDLINETOOLS_VERSION=6858069 ANDROID_NDK_VERSION=r21d ANDROID_PLATFORM=android-30 ANDROID_BUILD_TOOLS=30.0.2 -AQTINSTALL_VERSION=3.1.4 +AQTINSTALL_VERSION=3.1.5 QT_VERSION=5.15.2 # Only variables which are really needed by sub-commands are exported. diff --git a/.github/autobuild/ios.sh b/.github/autobuild/ios.sh index d5a58ed83b..70ed5e1b10 100755 --- a/.github/autobuild/ios.sh +++ b/.github/autobuild/ios.sh @@ -4,7 +4,7 @@ set -eu QT_DIR=/usr/local/opt/qt # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: -AQTINSTALL_VERSION=3.1.4 +AQTINSTALL_VERSION=3.1.5 if [[ ! ${QT_VERSION:-} =~ [0-9]+\.[0-9]+\..* ]]; then echo "Environment variable QT_VERSION must be set to a valid Qt version" diff --git a/.github/autobuild/mac.sh b/.github/autobuild/mac.sh index c62aa9f685..19f46efd91 100755 --- a/.github/autobuild/mac.sh +++ b/.github/autobuild/mac.sh @@ -4,7 +4,7 @@ set -eu QT_DIR=/usr/local/opt/qt # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: -AQTINSTALL_VERSION=3.1.4 +AQTINSTALL_VERSION=3.1.5 TARGET_ARCHS="${TARGET_ARCHS:-}" diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index 3e8595b4a9..653c81cbb9 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -21,7 +21,7 @@ $DownloadCacheDir = 'C:\AutobuildCache' # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: $Qt32Version = "5.15.2" $Qt64Version = "5.15.2" -$AqtinstallVersion = "3.1.4" +$AqtinstallVersion = "3.1.5" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" $Msvc64Version = "win64_msvc2019_64" From 3696aa474e1c2d1a338a5354a023f04d4ba285a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:59:18 +0000 Subject: [PATCH 3/6] Build: Bump DoozyX/clang-format-lint-action from 0.15 to 0.16 Bumps [DoozyX/clang-format-lint-action](https://github.com/DoozyX/clang-format-lint-action) from 0.15 to 0.16. - [Release notes](https://github.com/DoozyX/clang-format-lint-action/releases) - [Commits](https://github.com/DoozyX/clang-format-lint-action/compare/c3b2c943e924028b93a707a5b1b017976ab8d50c...a83a8fb7d371f66da7dd1c4f33a193023899494b) --- updated-dependencies: - dependency-name: DoozyX/clang-format-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/coding-style-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coding-style-check.yml b/.github/workflows/coding-style-check.yml index 90e6a2ad27..5573599cdf 100644 --- a/.github/workflows/coding-style-check.yml +++ b/.github/workflows/coding-style-check.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Check .cpp/.h/.mm with clang-format - uses: DoozyX/clang-format-lint-action@c3b2c943e924028b93a707a5b1b017976ab8d50c + uses: DoozyX/clang-format-lint-action@a83a8fb7d371f66da7dd1c4f33a193023899494b with: clangFormatVersion: 14 # When updating the extension list, remember to update From 5f7cb9986e46eec96500593198aeaa9d654bc449 Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 13 Feb 2023 16:20:01 +0100 Subject: [PATCH 4/6] Remove request for non native recording directory This is done to allow write access to a recording directory outside of the macOS sandbox --- src/serverdlg.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 248de94f00..7615e6e2f0 100644 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -596,11 +596,9 @@ void CServerDlg::OnStopRecorder() void CServerDlg::OnRecordingDirClicked() { // get the current value from pServer - QString currentValue = pServer->GetRecordingDir(); - QString newRecordingDir = QFileDialog::getExistingDirectory ( this, - tr ( "Select Main Recording Directory" ), - currentValue, - QFileDialog::ShowDirsOnly | QFileDialog::DontUseNativeDialog ); + QString currentValue = pServer->GetRecordingDir(); + QString newRecordingDir = + QFileDialog::getExistingDirectory ( this, tr ( "Select Main Recording Directory" ), currentValue, QFileDialog::ShowDirsOnly ); if ( newRecordingDir != currentValue ) { @@ -624,7 +622,7 @@ void CServerDlg::OnServerListPersistenceClicked() QString currentValue = pServer->GetServerListFileName(); QFileDialog fileDialog; fileDialog.setAcceptMode ( QFileDialog::AcceptSave ); - fileDialog.setOptions ( QFileDialog::DontUseNativeDialog | QFileDialog::HideNameFilterDetails ); + fileDialog.setOptions ( QFileDialog::HideNameFilterDetails ); fileDialog.selectFile ( currentValue ); if ( fileDialog.exec() && fileDialog.selectedFiles().size() == 1 ) { From 35ffe5fd4a2689593a6cc53dfa39fd1bebc148b8 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Thu, 27 Jan 2022 01:31:49 +0100 Subject: [PATCH 5/6] Autobuild: Windows: Build with Qt 6.4.3 on 64bit 32bit builds remain on 5.15.2, as Qt6 is not available there. Note: CI builds will now drop unofficial 64 Bit Windows 7 and 8.1 support. Since both are no longer supported by Microsoft, this should not be an issue. Users should update their OS or compile from source. --- .github/autobuild/windows.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index 653c81cbb9..d29f0b26e2 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -20,7 +20,7 @@ $DownloadCacheDir = 'C:\AutobuildCache' # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: $Qt32Version = "5.15.2" -$Qt64Version = "5.15.2" +$Qt64Version = "6.4.3" $AqtinstallVersion = "3.1.5" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" From 0256e01dd3c380082126513f4eec36de5bff8d0c Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Sun, 30 Apr 2023 21:41:34 +0200 Subject: [PATCH 6/6] Autobuild: Harden Regex syntax for detecting Qt 5 --- .github/autobuild/ios.sh | 4 ++-- .github/autobuild/mac.sh | 2 +- .github/autobuild/windows.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/autobuild/ios.sh b/.github/autobuild/ios.sh index 70ed5e1b10..838f0e0543 100755 --- a/.github/autobuild/ios.sh +++ b/.github/autobuild/ios.sh @@ -23,14 +23,14 @@ setup() { python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" # Install actual ios Qt: local qtmultimedia=() - if [[ ! "${QT_VERSION}" =~ 5\..* ]]; then + if [[ ! "${QT_VERSION}" =~ 5\.[0-9]+\.[0-9]+ ]]; then # From Qt6 onwards, qtmultimedia is a module and cannot be installed # as an archive anymore. qtmultimedia=("--modules") fi qtmultimedia+=("qtmultimedia") python3 -m aqt install-qt --outputdir "${QT_DIR}" mac ios "${QT_VERSION}" --archives qtbase qttools qttranslations "${qtmultimedia[@]}" - if [[ ! "${QT_VERSION}" =~ 5\..* ]]; then + if [[ ! "${QT_VERSION}" =~ 5\.[0-9]+\.[0-9]+ ]]; then # Starting with Qt6, ios' qtbase install does no longer include a real qmake binary. # Instead, it is a script which invokes the mac desktop qmake. # As of aqtinstall 2.1.0 / 04/2022, desktop qtbase has to be installed manually: diff --git a/.github/autobuild/mac.sh b/.github/autobuild/mac.sh index 19f46efd91..ed7b391d0b 100755 --- a/.github/autobuild/mac.sh +++ b/.github/autobuild/mac.sh @@ -24,7 +24,7 @@ setup() { echo "Installing Qt..." python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" local qtmultimedia=() - if [[ ! "${QT_VERSION}" =~ 5\..* ]]; then + if [[ ! "${QT_VERSION}" =~ 5\.[0-9]+\.[0-9]+ ]]; then # From Qt6 onwards, qtmultimedia is a module and cannot be installed # as an archive anymore. qtmultimedia=("--modules") diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index d29f0b26e2..7586ec2baf 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -78,7 +78,7 @@ Function Install-Qt "$QtArch", "--archives", "qtbase", "qttools", "qttranslations" ) - if ( $QtVersion -notmatch '^5\.' ) + if ( $QtVersion -notmatch '5\.[0-9]+\.[0-9]+' ) { # From Qt6 onwards, qtmultimedia is a module and cannot be installed # as an archive anymore.