Merge pull request #148 from saturneric/develop

Develop 2.1.3.1
saturneric · May 11, 2024 · f909f2c · f909f2c
2 parents feb6483 + 952ed73
commit f909f2c
Show file tree

Hide file tree

Showing 250 changed files with 15,394 additions and 7,801 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           lfs: 'false'
           submodules: recursive
@@ -97,9 +97,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.6.1'
+          version: '6.5.3'
           cache: 'true'
-          modules: 'qt5compat'
 
       - name: Configure CMake && Build GpgFrontend 
         run: |

diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml
@@ -23,7 +23,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ 'windows-2019' ]
+        os: [ 'ubuntu-20.04', 'windows-2019' ]
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     steps:
@@ -33,7 +33,7 @@ jobs:
           git config --global core.eol lf
         if: matrix.os == 'windows-2019'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: 'false'
           submodules: recursive
@@ -58,6 +58,25 @@ jobs:
           pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
         if: matrix.os == 'windows-2019'
 
+      - name: Install Dependence (Linux)
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo
+          sudo apt-get -y install gcc g++ ninja-build
+          sudo apt-get -y install 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 libgcrypt20-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 libxcb-image0
+          sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libxcb-* libxkbcommon-x11-0
+        if: matrix.os == 'ubuntu-20.04'
+
+      - name: Install Qt5
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '5.15.2'
+          cache: 'true'
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Build gpg-error (Windows)
         shell: msys2 {0}
         run: |
@@ -69,6 +88,16 @@ jobs:
           cd ${{github.workspace}}
         if: matrix.os == 'windows-2019'
 
+      - name: Build gpg-error (Linux)
+        run: |
+          git clone --depth 1 --branch libgpg-error-1.47 git://git.gnupg.org/libgpg-error.git ${{github.workspace}}/third_party/libgpg-error
+          cd  ${{github.workspace}}/third_party/libgpg-error
+          ./autogen.sh
+          ./configure --enable-maintainer-mode && make -j4
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Build assuan (Windows)
         shell: msys2 {0}
         run: |
@@ -79,6 +108,16 @@ jobs:
           make install
           cd ${{github.workspace}}
         if: matrix.os == 'windows-2019'
+
+      - name: Build assuan (Linux)
+        run: |
+          git clone --depth 1 --branch libassuan-2.5.6 git://git.gnupg.org/libassuan.git ${{github.workspace}}/third_party/libassuan
+          cd ${{github.workspace}}/third_party/libassuan
+          ./autogen.sh
+          ./configure --enable-maintainer-mode && make -j4
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-20.04'
 
       - name: Build GpgME (Windows)
         shell: msys2 {0}
@@ -90,17 +129,49 @@ jobs:
           make install
           cd ${{github.workspace}}
         if: matrix.os == 'windows-2019'
+
+      - name: Build GpgME (Linux)
+        run: |
+          git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
+          cd ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4
+          sudo make install
+          cd ${{github.workspace}}
+        if: matrix.os == 'ubuntu-20.04'
 
       - name: Configure CMake & Build Binary(Windows)
         shell: msys2 {0}
         run: |
           cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
           mkdir build && cd build
           cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_STABLE=ON -DGPGFRONTEND_QT5_BUILD=ON ..
-          # Build your program with the given configuration
           cmake --build . --config ${{env.BUILD_TYPE}}  -- -j 4
         if: matrix.os == 'windows-2019'
 
+      - name: Build GpgFrontend (Linux)
+        # Build your GpgFrontend with the given configuration
+        run: |
+          cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_QT5_BUILD=ON
+          cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
+        if: matrix.os == 'ubuntu-20.04'
+
+      - name: Package App Image (Linux)
+        run: |
+          mkdir ${{github.workspace}}/build/final-artifact
+          cd ${{github.workspace}}/build/final-artifact
+          wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+          chmod u+x linuxdeployqt-continuous-x86_64.AppImage
+          ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -executable-dir=${{github.workspace}}/build/artifacts/AppDir/usr/plugins/mods/
+        if: matrix.os == 'ubuntu-20.04'
+
+      - name: Upload Artifact(Linux)
+        uses: actions/upload-artifact@master
+        with:
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{ github.sha }}
+          path: ${{github.workspace}}/build/final-artifact/Gpg_Frontend*.AppImage*
+        if: matrix.os == 'ubuntu-20.04'
+
       - name: Upload Artifact(Windows)
         uses: actions/upload-artifact@master
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
           git config --global core.eol lf
         if: matrix.os == 'windows-2019' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: 'false'
           submodules: recursive
@@ -77,8 +77,7 @@ jobs:
       - name: Install Qt6
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.6.1'
-          modules: 'qt5compat'
+          version: '6.5.3'
           cache: 'true'
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
@@ -101,8 +100,14 @@ 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 automake 
-          pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 libintl msys2-runtime-devel gettext-devel
+          pacman --noconfirm -S --needed libintl msys2-runtime-devel gettext-devel
           pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
+          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-icu-73.2-1-any.pkg.tar.zst
+          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-base-6.5.3-1-any.pkg.tar.zst
+          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-5compat-6.5.3-1-any.pkg.tar.zst
+          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-svg-6.5.3-1-any.pkg.tar.zst
+          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-tools-6.5.3-1-any.pkg.tar.zst
+          pacman --noconfirm -U *.pkg.tar.zst
         if: matrix.os == 'windows-2019'
 
       - name: Build gpg-error (Linux)
@@ -175,6 +180,13 @@ jobs:
           cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v
         if: matrix.os == 'ubuntu-20.04'
 
+      - name: Build Integrated Modules (macOS)
+        # Build your GpgFrontend with the given configuration
+        run: |
+          cmake -B ${{github.workspace}}/build-mods -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_MODS_ONLY=On
+          cmake --build ${{github.workspace}}/build-mods --config {{$env.BUILD_TYPE}} -- -v
+        if: matrix.os == 'macos-11' || matrix.os == 'macos-12'
+
       - name: Build & Export GpgFrontend (macOS)
         # Build your GpgFrontend with the given configuration
         run: |
@@ -195,6 +207,13 @@ jobs:
             -exportPath ${{github.workspace}}/build/package/
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
+      - name: Copy Modules into Bundle & Deploy Qt & Code Sign (macOS)
+        run: |
+          cmake -E copy_directory ${{github.workspace}}/build-mods/artifacts/mods ${{github.workspace}}/build/package/GpgFrontend.app/Contents/PlugIns/mods
+          macdeployqt ${{github.workspace}}/build/package/GpgFrontend.app -verbose=2 -appstore-compliant -always-overwrite
+          codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" -f --deep --options=runtime  ${{github.workspace}}/build/package/GpgFrontend.app
+        if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
+
       - name: Package & Sign App Bundle (macOS)
         run: |
           security -v unlock-keychain -p gpgfrontend
@@ -212,11 +231,11 @@ jobs:
 
       - name: Notarize Release Build (macOS)
         run: |
-          xcrun altool --notarize-app \
-          -f ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip \
-          --primary-bundle-id ${{secrets.GPGFRONTEND_XOCDE_APPID}} \
-          -u ${{secrets.APPLE_DEVELOPER_ID}} \
-          -p ${{secrets.APPLE_DEVELOPER_ID_SECRET}}
+          xcrun notarytool submit \
+          --apple-id ${{secrets.APPLE_DEVELOPER_ID}} \
+          --team-id ${{secrets.APPLE_DEVELOPER_TEAM_ID}} \
+          --password ${{secrets.APPLE_DEVELOPER_ID_SECRET}} \
+          ${{github.workspace}}/build/GpgFrontend-${{env.sha_short}}-x86_64.zip
         if:  matrix.os == 'macos-11' || matrix.os == 'macos-12'
 
       - name: Package App Image (Linux)
@@ -225,7 +244,7 @@ jobs:
           cd ${{github.workspace}}/build/final-artifact
           wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
           chmod u+x linuxdeployqt-continuous-x86_64.AppImage
-          ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/gpgfrontend/usr/share/applications/*.desktop -appimage
+          ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines,platformthemes/libqgtk3.so -appimage -executable-dir=${{github.workspace}}/build/artifacts/AppDir/usr/plugins/mods/
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Configure CMake & Build Binary(Windows)
@@ -234,15 +253,14 @@ jobs:
           cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
           mkdir build && cd build
           cmake -G Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_STABLE=ON ..
-          # Build your program with the given configuration
           cmake --build . --config ${{env.BUILD_TYPE}}  -- -j 4
         if: matrix.os == 'windows-2019'
 
       - name: Upload Artifact(Linux)
         uses: actions/upload-artifact@master
         with:
           name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{ github.sha }}
-          path: ${{github.workspace}}/build/final-artifact/GpgFrontend*.AppImage*
+          path: ${{github.workspace}}/build/final-artifact/Gpg_Frontend*.AppImage*
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Upload Artifact(macOS)

diff --git a/.gitmodules b/.gitmodules
@@ -15,4 +15,4 @@
 	url = https://github.com/libarchive/libarchive.git
 [submodule "third_party/qttranslations"]
 	path = third_party/qttranslations
-	url = git://code.qt.io/qt/qttranslations.git
+	url = https://github.com/qt/qttranslations.git