Merge pull request #133 from whot/wip/update-flatpak

Update flatpak to SDK 18.08
pull/136/head
Daniel Martin 2019-06-08 11:37:01 +02:00 committed by GitHub
commit a3e273c9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 45 deletions

View File

@ -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",
@ -27,48 +27,21 @@
],
"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"
}
},
"name": "pygobject",
"buildsystem": "simple",
"build-commands": [
"python3 ./setup.py sdist",
"pip3 install dist/*.tar.gz"
"python3 setup.py install --prefix=/app"
],
"sources": [
{
"type": "archive",
"url": "https://github.com/pygobject/pycairo/releases/download/v1.14.1/pycairo-1.14.1.tar.gz",
"sha256": "0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754"
}
]
},
{
"name": "pygobject",
"config-opts": ["--enable-compile-warnings=minimum"],
"build-options" : {
"build-options": {
"env": {
"PYTHON": "/app/bin/python3"
"PYGOBJECT_WITHOUT_PYCAIRO" : "1"
}
},
"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"
}
]
},
@ -82,8 +55,7 @@
}
],
"build-commands": [
"python3 ./setup.py sdist",
"pip3 install dist/*.tar.gz"
"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
]
},
{
@ -92,13 +64,12 @@
"sources": [
{
"type": "archive",
"url": "http://downloads.sourceforge.net/pyparsing/pyparsing-2.1.10.tar.gz",
"sha512": "21af73d6f479d52746f269c8fbaf90c1107a8aec756d30af8c7c4e6a2ff0ea9659cc07816b7ea19286bc12d43497f5e8e63351453bf18daf6a1cb380a195532e"
"url": "https://github.com/pyparsing/pyparsing/releases/download/pyparsing_2.4.0/pyparsing-2.4.0.tar.gz",
"sha512": "71877dc006cce5c1b1d45e7cc89cd60e03cb80353387fb0c6498cfc0d69af465dc574d1bceb87248033e7a82694aa940e9fce1ca80b2ef538a8df51f697ef530"
}
],
"build-commands": [
"python3 ./setup.py sdist",
"pip3 install dist/*.tar.gz"
"pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} ."
]
},
{
@ -111,8 +82,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 +95,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"
]

View File

@ -43,7 +43,7 @@ class Stroke(GObject.Object):
self._pressure = 0
self._is_sealed = False
@GObject.property
@GObject.Property
def sealed(self):
return self._is_sealed