[d-feet/enable-gitlab-ci: 2/3] flatpak: build with Python 3



commit 1e31d1bddf84c8d004c2a16475b0ea239df14bf9
Author: Will Thompson <will willthompson co uk>
Date:   Wed Sep 19 10:28:15 2018 +0100

    flatpak: build with Python 3
    
    Python 2 is not included in the 3.30/master runtime (though it is
    included in the SDK).

 org.gnome.dfeet.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/org.gnome.dfeet.json b/org.gnome.dfeet.json
index d1e6dab..3ae2608 100644
--- a/org.gnome.dfeet.json
+++ b/org.gnome.dfeet.json
@@ -14,12 +14,17 @@
         "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
+    "build-options" : {
+        "env": {
+            "PYTHON": "/usr/bin/python3"
+        }
+    },
     "modules": [
         {
             "name": "pycairo",
             "buildsystem": "simple",
             "build-commands": [
-                "python2 setup.py install --prefix=/app"
+                "python3 setup.py install --prefix=/app"
             ],
             "sources": [
                 {
@@ -36,13 +41,8 @@
             "name": "pygobject",
             "buildsystem": "simple",
             "build-commands": [
-                "python2 setup.py install --prefix=/app"
+                "python3 setup.py install --prefix=/app"
             ],
-            "build-options" : {
-                "env": {
-                    "PYTHON": "/usr/bin/python2"
-                }
-            },
             "ensure-writable" : [
                 "/lib/python*/site-packages/easy-install.pth"
             ],
@@ -55,7 +55,7 @@
             "cleanup": [
                 "/include",
                 "/lib/pkgconfig",
-                "/lib/python2.7/site-packages/gi/*.la"
+                "/lib/python*/site-packages/gi/*.la"
             ]
         },
         {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]