From 46cb930f2695d5dc73c83711d1e222e66e6fc62d Mon Sep 17 00:00:00 2001
From: Thomas Lange <thomas-lange2@gmx.de>
Date: Mon, 3 Jun 2024 22:49:32 +0200
Subject: [PATCH] audqt: Require and check for Qt SVG module

If not installed, Audacious does neither show
SVG icons nor our logo in the about dialog.

It also gives package maintainers a better indicator
that Audacious depends on it at runtime.
---
 acinclude.m4 | 4 ++--
 meson.build  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 3659a2807..8ff242172 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -232,7 +232,7 @@ AC_ARG_ENABLE(qt5,
 if test $USE_QT5 = yes ; then
     PKG_CHECK_MODULES([QTCORE], [Qt5Core >= 5.2])
     PKG_CHECK_VAR([QTBINPATH], [Qt5Core >= 5.2], [host_bins])
-    PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets >= 5.2])
+    PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2])
     AC_DEFINE([USE_QT], [1], [Define if Qt support enabled])
 
     # needed if Qt was built with -reduce-relocations
@@ -241,7 +241,7 @@ if test $USE_QT5 = yes ; then
 elif test $USE_QT = yes ; then
     PKG_CHECK_MODULES([QTCORE], [Qt6Core >= 6.0])
     PKG_CHECK_VAR([QTBINPATH], [Qt6Core >= 6.0], [libexecdir])
-    PKG_CHECK_MODULES([QT], [Qt6Core Qt6Gui Qt6Widgets >= 6.0])
+    PKG_CHECK_MODULES([QT], [Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0])
     AC_DEFINE([USE_QT], [1], [Define if Qt support enabled])
 fi
 
diff --git a/meson.build b/meson.build
index 0ef2a22ce..61e0bf699 100644
--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ if get_option('qt')
   if get_option('qt5')
     qt = import('qt5')
     qt_req = '>= 5.2'
-    qt_dep = dependency('qt5', version: qt_req, required: true, modules: ['Core', 'Widgets', 'Gui'])
+    qt_dep = dependency('qt5', version: qt_req, required: true, modules: ['Core', 'Widgets', 'Gui', 'Svg'])
   else
     if meson.version().version_compare('>= 0.57')
       qt = import('qt6')
@@ -33,7 +33,7 @@ if get_option('qt')
     endif
 
     qt_req = '>= 6.0'
-    qt_dep = dependency('qt6', version: qt_req, required: true, modules: ['Core', 'Widgets', 'Gui'])
+    qt_dep = dependency('qt6', version: qt_req, required: true, modules: ['Core', 'Widgets', 'Gui', 'Svg'])
   endif
 endif