From 924de2ce0d8b18cc9fa5b93301226964890ccfe4 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 17 Apr 2025 21:44:45 +0800 Subject: [PATCH] jamesdsp: fix build on qt 6.9 --- pkgs/applications/audio/jamesdsp/default.nix | 1 + .../audio/jamesdsp/fix-build-on-qt6_9.diff | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index f98bdae72975..1849a8c428a2 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co="; name = "fix-build-with-new-pipewire.patch"; }) + ./fix-build-on-qt6_9.diff ]; buildInputs = diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff new file mode 100644 index 000000000000..9706aa8eb614 --- /dev/null +++ b/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff @@ -0,0 +1,22 @@ +diff --git a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +index 01940a1..2ec9c5b 100644 +--- a/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp ++++ b/src/subprojects/AutoEqIntegration/AeqPackageManager.cpp +@@ -133,7 +133,7 @@ QtPromise::QPromise AeqPackageManager::getLocalVersion() + return QtPromise::QPromise{[&]( + const QtPromise::QPromiseResolve& resolve, + const QtPromise::QPromiseReject& reject) { +- QFile versionJson = (databaseDirectory() + "/version.json"); ++ QFile versionJson(databaseDirectory() + "/version.json"); + if(!versionJson.exists()) + { + reject(); +@@ -159,7 +159,7 @@ QtPromise::QPromise> AeqPackageManager::getLocalIndex() + return QtPromise::QPromise>{[&]( + const QtPromise::QPromiseResolve>& resolve, + const QtPromise::QPromiseReject>& reject) { +- QFile indexJson = (databaseDirectory() + "/index.json"); ++ QFile indexJson(databaseDirectory() + "/index.json"); + if(!indexJson.exists()) + { + reject();