CI: modify android.yml

KangLin · KangLin · commit 69b46a8e2ace · 2026-03-22T21:52:18.000+08:00
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -143,6 +143,62 @@ jobs:
         run: |
           sudo chmod 777 ${QT_ROOT_DIR}/bin/qt-cmake
 
+      - name: libpcap
+        working-directory: ${{env.SOURCE_DIR}}
+        run: |
+          if [ ! -f ${{env.INSTALL_DIR}}/lib/libpcap.a ]; then
+              wget https://www.tcpdump.org/release/libpcap-1.10.6.tar.xz
+              tar xvf libpcap-1.10.6.tar.xz
+              cd libpcap-1.10.6
+              cmake -E make_directory build
+              cd build
+              cmake .. -DCMAKE_BUILD_TYPE=Release \
+                  -DBUILD_SHARED_LIBS=OFF \
+                  -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
+                  -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
+                  -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
+                  -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
+                  -DANDROID_ABI=${{env.ANDROID_ABI}} \
+                  -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+                  -DVCPKG_VERBOSE=ON \
+                  -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
+                  -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
+                  -DVCPKG_TRACE_FIND_PACKAGE=ON \
+                  -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/RabbitVNC/vcpkg_installed
+              cmake --build . --config Release
+              cmake --build . --config Release --target install
+          fi
+
+      - name: pcapplusplus
+        #if: false
+        working-directory: ${{env.SOURCE_DIR}}
+        run: |
+          if [ ! -d ${{ env.INSTALL_DIR }}/lib/cmake/pcapplusplus ]; then
+              git clone -b v25.05 --depth=1 https://github.com/seladb/PcapPlusPlus.git
+              cd PcapPlusPlus
+              cmake -E make_directory build
+              cd build
+              cmake .. -DCMAKE_BUILD_TYPE=Release \
+                  -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
+                  -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
+                  -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \
+                  -DCMAKE_TOOLCHAIN_FILE="${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake" \
+                  -DANDROID_ABI=${{env.ANDROID_ABI}} \
+                  -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
+                  -DVCPKG_VERBOSE=ON \
+                  -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
+                  -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
+                  -DVCPKG_TRACE_FIND_PACKAGE=ON \
+                  -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/RabbitVNC/vcpkg_installed \
+                  -DPCAPPP_BUILD_EXAMPLES=OFF \
+                  -DPCAPPP_BUILD_TESTS=OFF \
+                  -DPCAPPP_BUILD_TUTORIALS=OFF \
+                  -DPCAP_LIBRARY=${{env.INSTALL_DIR}}/lib/libpcap.a \
+                  -DPCAP_INCLUDE_DIR=${{env.INSTALL_DIR}}/include
+              cmake --build . --config Release
+              cmake --build . --config Release --target install
+          fi
+
       - name: build RabbitVNC
         if: false
         working-directory: ${{env.SOURCE_DIR}}
@@ -280,16 +336,13 @@ jobs:
               cd lxqt-build-tools
               cmake -E make_directory build
               cd build
-              ${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
-                  -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
-                  -DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
-                  -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR} \
-                  -DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
-                  -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-                  -DVCPKG_VERBOSE=ON \
-                  -DVCPKG_TRACE_FIND_PACKAGE=ON \
-                  -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
-                  -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
+              ${QT_ROOT_DIR}/bin/qt-cmake .. \
+                -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
+                -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
+                -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
+                -DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
+                -DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
+                -DCMAKE_VERBOSE_MAKEFILE=${BUILD_VERBOSE}
               cmake --build .  --config ${{matrix.BUILD_TYPE}}
               cmake --build .  --config ${{matrix.BUILD_TYPE}} --target install
           fi
@@ -303,18 +356,13 @@ jobs:
               cd qtermwidget
               cmake -E make_directory build
               cd build
-              ${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
+              ${QT_ROOT_DIR}/bin/qt-cmake .. \
+                  -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
                   -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
                   -Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools \
                   -DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
                   -DQt6LinguistTools_DIR=${QT_ROOT_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
-                  -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
-                  -DQT_CHAINLOAD_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
-                  -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-                  -DVCPKG_VERBOSE=ON \
-                  -DVCPKG_TRACE_FIND_PACKAGE=ON \
-                  -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
-                  -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
+                  -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake
               cmake --build .  --config ${{matrix.BUILD_TYPE}}
               cmake --build .  --config ${{matrix.BUILD_TYPE}} --target install
           fi
@@ -328,7 +376,8 @@ jobs:
             cd qtkeychain
             cmake -E make_directory build
             cd build
-            ${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
+            ${QT_ROOT_DIR}/bin/qt-cmake .. \
+                -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
                 -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
                 -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
                 -DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
@@ -347,7 +396,8 @@ jobs:
             cd QFtpServer
             cmake -E make_directory build
             cd build
-            ${QT_ROOT_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
+            ${QT_ROOT_DIR}/bin/qt-cmake .. \
+                -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
                 -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
                 -DCMAKE_PREFIX_PATH=${QT_ROOT_DIR}:${{env.INSTALL_DIR}}/lib/cmake \
                 -DQT_HOST_PATH=${QT_ROOT_DIR}/../gcc_64 \
@@ -406,6 +456,7 @@ jobs:
               -DRabbitVNC_DIR=${{env.INSTALL_DIR}}/lib/cmake/RabbitVNC \
               -Dtigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc \
               -Dqtermwidget6_DIR=${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6 \
+              -DPcapPlusPlus_DIR=${{env.INSTALL_DIR}}/lib/cmake/pcapplusplus \
               -DINSTALL_QTERMWIDGET=ON \
               -DQt6Keychain_DIR=${{env.INSTALL_DIR}}/lib/cmake/Qt6Keychain \
               -DINSTALL_QTKEYCHAIN=ON \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -228,7 +228,7 @@ jobs:
           echo "|Debian 13|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_x86_64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_debian13_aarch64.deb)| |Run \`sudo apt install ./rabbitremotecontrol_*.deb\` to install it. | 运行命令 \`sudo apt install ./rabbitremotecontrol_*.deb\` 进行安装。 |" >> ${{github.workspace}}/Release.md
 
           RPM_VERSION=${RabbitRemoteControl_VERSION//-/\_}
-          echo "|Fedora 41|[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc41.x86_64.rpm)| |[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc41.aarch64.rpm)| |Run \`sudo dnf install \"rpm file\"\` to install it. |执行命令  \`sudo dnf install \"rpm file\"\`  进行安装。 |" >> ${{github.workspace}}/Release.md
+          echo "|Fedora 42|[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc42.x86_64.rpm)| |[RPM](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol-${RPM_VERSION}-1.fc42.aarch64.rpm)| |Run \`sudo dnf install \"rpm file\"\` to install it. |执行命令  \`sudo dnf install \"rpm file\"\`  进行安装。 |" >> ${{github.workspace}}/Release.md
 
           echo "|Flatpak|[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.flatpak)| |[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64.flatpak)| |Run \`flatpak install \"flatpak File\" [--user]\` to install it.|执行命令  \`flatpak install \"flatpak File\" [--user]\`  进行安装。|" >> ${{github.workspace}}/Release.md
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -64,11 +64,11 @@ jobs:
 
           - PACKAGE: rpm
             image: fedora
-            lable: "41"
+            lable: "42"
             os: ubuntu-24.04
           - PACKAGE: rpm
             image: fedora
-            lable: "41"
+            lable: "42"
             os: ubuntu-24.04-arm
 
     # See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -95,7 +95,7 @@ jobs:
         run: |
           # See: https://formulae.brew.sh/
           brew update
-          brew install nasm autoconf automake libtool pkg-config zstd libpcap libvncserver # pcapplusplus qt qtkeychain
+          brew install nasm autoconf automake ninja make libtool pkg-config zstd libpcap libvncserver # pcapplusplus qt qtkeychain
 
       - name: build RabbitVNC
         if: false
@@ -135,7 +135,8 @@ jobs:
                 -DVCPKG_INSTALLED_DIR=${{env.INSTALL_DIR}}/tigervnc/vcpkg_installed \
                 -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON \
                 -DVCPKG_VERBOSE=ON \
-                -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}}
+                -DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} \
+                -DBUILD_TESTS=OFF -DBUILD_VIEWER=OFF -DENABLE_NLS=OFF
             cmake --build . --config Release
             cmake --install . --config Release --strip
           fi
diff --git a/docs/Compile/Android_zh_CN.md b/docs/Compile/Android_zh_CN.md
@@ -189,6 +189,7 @@
   - qtermwidget5_DIR: [QTermWidget 安装目录]/lib/cmake/qtermwidget5
   - libssh_DIR: [libssh 安装目录]/lib/cmake/libssh
   - QtService_DIR: [QtService 安装目录]/lib/cmake/QtService
+  - PcapPlusPlus_DIR: [PcapPlusPlus 安装目录]/lib/cmake/pcapplusplus
 - 如果使用 vcpkg，增加下面参数
   - 因为使用了 vcpkg 清单模式，所以依赖库在 `vcpkg.json` 中。
   - CMAKE_TOOLCHAIN_FILE: [vcpkg 安装目录]/scripts/buildsystems/vcpkg.cmake
diff --git a/docs/Compile/Linux.md b/docs/Compile/Linux.md
@@ -519,7 +519,7 @@ It is depended by PcapPlusPlus
   + LibVNCServer_DIR: [libvncserver installation path]/lib/cmake/LibVNCServer
   + LibDataChannel_DIR: [libdatachannel installation path]/lib/cmake/LibDataChannel
   + QXmpp_DIR=[QXmpp installation path]/lib/cmake/qxmpp
-  + qtermwidget5_DIR: [qtermwidget installation path]/lib/cmake/qtermwidget5
+  + qtermwidget6_DIR: [qtermwidget installation path]/lib/cmake/qtermwidget6
   + libssh_DIR: [libssh installation path]/lib/cmake/libssh
   + QtService_DIR: [QtService installation path]/lib/cmake/QtService
   + PcapPlusPlus_DIR: [PcapPlusPlus install path]/lib/cmake/pcapplusplus
diff --git a/docs/Compile/Linux_zh_CN.md b/docs/Compile/Linux_zh_CN.md
@@ -513,9 +513,10 @@ PcapPlusPlus 依赖此库。
   + LibVNCServer_DIR: [libvncserver 安装目录]/lib/cmake/LibVNCServer
   + LibDataChannel_DIR: [libdatachannel 安装目录]/lib/cmake/LibDataChannel
   + QXmpp_DIR=[QXmpp 安装目录]/lib/cmake/qxmpp
-  + qtermwidget5_DIR: [qtermwidget 安装目录]/lib/cmake/qtermwidget5
+  + qtermwidget6_DIR: [qtermwidget 安装目录]/lib/cmake/qtermwidget6
   + libssh_DIR: [libssh 安装目录]/lib/cmake/libssh
   + QtService_DIR: [QtService 安装目录]/lib/cmake/QtService
+  + PcapPlusPlus_DIR: [PcapPlusPlus 安装目录]/lib/cmake/pcapplusplus
 - 如果使用 vcpkg，增加下面参数
   + CMAKE_TOOLCHAIN_FILE: [vcpkg installation path]/scripts/buildsystems/vcpkg.cmake
   + VCPKG_MANIFEST_FEATURES: vcpkg 中的清单功能
diff --git a/docs/Compile/Windows.md b/docs/Compile/Windows.md
@@ -368,7 +368,8 @@ See: [msvc.yml](.github\workflows\msvc.yml)
   + LibVNCServer_DIR: [libvncserver installation path]/lib/cmake/LibVNCServer
   + libdatachannel_DIR: [libdatachannel installation path]/lib/cmake/LibDataChannel
   + QXmpp_DIR=[QXmpp installation path]/lib/cmake/qxmpp
-  + QTermWidget5_DIR: [QTermWidget installation path]/lib/cmake/qtermwidget5
+  + QTermWidget6_DIR: [QTermWidget installation path]/lib/cmake/qtermwidget6
+  + PcapPlusPlus_DIR: [PcapPlusPlus install path]/lib/cmake/pcapplusplus
   + libssh_DIR: [libssh installation path]/lib/cmake/libssh
   + QtService_DIR: [QtService installation path]/lib/cmake/QtService
 - If using vcpkg, please set the CMake parameters:
diff --git a/docs/Compile/Windows_zh_CN.md b/docs/Compile/Windows_zh_CN.md
@@ -373,7 +373,8 @@ Windows10 及以后的版本需要 [npcap](https://npcap.com)
   + LibVNCServer_DIR: [libvncserver 安装目录]/lib/cmake/LibVNCServer
   + libdatachannel_DIR: [libdatachannel 安装目录]/lib/cmake/LibDataChannel
   + QXmpp_DIR=[QXmpp 安装目录]/lib/cmake/qxmpp
-  + qtermwidget5_DIR: [QTermWidget 安装目录]/lib/cmake/qtermwidget5
+  + qtermwidget6_DIR: [QTermWidget 安装目录]/lib/cmake/qtermwidget6
+  + PcapPlusPlus_DIR: [PcapPlusPlus 安装目录]/lib/cmake/pcapplusplus
   + libssh_DIR: [libssh 安装目录]/lib/cmake/libssh
   + QtService_DIR: [QtService 安装目录]/lib/cmake/QtService
 - 如果使用 vcpkg，增加下面参数
