[gnome-control-center] flatpak: Add udisks and fix other dependencies

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 1b0a4c2effd531af5e7b5e854aa99cd4154f2460
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon May 20 18:52:00 2019 -0300

    flatpak: Add udisks and fix other dependencies
    
    This is reaching the edge of sanity, but it's enough to
    get a working Flatpak.

 build-aux/flatpak/libparted-include.patch          |  22 ++
 build-aux/flatpak/org.gnome.Settings.json          | 229 ++++++++++++++++++---
 build-aux/flatpak/polkit-autogen                   |   4 -
 ...build-Add-option-to-build-without-polkitd.patch | 101 ---------
 4 files changed, 222 insertions(+), 134 deletions(-)
---
diff --git a/build-aux/flatpak/libparted-include.patch b/build-aux/flatpak/libparted-include.patch
new file mode 100644
index 000000000..82ca3e48b
--- /dev/null
+++ b/build-aux/flatpak/libparted-include.patch
@@ -0,0 +1,22 @@
+From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones redhat com>
+Date: Sat, 24 Mar 2018 17:37:02 +0000
+Subject: linux: Include <sys/sysmacros.h> for major() macro.
+
+Since glibc 2.27 this header is required.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 31b98ab..7e86b51 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -41,6 +41,7 @@
+ #include <sys/utsname.h>        /* for uname() */
+ #include <scsi/scsi.h>
+ #include <assert.h>
++#include <sys/sysmacros.h>
+ #ifdef ENABLE_DEVICE_MAPPER
+ #include <libdevmapper.h>
+ #endif
diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json
index a08e05028..3c3166bd7 100644
--- a/build-aux/flatpak/org.gnome.Settings.json
+++ b/build-aux/flatpak/org.gnome.Settings.json
@@ -1,6 +1,6 @@
 {
     "app-id" : "org.gnome.Settings",
-    "runtime" : "org.gnome.Platform",
+    "runtime" : "org.gnome.Sdk",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
     "command" : "gnome-control-center",
@@ -60,35 +60,16 @@
             "name" : "polkit",
             "buildsystem" : "autotools",
             "config-opts" : [
-                "--disable-polkitd",
                 "--disable-man-pages",
                 "--disable-introspection",
+                "--disable-libelogind",
                 "--enable-libsystemd-login=no",
                 "--with-systemdsystemunitdir=no"
             ],
-            "rm-configure" : true,
-            "cleanup" : [
-                "/bin/*",
-                "/etc/pam.d",
-                "/etc/dbus-1",
-                "/share/dbus-1/system-services/*",
-                "/share/polkit-1",
-                "/lib/polkit-1"
-            ],
             "sources" : [
                 {
-                    "type" : "archive",
-                    "url" : "http://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz";,
-                    "sha256" : "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "polkit-build-Add-option-to-build-without-polkitd.patch"
-                },
-                {
-                    "type" : "file",
-                    "path" : "polkit-autogen",
-                    "dest-filename" : "autogen.sh"
+                    "type" : "git",
+                    "url" : "git://anongit.freedesktop.org/polkit"
                 }
             ]
         },
@@ -191,7 +172,11 @@
                 "-Dbash_completion=false",
                 "-Dman=false",
                 "-Dudev_rules=false",
-                "-Dsystemd=false"
+                "-Dsystemd=false",
+                "-Dvapi=false",
+                "-Ddocs=false",
+                "-Dtests=false",
+                "-Dinstalled_tests=false"
             ],
             "sources" : [
                 {
@@ -225,13 +210,14 @@
         },
         {
             "name" : "gnome-online-accounts",
-            "buildsystem" : "autotools",
+            "buildsystem" : "meson",
             "build-options" : {
                 "cflags" : "-Wno-error"
             },
             "config-opts" : [
-                "--disable-telepathy",
-                "--disable-documentation"
+                "-Dgtk_doc=false",
+                "-Dintrospection=false",
+                "-Dvapi=false"
             ],
             "sources" : [
                 {
@@ -253,6 +239,11 @@
         {
             "name" : "geocode-glib",
             "buildsystem" : "meson",
+            "config-opts" : [
+               "-Denable-gtk-doc=false",
+               "-Denable-introspection=false",
+               "-Denable-installed-tests=false"
+            ],
             "sources" : [
                 {
                     "type" : "git",
@@ -263,6 +254,11 @@
         {
             "name" : "libgweather",
             "buildsystem" : "meson",
+            "config-opts" : [
+               "-Dglade_catalog=false",
+               "-Denable_vala=false",
+               "-Dgtk_doc=false"
+            ],
             "sources" : [
                 {
                     "type" : "git",
@@ -273,6 +269,13 @@
         {
             "name" : "upower",
             "buildsystem" : "autotools",
+            "config-opts" : [
+               "--prefix=/app",
+               "--with-systemdsystemunitdir=/app/lib/systemd/system",
+               "--disable-gtk-doc",
+               "--disable-man-pages",
+               "--disable-tests"
+            ],
             "sources" : [
                 {
                     "type" : "git",
@@ -335,8 +338,6 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "tag": "1.14.0",
-                    "commit" : "2979c891c4af7584780924e92b6d448b7d6cd328",
                     "url" : "https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git";
                 }
             ]
@@ -367,6 +368,7 @@
                 "--disable-introspection",
                 "--disable-vala",
                 "--with-udev-base-dir=/app/lib",
+                "--with-systemdsystemunitdir=/app/lib/systemd/system",
                 "--without-mbim",
                 "--without-qmi"
             ],
@@ -517,6 +519,175 @@
                 }
             ]
         },
+        {
+            "name" : "libkmod",
+            "buildsystem" : "autotools",
+            "sources" : [
+               {
+                    "type" : "archive",
+                    "url" : "https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz";,
+                    "sha256" : "7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd"
+               }
+            ]
+        },
+        {
+            "name" : "lvm2",
+            "buildsystem" : "autotools",
+            "config-opts" : [
+                "--prefix=/app",
+                "--enable-cmdlib",
+                "--enable-dmeventd",
+                "--enable-pkgconfig",
+                "--with-usrlibdir=/app/lib",
+                "--with-usrbindir=/app/bin",
+                "--with-staticdir=/app/bin"
+            ],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://www.sourceware.org/pub/lvm2/LVM2.2.02.177.tgz";,
+                    "sha256" : "4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2"
+                }
+            ],
+            "post-install" : [
+                "chmod 755 /app/sbin/dm*",
+                "chmod 755 /app/sbin/lvm*",
+                "chmod 755 /app/lib/libdevmapper-event-lvm2.so.2.02",
+                "chmod 755 /app/lib/libdevmapper-event-lvm2mirror.so",
+                "chmod 755 /app/lib/libdevmapper-event-lvm2raid.so",
+                "chmod 755 /app/lib/libdevmapper-event-lvm2snapshot.so",
+                "chmod 755 /app/lib/libdevmapper-event-lvm2thin.so",
+                "chmod 755 /app/lib/libdevmapper-event.so.1.02",
+                "chmod 755 /app/lib/libdevmapper.so.1.02",
+                "chmod 755 /app/lib/liblvm2cmd.so.2.02"
+            ]
+        },
+        {
+            "name" : "parted",
+            "buildsystem" : "autotools",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "http://ftp.gnu.org/gnu/parted/parted-3.2.tar.xz";,
+                    "sha256" : "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "libparted-include.patch"
+                }
+            ]
+        },
+        {
+            "name" : "mpfr",
+            "buildsystem" : "autotools",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://www.mpfr.org/mpfr-4.0.2/mpfr-4.0.2.tar.xz";,
+                    "sha256" : "1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a"
+                }
+            ]
+        },
+        {
+            "name" : "bytesize",
+            "buildsystem" : "autotools",
+            "config-opts" : [
+                "--with-gtk-doc=no"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/storaged-project/libbytesize.git";
+                }
+            ]
+        },
+        {
+            "name" : "cryptsetup",
+            "autotools" : "autotools",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz";,
+                    "sha256" : "2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd"
+                }
+            ]
+        },
+        {
+            "name" : "swig",
+            "buildsystem" : "autotools",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/swig/swig.git";
+                }
+            ]
+        },
+        {
+            "name" : "volume-key",
+            "buildsystem" : "simple",
+            "build-commands" : [
+                "autoreconf -i",
+                "./configure --prefix=/app",
+                "make install"
+            ],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://github.com/felixonmars/volume_key/archive/volume_key-0.3.11.tar.gz";,
+                    "sha256" : "92250506756eca19a0b6f50c16d3502eb5566ea4725645d7c5d87eb5cc8f3fd8"
+                }
+            ]
+        },
+        {
+            "name" : "libblockdev",
+            "buildsystem" : "autotools",
+            "config-opts" : [
+                "--disable-tests",
+                "--with-btrfs=no",
+                "--with-dm=no",
+                "--with-gtk-doc=no",
+                "--with-kbd=no",
+                "--with-lvm=no",
+                "--with-lvm-dbus=no",
+                "--with-mpath=no",
+                "--with-nvdimm=no",
+                "--with-tools=no",
+                "--with-vdo=no"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/storaged-project/libblockdev.git";
+                }
+            ]
+        },
+        {
+            "name" : "atasmart",
+            "buildsystem" : "autotools",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "http://0pointer.de/public/libatasmart-0.19.tar.xz";,
+                    "sha256" : "61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d"
+                }
+            ]
+        },
+        {
+            "name" : "udisks",
+            "buildsystem" : "autotools",
+            "config-opts" : [
+                "--disable-introspection",
+                "--disable-lvm2",
+                "--with-systemdsystemunitdir=/app/lib/systemd/system",
+                "--with-tmpfilesdir=/app/lib/tmpfiles.d"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/storaged-project/udisks.git";
+                }
+            ]
+        },
         {
             "name" : "gnome-control-center",
             "buildsystem" : "meson",