From d41fb6be5d08cada627804296ab1d06719b41ca2 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Wed, 28 Oct 2020 01:31:15 +0100
Subject: [PATCH 1/4] Change the application ID for the beta branch.

It's ugly but this is the only way to not have to manually switch the
flatpak branch through boring command lines.
See issue #91 and flatpak/flatpak#1109.
---
 org.gimp.GIMP.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.gimp.GIMP.json b/org.gimp.GIMP.json
index e076d769..e8ce6f9f 100644
--- a/org.gimp.GIMP.json
+++ b/org.gimp.GIMP.json
@@ -1,5 +1,5 @@
 {
-    "app-id": "org.gimp.GIMP",
+    "app-id": "org.gimp.GIMP.dev",
     "branch": "beta",
     "runtime": "org.gnome.Platform",
     "runtime-version": "3.36",

From c1d975b313f445a7b2d20b3bcb31125fc11ac51a Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Wed, 28 Oct 2020 10:55:34 +0100
Subject: [PATCH 2/4] Rename the appstream data file as well when changing app
 ID.

---
 org.gimp.GIMP.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/org.gimp.GIMP.json b/org.gimp.GIMP.json
index e8ce6f9f..9ca4cf61 100644
--- a/org.gimp.GIMP.json
+++ b/org.gimp.GIMP.json
@@ -8,6 +8,7 @@
     "separate-locales": false,
     "rename-desktop-file": "gimp.desktop",
     "rename-icon": "gimp",
+    "rename-appdata-file": "org.gimp.GIMP.appdata.xml",
     "finish-args": ["--share=ipc", "--share=network",
                     "--socket=x11", "--socket=wayland",
                     "--filesystem=host", "--filesystem=xdg-config/GIMP",

From 80f3dc7b89a1c1a9ac871e54e771f6b67726a6c1 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Wed, 28 Oct 2020 11:05:11 +0100
Subject: [PATCH 3/4] Some additional file cleanup.

Should be removed:
- /app/share/doc/ghostscript/9.53.3/*
- /app/share/thumbnailers/heif.thumbnailer
- /app/bin/x265
---
 org.gimp.GIMP.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.gimp.GIMP.json b/org.gimp.GIMP.json
index 9ca4cf61..e25381e0 100644
--- a/org.gimp.GIMP.json
+++ b/org.gimp.GIMP.json
@@ -187,7 +187,7 @@
             "config-opts": [ "--disable-cups" ],
             "make-args": [ "so" ],
             "make-install-args": [ "soinstall" ],
-            "cleanup": [ "/bin", "/share/man", "/share/doc/" ],
+            "cleanup": [ "/bin", "/share/man", "/share/doc" ],
             "sources": [
                 {
                     "type": "archive",
@@ -279,7 +279,7 @@
         {
             "name" : "libheif",
             "config-opts": [ "--disable-gdk-pixbuf" ],
-            "cleanup": [ "/bin" ],
+            "cleanup": [ "/bin", "/share/thumbnailers" ],
             "modules": [
                 {
                     "name": "libde265",
@@ -300,6 +300,7 @@
                     "config-opts": [ "-DEXTRA_LIB='libx265-10.a;libx265-12.a'",
                                      "-DEXTRA_LINK_FLAGS=-L.",
                                      "-DLINKED_10BIT=ON", "-DLINKED_12BIT=ON" ],
+                    "cleanup": [ "/bin" ],
                     "sources": [
                         {
                             "type": "git",

From a9afcd2b4c430049d26ed3aa86a8c23410382402 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Wed, 28 Oct 2020 12:01:12 +0100
Subject: [PATCH 4/4] Update the configuration options.

Update build-id for version check (though it's not too important here)
and the binding options, which are now different.
---
 org.gimp.GIMP.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/org.gimp.GIMP.json b/org.gimp.GIMP.json
index e25381e0..53eae685 100644
--- a/org.gimp.GIMP.json
+++ b/org.gimp.GIMP.json
@@ -426,8 +426,7 @@
             "name": "gimp",
             "config-opts": [ "--disable-docs", "--disable-gtk-doc", "--disable-gtk-doc-html",
                              "--with-icc-directory=/run/host/usr/share/color/icc/",
-                             "--with-lua=force", "--with-python=force", "--with-javascript=force",
-                             "--with-build-id=org.gimp.GIMP.flatpak.stable",
+                             "--with-build-id=org.gimp.GIMP.flatpak.dev",
                              "--disable-check-update" ],
             "cleanup": [ "/bin/gimptool-3.0", "/bin/gimp-console-2.99" ],
             "sources": [