Skip to content

Commit

Permalink
audqt: Require and check for Qt SVG module
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
radioactiveman committed Jun 3, 2024
1 parent 7a958b5 commit 46cb930
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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

Expand Down

0 comments on commit 46cb930

Please sign in to comment.