Skip to content

Commit c50e75a

Browse files
KangLinKangLin
committed
CI: add speech
1 parent e082dd7 commit c50e75a

9 files changed

Lines changed: 28 additions & 20 deletions

File tree

‎.github/workflows/macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
SOURCE_DIR: ${{github.workspace}}/.cache/source
5252
TOOLS_DIR: ${{github.workspace}}/.cache/tools
5353
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}
54-
qt_modules: "qtscxml qtmultimedia qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine"
54+
qt_modules: "qtscxml qtmultimedia qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine qtspeech qtvirtualkeyboard"
5555
VCPKGGITCOMMITID: 7213cf8135c329c37c7e2778e40774489a0583a8
5656
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5757
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}

‎.github/workflows/msvc.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
BUILD_TYPE: Release
2222
qt_version: 6.10.2
2323
qt_arch: win64_msvc2022_64
24-
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
24+
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine qtspeech qtvirtualkeyboard
2525
os: windows-2022
2626

2727
- CMAKE_GENERATOR_PLATFORM: arm64
@@ -30,7 +30,7 @@ jobs:
3030
BUILD_TYPE: Release
3131
qt_version: 6.10.2
3232
qt_arch: win64_msvc2022_arm64
33-
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
33+
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets qtspeech qtvirtualkeyboard
3434
os: windows-11-arm
3535

3636
- CMAKE_GENERATOR_PLATFORM: x64
@@ -39,7 +39,7 @@ jobs:
3939
BUILD_TYPE: Release
4040
qt_version: 6.9.3
4141
qt_arch: win64_msvc2022_64
42-
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
42+
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine qtspeech qtvirtualkeyboard
4343
os: windows-2022
4444

4545
- CMAKE_GENERATOR_PLATFORM: arm64
@@ -48,7 +48,7 @@ jobs:
4848
BUILD_TYPE: Release
4949
qt_version: 6.9.3
5050
qt_arch: win64_msvc2022_arm64
51-
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
51+
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets qtspeech qtvirtualkeyboard
5252
os: windows-11-arm
5353

5454
- CMAKE_GENERATOR_PLATFORM: Win32

‎Package/debian/control.debian.12‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Maintainer: Kang Lin <kl222@126.com>
77
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
88
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
99
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
10-
libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc,
10+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13+
qt6-speech-dev,
1314
libssl-dev, libcrypt-dev, libcmark-dev,
1415
freerdp2-dev, libvncserver-dev, libpcap-dev,
1516
qtkeychain-qt6-dev, libcurl4-openssl-dev,
@@ -26,7 +27,7 @@ Section: net
2627
Architecture: any
2728
#Pre-Depends: ${misc:Pre-Depends}
2829
#Suggests: libqt6svg6
29-
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libmariadb3,
30+
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libqt6sql6-psql, libmariadb3,
3031
${shlibs:Depends}, ${misc:Depends}
3132
Replaces: rabbitcommon (>=2.3.2)
3233
Description: Rabbit Remote Control

‎Package/debian/control.debian.13‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Maintainer: Kang Lin <kl222@126.com>
77
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
88
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
99
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
10-
libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc,
10+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13+
qt6-speech-dev,
1314
libssl-dev, libcrypt-dev, libcmark-dev,
1415
freerdp3-dev, libvncserver-dev, libpcap-dev,
1516
qtkeychain-qt6-dev, libcurl4-openssl-dev,
@@ -26,7 +27,7 @@ Section: net
2627
Architecture: any
2728
#Pre-Depends: ${misc:Pre-Depends}
2829
#Suggests: libqt6svg6
29-
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libmariadb3,
30+
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libqt6sql6-psql, libmariadb3,
3031
${shlibs:Depends}, ${misc:Depends}
3132
Replaces: rabbitcommon (>=2.3.2)
3233
Description: Rabbit Remote Control

‎Package/debian/control.default‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Maintainer: Kang Lin <kl222@126.com>
77
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
88
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
99
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
10-
libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc,
10+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13+
qt6-speech-dev,
1314
libssl-dev, libcrypt-dev, libcmark-dev,
1415
freerdp2-dev, libvncserver-dev, libpcap-dev,
1516
qtkeychain-qt6-dev, libcurl4-openssl-dev,
@@ -26,7 +27,7 @@ Section: net
2627
Architecture: any
2728
#Pre-Depends: ${misc:Pre-Depends}
2829
#Suggests: libqt6svg6
29-
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libmysqlclient21,
30+
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libqt6sql6-psql, libmysqlclient21,
3031
${shlibs:Depends}, ${misc:Depends}
3132
Replaces: rabbitcommon (>=2.3.2)
3233
Description: Rabbit Remote Control

‎Package/debian/control.ubuntu.26‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ Maintainer: Kang Lin <kl222@126.com>
77
Build-Depends: debhelper(>=13), debhelper-compat(=13), fakeroot, cmake(>=3.21),
88
ninja-build, qmake6, qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools,
99
qt6-qpa-plugins, qt6-svg-dev, qt6-l10n-tools, qt6-translations-l10n,
10-
libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc,
10+
libqt6sql6-mysql, libqt6sql6-odbc, libqt6sql6-sqlite, libqt6sql6-psql,
1111
qt6-scxml-dev, qt6-multimedia-dev, qt6-serialport-dev, qt6-websockets-dev,
1212
qt6-webengine-dev, qt6-webengine-dev-tools, qt6-positioning-dev, qt6-webchannel-dev,
13+
qt6-speech-dev,
1314
libssl-dev, libcrypt-dev, libcmark-dev,
1415
freerdp3-dev, libvncserver-dev, libpcap-dev,
1516
qtkeychain-qt6-dev, libcurl4-openssl-dev,
@@ -26,7 +27,7 @@ Section: net
2627
Architecture: any
2728
#Pre-Depends: ${misc:Pre-Depends}
2829
#Suggests: libqt6svg6
29-
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libmysqlclient24,
30+
Depends: libqt6sql6-mysql, libqt6sql6-sqlite, libqt6sql6-odbc, libqt6sql6-psql, libmysqlclient24,
3031
${shlibs:Depends}, ${misc:Depends}
3132
Replaces: rabbitcommon (>=2.3.2)
3233
Description: Rabbit Remote Control

‎Package/rpm/rabbitremotecontrol.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ BuildRequires: cmake desktop-file-utils appstream curl wget
2222
# Qt6
2323
BuildRequires: qt6-qttools-devel qt6-qtbase-devel
2424
BuildRequires: qt6-qt5compat-devel qt6-qtmultimedia-devel qt6-qtscxml-devel
25-
BuildRequires: qt6-qtserialport-devel qt6-qtsvg-devel
25+
BuildRequires: qt6-qtserialport-devel qt6-qtsvg-devel qt6-qtspeech-devel
2626
BuildRequires: qt6-qtwebengine-devel qt6-qtwebengine-devtools qt6-qtpositioning-devel qt6-qtwebchannel-devel
2727

2828
BuildRequires: qtkeychain-qt6-devel qtermwidget-devel
@@ -47,9 +47,9 @@ BuildRequires: mysql-devel
4747
Requires: openssl libpng libjpeg-turbo pixman openh264 ffmpeg-free libssh libicu lzo libgcrypt
4848
Requires: libvncserver libwinpr freerdp fuse3 libpcap libcurl
4949
Requires: zlib gnutls nettle gmp pam
50-
Requires: qt6-qtbase qt6-qtmultimedia qt6-qt5compat qt6-qtmultimedia qt6-qtscxml
51-
Requires: qt6-qtserialport qt6-qtsvg qt6-qtbase-mysql
52-
Requires: qt6-qtwebengine qt6-qtpositioning qt6-qtwebchannel
50+
Requires: qt6-qtbase qt6-qtbase-mysql qt6-qtbase-odbc qt6-qtbase-psql
51+
Requires: qt6-qtmultimedia qt6-qt5compat qt6-qtscxml qt6-qtserialport qt6-qtsvg
52+
Requires: qt6-qtwebengine qt6-qtpositioning qt6-qtwebchannel qt6-qtspeech
5353
Requires: qtkeychain-qt6 qtermwidget
5454
Requires: mysql-libs
5555

‎Script/build_depend.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,8 @@ if [ $DEFAULT_LIBS -eq 1 ]; then
630630
qt6-svg-dev qt6-l10n-tools qt6-translations-l10n \
631631
qt6-scxml-dev qt6-multimedia-dev qt6-serialport-dev qt6-websockets-dev \
632632
qt6-webengine-dev qt6-webengine-dev-tools qt6-positioning-dev qt6-webchannel-dev \
633-
libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-odbc
633+
libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-odbc libqt6sql6-psql \
634+
qt6-virtualkeyboard-dev qml6-module-qtquick-virtualkeyboard qt6-speech-dev
634635
fi
635636
if [ $QTKEYCHAIN -ne 1 ]; then
636637
package_install qtkeychain-qt6-dev
@@ -669,10 +670,10 @@ if [ $QT -eq 1 ]; then
669670

670671
echo "PATH: $PATH"
671672
if [ "`uname -m`" == "x86_64" ]; then
672-
aqt install-qt linux desktop ${QT_VERSION} linux_gcc_64 -m qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
673+
aqt install-qt linux desktop ${QT_VERSION} linux_gcc_64 -m qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine qtspeech qtvirtualkeyboard
673674
mv ${QT_VERSION}/gcc_64 qt_`uname -m`
674675
elif [ "`uname -m`" == "aarch64" ]; then
675-
aqt install-qt linux_arm64 desktop ${QT_VERSION} linux_gcc_arm64 -m qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
676+
aqt install-qt linux_arm64 desktop ${QT_VERSION} linux_gcc_arm64 -m qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine qtspeech qtvirtualkeyboard
676677
mv ${QT_VERSION}/gcc_arm64 qt_`uname -m`
677678
fi
678679
fi

‎Script/build_linux.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ if [ $DEB -eq 1 ]; then
436436
--tools=${TOOLS_DIR} \
437437
--verbose=${BUILD_VERBOSE}
438438

439+
# Disable ci warn
439440
if [ $CI ]; then
440441
git config --global --add safe.directory $REPO_ROOT
441442
fi
@@ -483,6 +484,7 @@ if [ $APPIMAGE -eq 1 ]; then
483484
--tools=${TOOLS_DIR} \
484485
--verbose=${BUILD_VERBOSE}
485486

487+
# Disable ci warn
486488
if [ $CI ]; then
487489
git config --global --add safe.directory $REPO_ROOT
488490
fi
@@ -520,6 +522,7 @@ if [ $MACOS -eq 1 ]; then
520522

521523
export RabbitCommon_ROOT=${SOURCE_DIR}/RabbitCommon
522524

525+
# Disable ci warn
523526
if [ $CI ]; then
524527
git config --global --add safe.directory $REPO_ROOT
525528
fi

0 commit comments

Comments
 (0)