From dd924bb33ad1ed262b0977b0f3cbfeee6dae2c2c Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Mon, 23 Oct 2017 21:16:05 +0200
Subject: [PATCH] build: stable flatpak manifest is now hosted at flathub.

---
 build/flatpak/flatpak-howto.txt         | 16 +++++
 build/flatpak/org.gimp.GIMP-stable.json | 77 -------------------------
 2 files changed, 16 insertions(+), 77 deletions(-)
 delete mode 100644 build/flatpak/org.gimp.GIMP-stable.json

diff --git a/build/flatpak/flatpak-howto.txt b/build/flatpak/flatpak-howto.txt
index 8b73fd5a28..6d5ade77d7 100644
--- a/build/flatpak/flatpak-howto.txt
+++ b/build/flatpak/flatpak-howto.txt
@@ -1,6 +1,22 @@
 GIMP Flatpak HowTo
 ==================
 
+Stable build
+~~~~~~~~~~~~
+
+The stable manifest is maintained at flathub: https://github.com/flathub/org.gimp.GIMP
+
+Development and nightly builds
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Flathub does not host non-stable builds, therefore they are maintained
+separately on the GIMP repository. Nevertheless they should remain as
+close to the stable manifest as possible since they are meant to become
+stable too.
+
+Building and maintaining
+~~~~~~~~~~~~~~~~~~~~~~~~
+
 * Install flatpak and flatpak-builder. There are packages for most
   distributions. Check: http://flatpak.org/getting.html
   Use at least flatpak 0.9.5.
diff --git a/build/flatpak/org.gimp.GIMP-stable.json b/build/flatpak/org.gimp.GIMP-stable.json
deleted file mode 100644
index a18a8dfb1a..0000000000
--- a/build/flatpak/org.gimp.GIMP-stable.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "id": "org.gimp.GIMP",
-    "branch": "stable",
-    "base": "org.gimp.BaseApp",
-    "base-version": "stable",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.24",
-    "sdk": "org.gnome.Sdk",
-    "command": "gimp-2.8",
-    "rename-desktop-file": "gimp.desktop",
-    "rename-appdata-file": "gimp.appdata.xml",
-    "rename-icon": "gimp",
-    "finish-args": ["--share=ipc", "--socket=x11", "--share=network",
-                    "--filesystem=host", "--filesystem=xdg-config/GIMP",
-                    "--filesystem=xdg-config/gtk-3.0",
-                    "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" ],
-    "tags": ["stable"],
-    "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g",
-        "env": {
-            "V": "1"
-        }
-    },
-    "cleanup": ["/include", "/lib/pkgconfig", "/share/pkgconfig",
-                "/share/aclocal", "/man", "/share/man", "/share/gtk-doc",
-                "/share/vala", "*.la", "*.a", "/bin/wmf*", "/bin/libwmf-*",
-                "/bin/pygtk*", "/bin/pygobject*"],
-    "modules": [
-        {
-            "name": "babl",
-            "config-opts": [ "--disable-docs" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "git://git.gnome.org/babl",
-                    "branch": "BABL_0_1_10",
-                    "commit": "0aa5c964e466e87dd4842863d63dfc989a3ef4d3"
-                }
-            ]
-        },
-        {
-            "name": "gegl",
-            "config-opts": [ "--disable-docs", "--disable-introspection" ],
-            "cleanup": [ "/bin" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "git://git.gnome.org/gegl",
-                    "branch": "GEGL_0_2_0",
-                    "commit": "57e23d310291a632ea8e16b7b8e5b97f7f289680"
-                }
-            ]
-        },
-        {
-            "name": "gimp",
-            "config-opts": [ "--disable-docs", "--disable-gtk-doc", "--disable-gtk-doc-html", "--enable-vector-icons" ],
-            "cleanup": [ "/bin/gimptool-2.0", "/bin/gimp-console-2.9" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "git://git.gnome.org/gimp",
-                    "branch": "GIMP_2_8_22",
-                    "commit": "e39a4e12039a255f29d7cf79365190f01c5f37aa"
-                }
-            ],
-	    "post-install": [
-                "rm -fr /app/include /app/lib/pkgconfig /app/share/pkgconfig",
-                "rm -fr /app/share/gtk-doc/ /app/share/man/",
-                "rm -fr /app/lib/*.la /app/lib/*.a",
-                "rm -fr /app/share/ghostscript/9.20/doc/",
-                "rm -fr /app/bin/wmf* /app/bin/libwmf-*",
-                "rm -fr /app/bin/pygtk* /app/bin/pygobject* /app/bin/pygobject-codegen-2.0"
-            ]
-        }
-    ]
-}