fix

.github/workflows/ci-linux.yml

@@ -74,6 +74,14 @@ jobs:
           modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
           cache: 'true'
 
+      - name: Compile OpenSSLV3
+        run: |
+          echo ${QT_ROOT_DIR}
+          cd ${QT_ROOT_DIR}/../../Tools/OpenSSLV3
+          ./Configure
+          make -j2
+          make install
+
       - name: Create Build Dir
         run: mkdir build
         working-directory: ${{runner.workspace}}
@@ -106,14 +114,14 @@ jobs:
       - name: Build Project
         run: |
           cmake --build . --target pack
-          mv VNote*.AppImage vnote-${{env.VNOTE_VER}}-x64.AppImage
+          mv VNote*.AppImage vnote-${{env.VNOTE_VER}}-linux-x64.AppImage
         working-directory: ${{runner.workspace}}/build
 
       - name: Archive Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: VNote-${{env.VNOTE_VER}}-x64
-          path: ${{runner.workspace}}/build/vnote-${{env.VNOTE_VER}}-x64.AppImage
+          name: VNote-${{env.VNOTE_VER}}-linux-x64
+          path: ${{runner.workspace}}/build/vnote-${{env.VNOTE_VER}}-linux-x64.AppImage
 
       - name: Update Tag
         if: github.ref == 'refs/heads/master'
@@ -126,7 +134,7 @@ jobs:
         uses: johnwbyrd/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-x64
+          files: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-linux-x64
           release: Continuous Build
           tag: continuous-build
 
@@ -135,7 +143,7 @@ jobs:
         uses: ncipollo/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-x64
+          artifacts: ${{runner.workspace}}/build/VNote-${{env.VNOTE_VER}}-linux-x64
           commit: master
           tag: v${{env.VNOTE_VER}}
           allowUpdates: true

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
+cmake_minimum_required (VERSION 3.20)
 project(VNote
     VERSION 3.17.0
     DESCRIPTION "A pleasant note-taking platform"

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.20)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

src/CPackLinuxDeployQt.cmake.in

@@ -8,4 +8,11 @@ execute_process(
     COMMAND env QMAKE=${QMAKE_EXECUTABLE} "${LINUXDEPLOY_EXECUTABLE}" --plugin=qt --output=appimage
         --appdir=${VX_APPIMAGE_DEST_DIR} -e ${CMAKE_CURRENT_BINARY_DIR}/vnote -d ${VX_APPIMAGE_DESKTOP_FILE}
         -i ${CMAKE_CURRENT_LIST_DIR}/data/core/logo/64x64/vnote.png
+        -l ${QT_PLUGINS_DIR}/platformthemes/libqgtk3.so
+        -l /usr/local/lib64/libssl.so.3
+        -l /usr/local/lib64/libcrypto.so.3
+        --exclude-library=libssl.so.1*
+        --exclude-library=libcrypto.so.1*
+        --exclude-library=libnss3.so
+        --exclude-library=libnssutil3.so
     WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY})

src/Packaging.cmake

@@ -6,6 +6,10 @@ get_filename_component(QT_BIN_DIR "${QMAKE_EXECUTABLE}" DIRECTORY)
 execute_process(COMMAND ${QMAKE_EXECUTABLE} -query QT_VERSION OUTPUT_VARIABLE QT_VERSION)
 
 set(QT_TOOLS_DIR "${QT_BIN_DIR}/../../../Tools")
+cmake_path(NORMAL_PATH QT_TOOLS_DIR OUTPUT_VARIABLE QT_TOOLS_DIR)
+
+set(QT_PLUGINS_DIR "${QT_BIN_DIR}/../plugins")
+cmake_path(NORMAL_PATH QT_PLUGINS_DIR OUTPUT_VARIABLE QT_PLUGINS_DIR)
 
 # To use the specific version of Qt
 set(WINDEPLOYQT_EXECUTABLE "${QT_BIN_DIR}/windeployqt.exe")
@@ -49,7 +53,6 @@ function(windeployqt target)
 
     install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/winqt/" DESTINATION "${CMAKE_INSTALL_BINDIR}" OPTIONAL)
 
-    cmake_path(NORMAL_PATH QT_TOOLS_DIR OUTPUT_VARIABLE QT_TOOLS_DIR)
     set(OPENSSL_ROOT_DIR "${QT_TOOLS_DIR}/OpenSSL/Win_x64" CACHE STRING "OpenSSL dir")
     file(GLOB OPENSSL_LIBS_FILES "${OPENSSL_ROOT_DIR}/bin/lib*.dll")
     cmake_path(NORMAL_PATH OPENSSL_LIBS_FILES OUTPUT_VARIABLE OPENSSL_LIBS_FILES)