- Package: add flatpak manifests

- Package: rename Install.nsi to Windows.nsi
- Debian: modify control
- Vncserver: fix build error
- Rename org.Rabbit.RemoteControl.desktop to io.github.KangLin.RabbitRemoteControl.desktop

Author: KangLin

.github/workflows/android.yml

@@ -207,7 +207,7 @@ jobs:
 #      working-directory: ${{env.SOURCE_DIR}}
 #      run: |
 #        if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/FreeRDP2 ]; then
-#            git clone -b 3.9.0 --depth=1 https://github.com/FreeRDP/FreeRDP.git
+#            git clone -b 3.14.0 --depth=1 https://github.com/FreeRDP/FreeRDP.git
 #            cd FreeRDP
 #            git submodule update --init --recursive
 #            cmake -E make_directory build

.github/workflows/appimage.yml

@@ -63,7 +63,7 @@ jobs:
           key: install_appimage
 
       - name: build appimage
-        continue-on-error: true
+        #continue-on-error: true
         run: |
           sudo ./Script/build_linux.sh --appimage --install ${{env.INSTALL_DIR}}
           mv RabbitRemoteControl_`uname -m`.AppImage RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_`uname -m`.AppImage
@@ -74,6 +74,7 @@ jobs:
         #continue-on-error: true
         run: |
           sudo Xvfb :91.0 -ac -screen 0 1200x900x24 &
+          sleep 1
           export DISPLAY=:91.0
           echo "Update update_linux.json ......"
           export QT_XCB_GL_INTEGRATION=none

.github/workflows/flatpak.yml

@@ -0,0 +1,29 @@
+# Author: Kang Lin<kl222@126.com>
+name: flatpak
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build_flatpak:
+
+    # See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
+    # See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
+    # See: https://github.com/actions/runner-images/
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Flatpak build
+        run: |
+          sudo apt-get update -y -q
+          sudo apt-get install -y -q flatpak flatpak-builder
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.kde.Sdk//6.8 org.kde.Platform//6.8
+          flatpak-builder --user --force-clean --install build Package/io.github.KangLin.RabbitRemoteControl.json
+

.github/workflows/linux.yml

@@ -63,7 +63,7 @@ jobs:
           key: install_linux
 
       - name: build linux
-        continue-on-error: true
+        #continue-on-error: true
         run: |
           sudo ./Script/build_linux.sh --${{matrix.PACKAGE}} --install ${{env.INSTALL_DIR}}
 
@@ -110,6 +110,7 @@ jobs:
         #continue-on-error: true
         run: |
           sudo Xvfb :91.0 -ac -screen 0 1200x900x24 &
+          sleep 1
           export DISPLAY=:91.0
           echo "Update update_linux.json ......"
           export QT_XCB_GL_INTEGRATION=none

.github/workflows/mingw.yml

@@ -223,7 +223,7 @@ jobs:
           copy /Y C:\msys64\mingw64\bin\*.dll install\bin
           copy /Y ${{env.INSTALL_DIR}}\bin\*.dll install\bin
           copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
-          makensis ${{env.BUILD_DIR}}/Install.nsi
+          makensis ${{env.BUILD_DIR}}/Windows.nsi
           md5sum RabbitRemoteControl_setup_${{env.RabbitRemoteControl_VERSION}}.exe > RabbitRemoteControl_setup_${{env.RabbitRemoteControl_VERSION}}.exe.md5
 
 #      - name: Update artifact

.github/workflows/msvc.yml

@@ -390,7 +390,7 @@ jobs:
           7z a RabbitRemoteControl_windows_${{env.RabbitRemoteControl_VERSION}}.zip .\install\*
           C:\msys64\usr\bin\wget https://npcap.com/dist/npcap-1.80.exe
           copy npcap-1.80.exe install\bin
-          makensis Install.nsi
+          makensis Windows.nsi
           copy /Y RabbitRemoteControl_Setup_${{env.RabbitRemoteControl_VERSION}}.exe RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
 
       - name: Update configure file

App/Client/CMakeLists.txt

@@ -112,10 +112,10 @@ if(WIN32)
             COMPONENT Application)
 endif()
 if(UNIX AND NOT ANDROID)
-    set(APP_ICON_NAME org.Rabbit.RemoteControl)
-    configure_file(${CMAKE_SOURCE_DIR}/share/applications/org.Rabbit.RemoteControl.desktop.in
-        ${CMAKE_BINARY_DIR}/org.Rabbit.RemoteControl.desktop)
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/org.Rabbit.RemoteControl.desktop
+    set(APP_ID io.github.KangLin.RabbitRemoteControl)
+    configure_file(${CMAKE_SOURCE_DIR}/share/applications/${APP_ID}.desktop.in
+        ${CMAKE_BINARY_DIR}/${APP_ID}.desktop)
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/${APP_ID}.desktop
         DESTINATION share/applications
             COMPONENT Application)
     INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/applications/RabbitRemoteControl.sh
@@ -124,7 +124,11 @@ if(UNIX AND NOT ANDROID)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons/rabbit-green/svg/app.svg
         DESTINATION share/pixmaps
             COMPONENT Application
-        RENAME ${APP_ICON_NAME}.svg)
+        RENAME ${APP_ID}.svg)
+    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Resource/icons/rabbit-green/svg/app.svg
+        DESTINATION share/icons/hicolor/200x200/apps
+            COMPONENT Application
+        RENAME ${APP_ID}.svg)
 endif()
 
 # Install QIcon theme

App/Client/android/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.KangLinStudio.RabbitRemoteControl"
+    package="io.github.KangLin.RabbitRemoteControl"
     android:versionName="0.0.32"
     android:versionCode="0"
     android:installLocation="auto">

App/ServiceConfigure/CMakeLists.txt

@@ -49,10 +49,10 @@ ADD_TARGET(NAME ${PROJECT_NAME}
 
 if(UNIX AND NOT ANDROID)
     # Install .desktop file
-    set(APP_ICON_NAME org.Rabbit.RemoteControl.Service.Configure)
-    configure_file(${CMAKE_SOURCE_DIR}/share/applications/org.Rabbit.RemoteControl.Service.Configure.desktop.in
-        ${CMAKE_BINARY_DIR}/org.Rabbit.RemoteControl.Service.Configure.desktop)
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/org.Rabbit.RemoteControl.Service.Configure.desktop
+    set(APP_ICON_NAME io.github.KangLin.RabbitRemoteControl.Service.Configure)
+    configure_file(${CMAKE_SOURCE_DIR}/share/applications/io.github.KangLin.RabbitRemoteControl.Service.Configure.desktop.in
+        ${CMAKE_BINARY_DIR}/io.github.KangLin.RabbitRemoteControl.Service.Configure.desktop)
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/io.github.KangLin.RabbitRemoteControl.Service.Configure.desktop
         DESTINATION share/applications
             COMPONENT Runtime)
     # Install icon of .desktop

CMakeLists.txt

@@ -163,9 +163,9 @@ if(BUILD_EXAMPLE)
 endif()
 
 iF(WIN32)
-    # 替换 Install.nsi 中的 CMAKE_INSTALL_PREFIX 等
-    configure_file(${CMAKE_SOURCE_DIR}/Install/Install.nsi
-        ${CMAKE_BINARY_DIR}/Install.nsi @ONLY)
+    # 替换 Windows.nsi 中的 CMAKE_INSTALL_PREFIX 等
+    configure_file(${CMAKE_SOURCE_DIR}/Package/Windows.nsi
+        ${CMAKE_BINARY_DIR}/Windows.nsi @ONLY)
 endif()
 
 option(BUILD_DOCS "Generating API documentation" OFF)