chore: upgrade to v2.1.8

5 files changed, 34 insertions, 6 deletions

diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml
index afc406d4..a3c54a24 100644
--- a/.github/workflows/release-qt5.yml
+++ b/.github/workflows/release-qt5.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Set up MinGW (Windows)
         uses: msys2/setup-msys2@v2
         with:
-          update: true
+          update: false
           release: false
           cache: true
           install: >-
@@ -84,14 +84,15 @@ jobs:
             binutils 
             zip
             unzip
-            libintl 
+            libintl
+            texinfo 
             msys2-runtime-devel 
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-gcc 
             mingw-w64-x86_64-make
             mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-qt5
-            mingw-w64-x86_64-angleproject 
+            mingw-w64-x86_64-qt6 
+            mingw-w64-x86_64-icu 
             mingw-w64-x86_64-ninja 
             mingw-w64-x86_64-gnupg 
             mingw-w64-x86_64-gpgme
@@ -149,6 +150,18 @@ jobs:
           cd ${{github.workspace}}
         if: runner.os == 'Linux'
 
+      - name: Build GpgME (Windows)
+        shell: msys2 {0}
+        run: |
+          git clone --depth 1 --branch gpgme-1.24.2 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
+          cd ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          export CFLAGS="${CFLAGS} -Wno-int-conversion -Wno-incompatible-pointer-types"
+          ./configure --enable-maintainer-mode --enable-languages=cl --disable-gpg-test --enable-w32-glib
+          make -j4
+          make install
+        if: runner.os == 'Windows'
+
       - name: Build googletest (Linux)
         run: |
           git clone --depth 1 --branch v1.15.2 https://github.com/google/googletest.git ${{github.workspace}}/third_party/googletest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8ee5ac1a..dcd03237 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -124,7 +124,8 @@ jobs:
             binutils 
             zip
             unzip
-            libintl 
+            libintl
+            texinfo 
             msys2-runtime-devel 
             mingw-w64-x86_64-toolchain
             mingw-w64-x86_64-gcc 
@@ -170,6 +171,18 @@ jobs:
           cd ${{github.workspace}}
         if: runner.os == 'Linux'
 
+      - name: Build GpgME (Windows)
+        shell: msys2 {0}
+        run: |
+          git clone --depth 1 --branch gpgme-1.24.2 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
+          cd ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          export CFLAGS="${CFLAGS} -Wno-int-conversion -Wno-incompatible-pointer-types"
+          ./configure --enable-maintainer-mode --enable-languages=cl --disable-gpg-test --enable-w32-glib
+          make -j4
+          make install
+        if: runner.os == 'Windows'
+
       - name: Build googletest (Linux)
         run: |
           git clone --depth 1 --branch v1.15.2 https://github.com/google/googletest.git ${{github.workspace}}/third_party/googletest
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f0501a..6ce5cdcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 
 # define project
 project(GpgFrontend
-  VERSION 2.1.7
+  VERSION 2.1.8
   DESCRIPTION "GpgFrontend is a free, open-source, robust yet user-friendly, compact and cross-platform tool for OpenPGP encryption."
   HOMEPAGE_URL "https://gpgfrontend.bktus.com"
   LANGUAGES CXX)
diff --git a/resource/appstream/com.bktus.gpgfrontend.appdata.xml b/resource/appstream/com.bktus.gpgfrontend.appdata.xml
index af3ec1d6..19d40bac 100644
--- a/resource/appstream/com.bktus.gpgfrontend.appdata.xml
+++ b/resource/appstream/com.bktus.gpgfrontend.appdata.xml
@@ -72,6 +72,7 @@
   </keywords>
 
   <releases>
+    <release version="2.1.8" date="2025-04-17"/>
     <release version="2.1.7" date="2025-02-04"/>
     <release version="2.1.6" date="2024-12-03"/>
     <release version="2.1.5" date="2024-10-04"/>
diff --git a/resource/appstream/com.bktus.gpgfrontend.metainfo.xml b/resource/appstream/com.bktus.gpgfrontend.metainfo.xml
index 4d607f70..97dd89d4 100644
--- a/resource/appstream/com.bktus.gpgfrontend.metainfo.xml
+++ b/resource/appstream/com.bktus.gpgfrontend.metainfo.xml
@@ -65,6 +65,7 @@
   <url type="vcs-browser">https://github.com/saturneric/GpgFrontend</url>
   
   <releases>
+    <release version="2.1.8" date="2025-04-17"/>
     <release version="2.1.7" date="2025-02-04"/>
     <release version="2.1.6" date="2024-12-03"/>
     <release version="2.1.5" date="2024-10-04"/>