From a1ca70df28eb21157bc040d0646f7717c459c118 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 7 Jun 2019 14:29:52 +1000
Subject: [PATCH] flatpak: update to freedesktop.org SDK 18.08

This one now includes Python 3.7, so we don't need to do it build it
ourselves. Fix the kete path up for 3.7 as well so this works again.

And finally, fix the pip incovations, the current ones we have install into
/usr/ which is read-only. Use the pip3 command generated by the
flatpak-pip-generator as listed on http://docs.flatpak.org/en/latest/python.html

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 org.freedesktop.tuhi.json | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/org.freedesktop.tuhi.json b/org.freedesktop.tuhi.json
index f12d49e..87594e1 100644
--- a/org.freedesktop.tuhi.json
+++ b/org.freedesktop.tuhi.json
@@ -3,7 +3,7 @@
     "command": "/app/bin/tuhi",
     "runtime": "org.freedesktop.Platform",
     "sdk": "org.freedesktop.Sdk",
-    "runtime-version": "1.6",
+    "runtime-version": "18.08",
     "cleanup": [ "/cache",
                  "/include",
                  "/lib/pkgconfig",
@@ -26,27 +26,11 @@
         "--own-name=org.freedesktop.tuhi1"
     ],
     "modules": [
-        {
-            "name": "cpython",
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz",
-                    "sha256": "159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba"
-                }
-            ]
-        },
         {
             "name": "pycairo",
-            "build-options" : {
-                "env": {
-                    "PYTHON": "/app/bin/python3"
-                }
-            },
             "buildsystem": "simple",
             "build-commands": [
-                "python3 ./setup.py sdist",
-                "pip3 install dist/*.tar.gz"
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
             ],
             "sources": [
                 {
@@ -59,11 +43,6 @@
         {
             "name": "pygobject",
             "config-opts": ["--enable-compile-warnings=minimum"],
-            "build-options" : {
-                "env": {
-                    "PYTHON": "/app/bin/python3"
-                }
-            },
             "sources": [
                 {
                     "type": "archive",
@@ -82,8 +61,7 @@
                 }
             ],
             "build-commands": [
-                "python3 ./setup.py sdist",
-                "pip3 install dist/*.tar.gz"
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
             ]
         },
         {
@@ -97,8 +75,7 @@
                 }
             ],
             "build-commands": [
-                "python3 ./setup.py sdist",
-                "pip3 install dist/*.tar.gz"
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
             ]
         },
         {
@@ -111,8 +88,7 @@
                 }
             ],
             "build-commands": [
-                "python3 ./setup.py sdist",
-                "pip3 install dist/*.tar.gz"
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
             ]
         },
         {
@@ -125,10 +101,10 @@
                 }
             ],
             "build-commands": [
-                "python3 setup.py install --verbose"
+                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
             ],
             "post-install": [
-                "cp tools/kete.py /app/lib/python3.6/site-packages/kete.py",
+                "cp tools/kete.py /app/lib/python3.7/site-packages/kete.py",
                 "cp tools/tuhi-kete-sandboxed.py /app/bin/tuhi-kete",
                 "chmod +x /app/bin/tuhi-kete"
             ]