From 7d2614daca637272d8f03a3d11f507f8c70f8c49 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 4 Jul 2018 11:47:07 +0200
Subject: Fix for gpg-agent in flatpak

Without this fix we'll end up starting the ncurses pinentry, which is
not useful.
---
 dist/flatpak/gpgme.json        | 11 +++++++++++
 dist/flatpak/org.kde.kube.json | 17 ++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dist/flatpak/gpgme.json b/dist/flatpak/gpgme.json
index 3df6a295..335ca80f 100644
--- a/dist/flatpak/gpgme.json
+++ b/dist/flatpak/gpgme.json
@@ -15,6 +15,17 @@
             "cleanup": [
                 "/lib/libassuan.la"
             ]
+        },
+        {
+            "name": "pinentry",
+            "config-opts": ["-enable-pinentry-qt"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.1.0.tar.bz2",
+                    "sha256": "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
+                }
+            ]
         }
     ],
     "cleanup": [
diff --git a/dist/flatpak/org.kde.kube.json b/dist/flatpak/org.kde.kube.json
index e48fbffa..cd750452 100644
--- a/dist/flatpak/org.kde.kube.json
+++ b/dist/flatpak/org.kde.kube.json
@@ -4,7 +4,7 @@
     "runtime": "org.kde.Platform",
     "runtime-version": "5.9",
     "sdk": "org.kde.Sdk",
-    "command": "kube",
+    "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
     "tags": ["nightly"],
     "desktop-file-name-prefix": "(Nightly) ",
@@ -122,6 +122,21 @@
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "dir", "path": "..",  "skip": [".git"] } ]
+        },
+        {
+            "name": "kubewrapper",
+            "buildsystem": "simple",
+            "build-commands": [
+                "cp kubewrapper.sh /app/bin/kubewrapper.sh",
+                "chmod +x /app/bin/kubewrapper.sh"
+            ],
+            "sources": [
+                {
+                    "type": "script",
+                    "commands": ["gpg-agent --homedir ~/.gnupg --daemon --pinentry-program /app/bin/pinentry-qt", "kube", "gpg-connect-agent killagent /bye"],
+                    "dest-filename": "kubewrapper.sh"
+                }
+            ]
         }
     ]
 }
-- 
cgit v1.2.3