[gimp] build: workaround python2 crashes in Flatpak.
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build: workaround python2 crashes in Flatpak.
- Date: Mon, 13 Feb 2017 14:40:29 +0000 (UTC)
commit c8ebd043aa361fbd966cf206130611bdc728e679
Author: Jehan <jehan girinstud io>
Date: Mon Feb 13 05:09:59 2017 +0100
build: workaround python2 crashes in Flatpak.
See the upstream issue where python2 would crash on some platforms, yet
not others: https://github.com/flatpak/flatpak/issues/143
For this, I disable introspection on GEGL (which is anyway not useful
in the Flatpak build, I believe), and wrap gdbus-codegen in a temporary
build script for GIMP to force it to use Python 3 (I can't force
globally the $PYTHON environment variable like on Webkit because GIMP
needs Python 2 as dependency).
build/flatpak/org.gimp.GIMP.json | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/build/flatpak/org.gimp.GIMP.json b/build/flatpak/org.gimp.GIMP.json
index 28b3e45..2c53cd0 100644
--- a/build/flatpak/org.gimp.GIMP.json
+++ b/build/flatpak/org.gimp.GIMP.json
@@ -295,7 +295,7 @@
},
{
"name": "gegl",
- "config-opts": [ "--disable-docs" ],
+ "config-opts": [ "--disable-docs", "--disable-introspection" ],
"cleanup": [ "/bin" ],
"sources": [
{
@@ -317,11 +317,25 @@
},
{
"name": "gimp",
+ "build-options" : {
+ "env": {
+ "PATH": "/run/build/gimp/tmp-bin:/app/bin:/usr/bin"
+ }
+ },
"config-opts": [ "--disable-docs", "--disable-gtk-doc", "--disable-gtk-doc-html",
"--enable-vector-icons" ],
"sources": [
{
"type": "git",
"url": "git://git.gnome.org/gimp"
+ },
+ {
+ "type": "script",
+ "commands": [
+ "#!/bin/sh",
+ "python3 /usr/bin/gdbus-codegen $@"
+ ],
+ "dest-filename": "gdbus-codegen",
+ "dest": "tmp-bin/"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]