From 467f89f0712970976d1896b009015943ddd4faeb Mon Sep 17 00:00:00 2001
From: saturneric <eric@bktus.com>
Date: Sun, 15 Oct 2023 17:28:27 +0800
Subject: [PATCH] fix: follow reviewer's suggestions

---
 com.bktus.gpgfrontend.desktop      |  8 ----
 com.bktus.gpgfrontend.metainfo.xml | 35 ---------------
 com.bktus.gpgfrontend.yaml         | 69 ++++++------------------------
 3 files changed, 13 insertions(+), 99 deletions(-)
 delete mode 100644 com.bktus.gpgfrontend.desktop
 delete mode 100644 com.bktus.gpgfrontend.metainfo.xml

diff --git a/com.bktus.gpgfrontend.desktop b/com.bktus.gpgfrontend.desktop
deleted file mode 100644
index 75d1047..0000000
--- a/com.bktus.gpgfrontend.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GpgFrontend
-Exec=GpgFrontend
-Icon=com.bktus.gpgfrontend
-Comment=An OpenPGP Crypto Tool
-Terminal=false
-Categories=Utility;
\ No newline at end of file
diff --git a/com.bktus.gpgfrontend.metainfo.xml b/com.bktus.gpgfrontend.metainfo.xml
deleted file mode 100644
index 08389ed..0000000
--- a/com.bktus.gpgfrontend.metainfo.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 First Lastname <your@email.com> -->
-<component type="desktop-application">
-  <id>com.bktus.gpgfrontend</id>
-  <metadata_license>FSFAP</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>GpgFrontend</name>
-  <summary>Take the initiative to protect privacy in your own hands</summary>
-
-  <description>
-    <p>
-      GpgFrontend is a free, open-source, robust yet user-friendly, compact and cross-platform tool for OpenPGP encryption.
-    </p>
-    <p>
-      By using GpgFrontend, users can quickly encrypt files or text, easily digitally sign them, and conveniently manage 
-      all GPG keys on their device. The tool also facilitates the secure and seamless transfer of GPG keys between devices. 
-      It is compatible with a range of operating systems, including Windows, macOS, Linux, and FreeBSD.
-    </p>
-    <p>For moew information visit https://gpgfrontend.bktus.com/</p>
-
-  </description>
-
-  <launchable type="desktop-id">com.bktus.gpgfrontend.desktop</launchable>
-
-  <screenshots>
-    <screenshot type="default">
-      <caption>Main Window</caption>
-      <image>https://raw.githubusercontent.com/saturneric/Blob/master/screenshots/keygen_ubuntu.png</image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">https://gpgfrontend.bktus.com/</url>
-  <project_group>GNOME</project_group>
-  <developer_name>Saturneric</developer_name>
-</component>
\ No newline at end of file
diff --git a/com.bktus.gpgfrontend.yaml b/com.bktus.gpgfrontend.yaml
index b10ca8c..b92ceed 100644
--- a/com.bktus.gpgfrontend.yaml
+++ b/com.bktus.gpgfrontend.yaml
@@ -1,84 +1,41 @@
 app-id: com.bktus.gpgfrontend
 runtime: org.kde.Platform
-runtime-version: '6.4'
+runtime-version: "6.5"
 sdk: org.kde.Sdk
 command: GpgFrontend
 
 finish-args:
   - --share=ipc
-  - --socket=x11
+  - --socket=fallback-x11
   - --socket=wayland
-  - --filesystem=host
+  - --socket=gpg-agent
   - --device=dri
   - --share=network
+  - --filesystem=~/.gnupg
 
 cleanup:
-  - /lib/*.a
-  - /lib/*.la
-  - /lib32/*.a
-  - /lib32/*.la
+  - '*.a'
+  - '*.la'
   - /share/doc
   - /share/gtk-doc
   - /share/man
+  - /include
+  - /lib/cmake
+  - /lib/pkgconfig
 
 modules:
-  - name: gettext
-    buildsystem: simple
-    build-commands:
-      - ./configure --prefix=${FLATPAK_DEST} && make -j$(nproc) && make install
-    sources:
-      - type: archive
-        url: https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.tar.gz
-        sha256: 3da4f6bd79685648ecf46dab51d66fcdddc156f41ed07e580a696a38ac61d48f
-  - name: libgpg-error
-    buildsystem: simple
-    build-commands:
-      - ./autogen.sh
-      - ./configure --prefix=${FLATPAK_DEST} --enable-maintainer-mode && make -j$(nproc) && make install
-    sources:
-      - type: archive
-        url: https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2
-        sha256: fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
-  - name: libassuan
-    buildsystem: simple
-    build-commands:
-      - ./autogen.sh
-      - ./configure --prefix=${FLATPAK_DEST} --enable-maintainer-mode && make -j$(nproc) && make install
-    sources:
-      - type: archive
-        url: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.5.tar.bz2
-        sha256: 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-  - name: gpgme
-    buildsystem: simple
-    build-commands:
-      - ./autogen.sh
-      - ./configure --prefix=${FLATPAK_DEST} --enable-maintainer-mode && make -j$(nproc) && make install
-    sources:
-      - type: archive
-        url: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.20.0.tar.bz2
-        sha256: 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750
-  - name: pinentry
-    buildsystem: simple
-    build-commands:
-      - ./autogen.sh
-      - ./configure --prefix=${FLATPAK_DEST} --enable-maintainer-mode && make -j$(nproc) && make install
-    sources:
-      - type: archive
-        url: https://gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.1.tar.bz2
-        sha256: 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067
   - name: boost
     buildsystem: simple
     build-commands:
       - ./bootstrap.sh --prefix=${FLATPAK_DEST} --with-libraries=date_time,system
-      - ./b2 variant=release link=static runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j $(nproc) install
+      - ./b2 variant=release link=static runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j $FLATPAK_BUILDER_N_JOBS  install
     sources:
       - type: archive
         url: https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
         sha256: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
+    cleanup: 
+      - '*'
   - name: libconfig++
-    buildsystem: simple
-    build-commands:
-      - ./configure --prefix=${FLATPAK_DEST} && make -j$(nproc) && make install
     sources:
       - type: archive
         url:  https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.3.tar.gz
@@ -91,6 +48,6 @@ modules:
     sources:
       - type: git
         url: https://github.com/saturneric/GpgFrontend.git
-        commit: 0378dbdccc758ded7af1ca1bcf1144d8f656e82b
+        commit: f5e667607cee7e70ee6688b826539489ca11f6ac
 
     
\ No newline at end of file