From 6837c29f69f6802f1334408528bf17b8062218e6 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 7 Jun 2019 16:17:21 +1000
Subject: [PATCH] flatpak: update to pygobject 3.32

Drop pycairo by way of an environment variable, because we don't need it for
tuhi.

The way pygobject is setup it checks for setuptools during pip3 and then
complains that it's not there:

  Collecting setuptools
    Could not find a version that satisfies the requirement setuptools (from versions: )
  No matching distribution found for setuptools

It's not actually needed since it has a fallback, but clearly... anyway.

Let's use the plain setup.py invocation, but with the right --prefix.
Of course that setup.py invocation doesn't work for the other packages,
so let's leave pip3 in place for those. Because how much worse would the world
be if this would just work...

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

diff --git a/org.freedesktop.tuhi.json b/org.freedesktop.tuhi.json
index 11c0bf3..f1721ef 100644
--- a/org.freedesktop.tuhi.json
+++ b/org.freedesktop.tuhi.json
@@ -27,27 +27,21 @@
     ],
     "modules": [
         {
-            "name": "pycairo",
+            "name": "pygobject",
             "buildsystem": "simple",
             "build-commands": [
-                "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
+                "python3 setup.py install --prefix=/app"
             ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://github.com/pygobject/pycairo/releases/download/v1.18.1/pycairo-1.18.1.tar.gz",
-                    "sha256": "70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786"
+            "build-options": {
+                "env": {
+                    "PYGOBJECT_WITHOUT_PYCAIRO" : "1"
                 }
-            ]
-        },
-        {
-            "name": "pygobject",
-            "config-opts": ["--enable-compile-warnings=minimum"],
+            },
             "sources": [
                 {
                     "type": "archive",
-                    "url": "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.27/pygobject-3.27.5.tar.xz",
-                    "sha256": "3e57f42a48f7e762a791ccec2514894945829dc1e70caeea0252505cbddbeda4"
+                    "url": "https://ftp.gnome.org/pub/GNOME/sources/pygobject/3.32/pygobject-3.32.1.tar.xz",
+                    "sha256": "32c99def94b8dea5ce9e4bc99576ef87591ea779b4db77cfdca7af81b76d04d8"
                 }
             ]
         },