Merge pull request #91 from saturneric/dev/2.0.10/main

Develop 2.1.0.1

.gitattributes

@@ -0,0 +1 @@
+resource/lfs/** filter=lfs diff=lfs merge=lfs -text

.github/workflows/debug.yml

@@ -23,7 +23,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ 'ubuntu-latest', 'macos-10.15', 'macos-11', 'macos-12', 'windows-latest' ]
+        os: [ 'ubuntu-latest', 'macos-11', 'macos-12', 'windows-latest' ]
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     steps:
@@ -32,7 +32,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-        if: matrix.os == 'windows-latest' || matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if: matrix.os == 'windows-latest' ||  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - uses: actions/checkout@v2
         with:
@@ -53,12 +53,11 @@ jobs:
 
       - name: Install Dependence (macOS)
         run: |
-          brew install cmake autoconf automake qt@5 texinfo gettext openssl@1.1
+          brew install cmake autoconf automake texinfo gettext openssl@1.1
           brew install boost ninja libarchive libconfig gpgme
           brew unlink gettext && brew link --force gettext
-          brew link qt@5
           brew link openssl@1.1 --force
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Build gpg-error (Linux)
         run: |
@@ -92,14 +91,16 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache
-        if: matrix.os == 'ubuntu-latest'
+          key: ${{ runner.os }}-qt-cache-6
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
+          version: '6.4.2'
+          modules: 'qt5compat'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Set up MinGW (Windows)
         uses: msys2/setup-msys2@v2
@@ -113,7 +114,7 @@ jobs:
         run: |
           pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf
           pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake
-          pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel
+          pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 libintl msys2-runtime-devel gettext-devel
           pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg  mingw-w64-x86_64-gpgme
           pacman --noconfirm -S --needed mingw-w64-x86_64-libarchive mingw-w64-x86_64-icu mingw-w64-x86_64-icu-debug-libs
         if: matrix.os == 'windows-latest'
@@ -130,7 +131,7 @@ jobs:
         run: |
           cmake -G Ninja -B ${{github.workspace}}/build  -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON
           cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Configure CMake & Build Binary(Windows)
         shell: msys2 {0}
@@ -158,7 +159,7 @@ jobs:
         with:
           name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
           path: ${{github.workspace}}/build/release/*
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Upload Artifact(Windows)
         uses: actions/upload-artifact@master

.github/workflows/release-deb-package.yml

@@ -36,22 +36,6 @@ jobs:
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
-      - name: Install Dependence (Ubuntu 18.04)
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default
-          sudo apt-get -y install gcc-8 g++-8 ninja-build
-          sudo apt-get -y install libconfig++-dev libboost-all-dev libarchive-dev libssl-dev
-          sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev
-          sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp
-          sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0
-          sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-*
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 8
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 8
-          sudo update-alternatives --set gcc "/usr/bin/gcc-8"
-          sudo update-alternatives --set g++ "/usr/bin/g++-8"
-        if: matrix.os == 'ubuntu-18.04'
-
       - name: Install Dependence (Ubuntu 20.04)
         run: |
           sudo apt-get update
@@ -103,6 +87,7 @@ jobs:
           cd ${{github.workspace}}/build-deb-${{matrix.os}}
           ninja package
           cd ${{github.workspace}}
+          
       - name: Upload Artifact(Linux DEB)
         uses: actions/upload-artifact@master
         with:

.github/workflows/release.yml

@@ -23,15 +23,15 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ 'ubuntu-18.04', 'macos-10.15', 'macos-11', 'macos-12', 'windows-2019' ]
+        os: [ 'ubuntu-18.04', 'macos-11', 'macos-12', 'windows-2019' ]
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     steps:
       - name: Set git to use LF(Windows) or CRLF(MacOS) line endings
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-        if: matrix.os == 'windows-2019' || matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if: matrix.os == 'windows-2019' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - uses: actions/checkout@v2
         with:
@@ -92,16 +92,31 @@ jobs:
 
           mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
+
+      - name: Cache Qt (macOS)
+        id: cache-qt-6
+        uses: actions/cache@v1
+        with:
+          path: ../Qt
+          key: ${{ runner.os }}-qt-cache-6
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
+
+      - name: Install Qt6 (macOS)
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.4.2'
+          modules: 'qt5compat'
+          cached: ${{ steps.cache-qt.outputs.cache-hit }}
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Install Dependence (macOS)
         run: |
-          brew install cmake autoconf automake qt@5 texinfo gettext openssl@1.1
+          brew install cmake autoconf automake texinfo gettext openssl@1.1
           brew install boost ninja libarchive libconfig gpgme
           brew unlink gettext && brew link --force gettext
-          brew link qt@5
           brew link openssl@1.1 --force
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Build gpg-error (Linux)
         run: |
@@ -156,7 +171,7 @@ jobs:
         run: |
           pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf 
           pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake 
-          pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel mingw-w64-x86_64-gpgme
+          pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 libintl msys2-runtime-devel gettext-devel mingw-w64-x86_64-gpgme
           pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
           pacman --noconfirm -S --needed mingw-w64-x86_64-icu mingw-w64-x86_64-icu-debug-libs
         if: matrix.os == 'windows-2019'
@@ -186,7 +201,7 @@ jobs:
           xcodebuild -exportArchive -archivePath ${{github.workspace}}/build/GpgFrontend.xcarchive \
             -exportOptionsPlist ${{github.workspace}}/build/ExportOptions.plist \
             -exportPath ${{github.workspace}}/build/package/
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Package & Sign App Bundle (macOS)
         run: |
@@ -201,7 +216,7 @@ jobs:
             ${{github.workspace}}/build/artifactOut/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.dmg
           mv ${{github.workspace}}/build/GpgFrontend.app.zip \
             ${{github.workspace}}/build/GpgFrontend-${{steps.vars.outputs.sha_short}}-x86_64.zip
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Notarize Release Build (macOS)
         run: |
@@ -210,7 +225,7 @@ jobs:
           --primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \
           -u ${{secrets.APPLE_DEVELOPER_ID}} \
           -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Package App Image (Linux)
         run: |
@@ -243,7 +258,7 @@ jobs:
         with:
           name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}}
           path: ${{github.workspace}}/build/artifactOut/*
-        if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Upload Artifact(Windows)
         uses: actions/upload-artifact@master

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "third_party/json"]
 	path = third_party/json
 	url = https://git.bktus.com/GpgFrontend/json.git
-[submodule "third_party/easyloggingpp"]
-	path = third_party/easyloggingpp
-	url = https://git.bktus.com/GpgFrontend/easyloggingpp.git
 [submodule "third_party/qt-aes"]
 	path = third_party/qt-aes
 	url = https://git.bktus.com/GpgFrontend/Qt-AES.git
@@ -22,3 +19,6 @@
 [submodule "third_party/libconfig"]
 	path = third_party/libconfig
 	url = https://git.bktus.com/GpgFrontend/libconfig.git
+[submodule "third_party/spdlog"]
+	path = third_party/spdlog
+	url = https://git.bktus.com/GpgFrontend/spdlog.git

CMakeLists.txt

@@ -27,7 +27,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 # define project
-project(GpgFrontend VERSION 2.0.10 LANGUAGES CXX)
+project(GpgFrontend VERSION 2.1.0 LANGUAGES CXX)
 
 # show cmake version
 message(STATUS "GpgFrontend Build Configuration Started CMAKE Version ${CMAKE_VERSION}")
@@ -63,6 +63,7 @@ option(GPGFRONTEND_XCODE_TEAM_ID "GpgFrontend Apple Team ID" "NONE")
 option(GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY "GpgFrontend Signing Certificate" "NONE")
 option(GPGFRONTEND_XOCDE_APPID "GpgFrontend Apple AppID" "NONE")
 option(GPGFRONTEND_XOCDE_PROVISIONING_PROFILE_UUID "GpgFrontend ProvisioningProfile UUID" "NONE")
+option(GPGFRONTEND_XOCDE_ENABLE_SANDBOX "Enable SandBox For Xcode Build" OFF)
 
 # analyse options
 if (GPGFRONTEND_BUILD_TYPE_TEST_CORE)
@@ -443,40 +444,6 @@ endif ()
 SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
 SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 
-# disable myeasylog.log
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DELPP_NO_DEFAULT_LOG_FILE")
-
-# Introduce boost
-if(NOT BOOST_ROOT)
-    find_package(Boost COMPONENTS date_time system REQUIRED)
-else()
-    find_package(Boost
-            COMPONENTS date_time system REQUIRED
-            PATHS ${BOOST_ROOT} NO_DEFAULT_PATH)
-endif()
-
-# Introduce OpenSSL
-if(APPLE)
-    set(OPENSSL_ROOT_DIR /usr/local/opt/openssl@1.1)
-endif()
-find_package(OpenSSL REQUIRED)
-
-# Introduce Qt
-if (QT5_ENV_SUPPORT)
-    # Support Qt version Both 5.12.x and 5.15.x
-    find_package(Qt5 5.9 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED)
-
-    # Qt configuration
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_AUTOUIC ON)
-
-    set(CMAKE_AUTORCC_OPTIONS "--compress;9")
-    set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_SOURCE_DIR}/ui)
-
-endif ()
-
-
 if (SMTP_SUPPORT)
     add_compile_definitions(SMTP_SUPPORT)
 endif ()

GpgFrontend.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.print</key>
+	<true/>
+</dict>
+</plist>

README.md

@@ -217,17 +217,23 @@ $ ./linuxdeployqt-continuous-x86_64.AppImage ../release/gpgfrontend/usr/share/ap
 
 ## Languages Support
 
+<<<<<<< HEAD
+The supported languages are listed here. Some languages use machine translation and have not been verified. If you want
+to join translation and verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
+=======
 The supported languages are listed here. Some translations use machine translation and have not been verified. If you want
 to join translation or verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
 
+> > > > > > > main
+
 ### Supported Languages
 
 'zh_CN', 'zh_TW', 'zh_HK', 'es_ES', 'fr_FR', 'de_DE', 'pl_PL', 'ru_RU', 'ja_JP', 'it_IT',
 'ko_KR', 'pt_BR', 'ar_SA', 'ar_IQ', 'hi_IN', 'af_ZA', 'sq_AL', 'be_BY', 'bg_BG', 'ca_ES',
 'hr_HR', 'cs_CZ', 'da_DK', 'nl_NL', 'et_EE', 'fa_IR', 'fi_FI', 'fr_CA', 'he_IL', 'id_ID',
 'lt_LT', 'de_AT', 'de_CH', 'el_GR', 'es_MX', 'iw_IL', 'uk_UA', 'en_US', 'en_GB', 'en_AU',
 
-Notice: Most translations are generated by Google's automatic translation machine.If you find that a certain translation
+Notice: Most translations are generated by Google's automatic translation machine. If you find that a certain translation
 is wrong, you are welcome to join the translation work to provide a more suitable human translation.
 
 ## Contract