https://bugs.gentoo.org/982229 https://github.com/strawberrymusicplayer/strawberry/commit/ec7dffefb1f0015d071e63c9d02a6281bef44167 From ec7dffefb1f0015d071e63c9d02a6281bef44167 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 9 Sep 2026 21:10:13 +0200 Subject: [PATCH] Fix build with tagfetcher disabled Fixes #2310 --- CMakeLists.txt | 7 ++++--- src/settings/settingsdialog.cpp | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c945c8579..c169a444bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -730,7 +730,6 @@ set(SOURCES src/settings/scrobblersettingspage.cpp src/settings/coverssettingspage.cpp src/settings/lyricssettingspage.cpp - src/settings/acoustidsettingspage.cpp src/settings/networkproxysettingspage.cpp src/settings/radiosettingspage.cpp src/settings/appearancesettingspage.cpp @@ -1029,7 +1028,6 @@ set(HEADERS src/settings/scrobblersettingspage.h src/settings/coverssettingspage.h src/settings/lyricssettingspage.h - src/settings/acoustidsettingspage.h src/settings/networkproxysettingspage.h src/settings/radiosettingspage.h src/settings/appearancesettingspage.h @@ -1185,7 +1183,6 @@ set(UI src/settings/scrobblersettingspage.ui src/settings/coverssettingspage.ui src/settings/lyricssettingspage.ui - src/settings/acoustidsettingspage.ui src/settings/networkproxysettingspage.ui src/settings/radiosettingspage.ui src/settings/appearancesettingspage.ui @@ -1341,10 +1338,14 @@ optional_source(HAVE_TAGFETCHER src/tagfetcher/acoustidclient.cpp src/tagfetcher/musicbrainzclient.cpp src/tagfetcher/tagfetcher.cpp + src/settings/acoustidsettingspage.cpp HEADERS src/tagfetcher/acoustidclient.h src/tagfetcher/musicbrainzclient.h src/tagfetcher/tagfetcher.h + src/settings/acoustidsettingspage.h + UI + src/settings/acoustidsettingspage.ui ) optional_source(HAVE_EBUR128 SOURCES src/engine/ebur128analysis.cpp) diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index 66ab999045..672ba9673c 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -66,13 +66,15 @@ #include "scrobblersettingspage.h" #include "coverssettingspage.h" #include "lyricssettingspage.h" -#include "acoustidsettingspage.h" #include "transcodersettingspage.h" #include "networkproxysettingspage.h" #include "appearancesettingspage.h" #include "contextsettingspage.h" #include "notificationssettingspage.h" #include "globalshortcutssettingspage.h" +#ifdef HAVE_TAGFETCHER +# include "acoustidsettingspage.h" +#endif #ifdef HAVE_MOODBAR # include "moodbarsettingspage.h" #endif @@ -137,7 +139,9 @@ SettingsDialog::SettingsDialog(const SharedPtr player, AddPage(Page::Scrobbler, new ScrobblerSettingsPage(this, scrobbler, this), general); AddPage(Page::Covers, new CoversSettingsPage(this, cover_providers, this), general); AddPage(Page::Lyrics, new LyricsSettingsPage(this, lyrics_providers, this), general); +#ifdef HAVE_TAGFETCHER AddPage(Page::Acoustid, new AcoustidSettingsPage(this, this), general); +#endif AddPage(Page::Transcoding, new TranscoderSettingsPage(this, this), general); AddPage(Page::Proxy, new NetworkProxySettingsPage(this, this), general);