Skip to content

Commit a52283f

Browse files
Migrate packaging/CI from Qt5 to Qt6
Replace Qt5 dependencies with Qt6 across CI, docs, packaging and build scripts. Changes include FreeBSD workflow and docs switching to devel/qt6-base, Arch PKGBUILD and Linux build scripts using qt6 package names, Fedora/Copr spec updated to qt6 build/reqs and added conditional Qt5 fallback for OpenSUSE Leap. Homebrew formula now depends on qt@6 and qtbase, Ubuntu build flow enables the 'universe' repo for qt6 packages, and the third-party/tray submodule commit was bumped.
1 parent f0bb54c commit a52283f

File tree

7 files changed

+26
-19
lines changed

7 files changed

+26
-19
lines changed

.github/workflows/ci-freebsd.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,7 @@ jobs:
109109
devel/llvm${{ env.FREEBSD_CLANG_VERSION }} \
110110
devel/ninja \
111111
devel/pkgconf \
112-
devel/qt5-buildtools \
113-
devel/qt5-dbus \
114-
devel/qt5-qmake \
112+
devel/qt6-base \
115113
ftp/curl \
116114
graphics/libdrm \
117115
graphics/wayland \
@@ -128,8 +126,7 @@ jobs:
128126
x11/libXfixes \
129127
x11/libXrandr \
130128
x11/libXtst \
131-
x11-servers/xorg-server \
132-
x11-toolkits/qt5-widgets
129+
x11-servers/xorg-server
133130
134131
# create symlink for shebang bash compatibility
135132
ln -s /usr/local/bin/bash /bin/bash

docs/building.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ pkg install -y \
2929
devel/libevdev \
3030
devel/ninja \
3131
devel/pkgconf \
32-
devel/qt5-buildtools \
33-
devel/qt5-dbus \
34-
devel/qt5-qmake \
32+
devel/qt6-base \
3533
ftp/curl \
3634
graphics/libdrm \
3735
graphics/wayland \
@@ -45,8 +43,7 @@ pkg install -y \
4543
x11/libxcb \
4644
x11/libXfixes \
4745
x11/libXrandr \
48-
x11/libXtst \
49-
x11-toolkits/qt5-widgets
46+
x11/libXtst
5047
```
5148

5249
#### Linux

packaging/linux/Arch/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ depends=(
4747
'numactl'
4848
'openssl'
4949
'opus'
50-
'qt5-base'
50+
'qt6-base'
5151
'udev'
5252
'which'
5353
)

packaging/linux/copr/Sunshine.spec

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ BuildRequires: opus-devel
6767
BuildRequires: pulseaudio-libs-devel
6868
BuildRequires: python3-jinja2
6969
BuildRequires: python3-setuptools
70-
BuildRequires: qt5-qtbase-devel
70+
BuildRequires: qt6-qtbase-devel
7171
BuildRequires: systemd-udev
7272
%{?sysusers_requires_compat}
7373
# for unit tests
@@ -85,7 +85,6 @@ BuildRequires: libminiupnpc-devel
8585
BuildRequires: libnuma-devel
8686
BuildRequires: libopus-devel
8787
BuildRequires: libpulse-devel
88-
BuildRequires: libqt5-qtbase-devel
8988
BuildRequires: npm
9089
BuildRequires: python311
9190
BuildRequires: python311-Jinja2
@@ -123,13 +122,16 @@ BuildRequires: gcc15-c++
123122
# OpenSUSE Leap 15.x
124123
BuildRequires: gcc14
125124
BuildRequires: gcc14-c++
125+
# OpenSUSE Leap: Qt6 not in standard repos, use Qt5
126+
BuildRequires: libqt5-qtbase-devel
126127
%global gcc_version 14
127128
%global cuda_version 12.9.1
128129
%global cuda_build 575.57.08
129130
%else
130131
# OpenSUSE Tumbleweed
131132
BuildRequires: gcc14
132133
BuildRequires: gcc14-c++
134+
BuildRequires: libqt6-qtbase-devel
133135
%global gcc_version 14
134136
%global cuda_version 12.9.1
135137
%global cuda_build 575.57.08
@@ -155,7 +157,7 @@ Requires: libX11 >= 1.7.3.1
155157
Requires: numactl-libs >= 2.0.14
156158
Requires: openssl >= 3.0.2
157159
Requires: pulseaudio-libs >= 10.0
158-
Requires: qt5-qtbase
160+
Requires: qt6-qtbase
159161
%endif
160162

161163
%if 0%{?suse_version}
@@ -171,8 +173,15 @@ Requires: libX11-6
171173
Requires: libnuma1
172174
Requires: libopenssl3
173175
Requires: libpulse0
176+
%if 0%{?suse_version} <= 1699
177+
# OpenSUSE Leap: built with Qt5
174178
Requires: libQt5DBus5
175179
Requires: libQt5Widgets5
180+
%else
181+
# OpenSUSE Tumbleweed: built with Qt6
182+
Requires: libQt6DBus6
183+
Requires: libQt6Widgets6
184+
%endif
176185
%endif
177186

178187
%description

packaging/sunshine.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ class Sunshine < Formula
9090
depends_on "pango"
9191
depends_on "pipewire"
9292
depends_on "pulseaudio"
93-
depends_on "qt@5"
93+
depends_on "qt@6"
94+
depends_on "qtbase"
9495
depends_on "systemd"
9596
depends_on "wayland"
9697

scripts/linux_build.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function add_arch_deps() {
192192
'opus'
193193
'python-jinja' # glad OpenGL/EGL loader generator
194194
'python-setuptools' # glad OpenGL/EGL loader generated, v2.0.0
195-
'qt5-base'
195+
'qt6-base'
196196
'udev'
197197
'wayland'
198198
)
@@ -251,7 +251,7 @@ function add_debian_based_deps() {
251251
"npm" # web-ui
252252
"python3-jinja2" # glad OpenGL/EGL loader generator
253253
"python3-setuptools" # glad OpenGL/EGL loader generated, v2.0.0
254-
"qtbase5-dev"
254+
"qt6-base-dev"
255255
"systemd"
256256
"udev"
257257
"wget" # necessary for cuda install with `run` file
@@ -284,6 +284,9 @@ function add_debian_deps() {
284284
}
285285

286286
function add_ubuntu_deps() {
287+
# Enable universe; qt6-base-dev and several other required packages live there.
288+
$package_install_command "software-properties-common"
289+
${sudo_cmd} add-apt-repository universe -y
287290
add_test_ppa
288291
add_debian_based_deps
289292
return 0
@@ -324,7 +327,7 @@ function add_fedora_deps() {
324327
"pulseaudio-libs-devel"
325328
"python3-jinja2" # glad OpenGL/EGL loader generator
326329
"python3-setuptools" # glad OpenGL/EGL loader generated, v2.0.0
327-
"qt5-qtbase-devel"
330+
"qt6-qtbase-devel"
328331
"rpm-build" # if you want to build an RPM binary package
329332
"wget" # necessary for cuda install with `run` file
330333
"which" # necessary for cuda install with `run` file

0 commit comments

Comments
 (0)