[dia] flatpak: Build intltool _before_ ibus

[Zander <zbrown src gnome org>]

commit 4a3a7f6d2f0126c50fa892ba8436780f04b00a58
Author: Zander Brown <zbrown gnome org>
Date:   Thu Aug 29 17:02:57 2019 +0100

    flatpak: Build intltool _before_ ibus

 build-aux/flatpak/gtk2-use-adwaita-theme.patch |   5 +-
 build-aux/flatpak/gtk2.json                    | 109 +++++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Dia.json           |   2 +-
 3 files changed, 112 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/flatpak/gtk2-use-adwaita-theme.patch b/build-aux/flatpak/gtk2-use-adwaita-theme.patch
index 5ee57789..916b3491 100644
--- a/build-aux/flatpak/gtk2-use-adwaita-theme.patch
+++ b/build-aux/flatpak/gtk2-use-adwaita-theme.patch
@@ -5,7 +5,7 @@ index 186a8f5cb2..f5c39b5afe 100644
 @@ -3000,6 +3000,50 @@ check_transform (const gchar *xsettings_name,
      return TRUE;
  }
-
+ 
 +static gchar *
 +gtk_rc_get_theme_dir (void)
 +{
@@ -56,7 +56,7 @@ index 186a8f5cb2..f5c39b5afe 100644
 @@ -3050,6 +3094,11 @@ gdk_screen_get_setting (GdkScreen   *screen,
    if (result != XSETTINGS_SUCCESS)
      goto out;
-
+ 
 +  if (strcmp (name, "gtk-theme-name") == 0 &&
 +      (setting->type != XSETTINGS_TYPE_STRING ||
 +       !theme_name_valid (setting)))
@@ -78,4 +78,3 @@ index 3fbbf00548..5c0a4b33d2 100644
  #endif
                                                                  GTK_PARAM_READWRITE),
                                               NULL);
-
diff --git a/build-aux/flatpak/gtk2.json b/build-aux/flatpak/gtk2.json
new file mode 100644
index 00000000..00058a9c
--- /dev/null
+++ b/build-aux/flatpak/gtk2.json
@@ -0,0 +1,109 @@
+{
+  "name": "gnome-themes-extra",
+  "rm-configure": true,
+  "config-opts": [
+    "--disable-dependency-tracking",
+    "--disable-gtk3-engine"
+  ],
+  "cleanup": [
+    "/share/themes/Adwaita/gtk-3.0",
+    "/share/themes/Adwaita-dark/gtk-3.0",
+    "/share/themes/HighContrast/gtk-3.0",
+    "*.la"
+  ],
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://download.gnome.org/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz";,
+      "sha256": "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"
+    },
+    {
+      "type": "shell",
+      "//": "We want to avoid generating icons as its 99% of the build time and gnome runtime has it",
+      "commands": [
+        "sed -i 's/icons//' themes/HighContrast/Makefile.am"
+      ]
+    },
+    {
+      "type": "script",
+      "commands": [
+        "autoreconf -fsi"
+      ]
+    }
+  ],
+  "modules": [
+    {
+      "name": "gtk2",
+      "cleanup": [
+        "/bin",
+        "/share/gtk-2.0",
+        "/share/aclocal",
+        "/share/gtk-doc",
+        "/lib/pkgconfig",
+        "/lib/gtk-2.0/include",
+        "/include",
+        "*.la"
+      ],
+      "x-cpe": {
+        "product": "gtk+"
+      },
+      "config-opts": [
+        "--disable-dependency-tracking",
+        "--disable-gtk-doc-html",
+        "--disable-introspection",
+        "--with-xinput=xfree"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz";,
+          "sha256": "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"
+        },
+        {
+          "type": "patch",
+          "path": "gtk2-use-adwaita-theme.patch"
+        }
+      ]
+    },
+    "../intltool/intltool-0.51.json",
+    {
+      "name": "ibus-gtk2",
+      "no-make-install": true,
+      "config-opts": [
+        "--disable-xim",
+        "--disable-dconf",
+        "--disable-gconf",
+        "--disable-memconf",
+        "--disable-schemas-compile",
+        "--disable-schemas-install",
+        "--disable-gtk3",
+        "--disable-setup",
+        "--disable-ui",
+        "--disable-engine",
+        "--disable-python-library",
+        "--disable-libnotify",
+        "--disable-emoji-dict",
+        "--disable-appindicator",
+        "--disable-glibtest",
+        "--disable-tests",
+        "--disable-unicode-dict",
+        "--disable-introspection",
+        "--disable-python2"
+      ],
+      "ensure-writable": [
+        "/lib/gtk-2.0/2.10.0/immodules.cache"
+      ],
+      "post-install": [
+        "install -m644 --target-directory=${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules 
client/gtk2/.libs/im-ibus.so",
+        "gtk-query-immodules-2.0 > ${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules.cache"
+      ],
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://github.com/ibus/ibus/releases/download/1.5.19/ibus-1.5.19.tar.gz";,
+          "sha256": "4b66c798dab093f0fa738e5c10688d395a463287d13678c208a81051af5d2429"
+        }
+      ]
+    }
+  ]
+}
diff --git a/build-aux/flatpak/org.gnome.Dia.json b/build-aux/flatpak/org.gnome.Dia.json
index fb78a2fd..fb2911d1 100644
--- a/build-aux/flatpak/org.gnome.Dia.json
+++ b/build-aux/flatpak/org.gnome.Dia.json
@@ -32,7 +32,7 @@
         "*.a"
     ],
     "modules": [
-        "shared-modules/gtk2/gtk2.json",
+        "gtk2.json",
         "shared-modules/python2.7/python-2.7.json",
         {
                "name": "pango",