File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ rp_module_flags="!all 64bit"
19
19
20
20
function _get_commit_dolphin() {
21
21
local commit
22
- local has_qt6=$( apt-cache madison qt6-base-private-dev 2> /dev/null | cut -d' |' -f1)
22
+ local has_qt6=$( apt-cache -qq madison qt6-base-private-dev | cut -d' |' -f1)
23
23
# current HEAD of dolphin doesn't build without a C++20 capable compiler ..
24
24
[[ " $__gcc_version " -lt 10 ]] && commit=" f59f1a2a"
25
25
# .. and without QT6
@@ -36,9 +36,15 @@ function depends_dolphin() {
36
36
return 1
37
37
fi
38
38
# check if qt6 is available, otherwise use qt5
39
- local has_qt6=$( apt-cache madison qt6-base-private-dev 2> /dev/null | cut -d' |' -f1)
39
+ local has_qt6=$( apt-cache -qq madison qt6-base-private-dev | cut -d' |' -f1)
40
40
if [[ -n " $has_qt6 " ]]; then
41
- depends+=(qt6-base-private-dev qt6-svg-dev)
41
+ depends+=(qt6-base-private-dev)
42
+ # Older Ubuntu versions provide libqt6svg6-dev instead of Debian's qt6-svg-dev
43
+ if [[ -n " $__os_ubuntu_ver " ]] && compareVersions " $__os_ubuntu_ver " lt 23.04; then
44
+ depends+=(libqt6svg6-dev)
45
+ else
46
+ depends+=(qt6-svg-dev)
47
+ fi
42
48
else
43
49
depends+=(qtbase5-private-dev)
44
50
fi
You can’t perform that action at this time.
0 commit comments