nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Peter Hutterer 2019-06-07 16:17:21 +10:00
parent d6a97337d9
commit 6837c29f69
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.freedesktop.tuhi.json
View File

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