[meld: 1/2] Fix the Flatpak build manifest
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 1/2] Fix the Flatpak build manifest
- Date: Fri, 11 May 2018 21:40:33 +0000 (UTC)
commit 4198ac00998abd44d4edce9712e24285921ce3a7
Author: Mathieu Bridon <bochecha daitauha fr>
Date: Fri May 11 18:02:26 2018 +0200
Fix the Flatpak build manifest
There's no need for a Makefile, now that Flatpak has the "simple"
buildsystem.
In addition, Meld requires Python 3, so let's move the Flatpak build to
that.
data/org.gnome.meld-devel.json | 49 ++++++------------------------------------
1 file changed, 6 insertions(+), 43 deletions(-)
---
diff --git a/data/org.gnome.meld-devel.json b/data/org.gnome.meld-devel.json
index 03b4e91c..dfc5e5ab 100644
--- a/data/org.gnome.meld-devel.json
+++ b/data/org.gnome.meld-devel.json
@@ -49,55 +49,18 @@
}
]
},
- {
- "name": "py2cairo",
- "rm-configure": true,
- "sources": [
- {
- "type": "archive",
- "url": "http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2",
- "sha256": "d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431"
- },
- {
- "type": "script",
- "commands": [
- "libtoolize --force",
- "aclocal",
- "autoheader",
- "automake --force-missing --add-missing --foreign",
- "autoconf"
- ],
- "dest-filename": "autogen.sh"
- }
- ]
- },
- {
- "name": "pygobject",
- "build-options" : {
- "env": {
- "PYTHON": "python2"
- }
- },
- "sources": [
- {
- "type": "archive",
- "url": "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.18/pygobject-3.18.2.tar.xz",
- "sha256": "2a3cad1517916b74e131e6002c3824361aee0671ffb0d55ded119477fc1c2c5f"
- }
- ]
- },
{
"name": "meld",
"no-autogen": true,
+ "buildsystem": "simple",
+ "build-commands": [
+ "python3 setup.py build",
+ "python3 setup.py install --prefix /app"
+ ],
"sources": [
{
"type": "git",
- "url": "git://git.gnome.org/meld"
- },
- {
- "type": "file",
- "path": "data/meld-Makefile",
- "dest-filename": "Makefile"
+ "url": "https://gitlab.gnome.org/GNOME/meld.git"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]