[gnome-boxes/build-deps-with-meson: 1/2] flatpak: Update spice[-gtk] so we can build it with meson

[Felipe Borges <felipeborges src gnome org>]

commit afcae09fba4aec40b58e8a611f9b326bf152aa7d
Author: Felipe Borges <felipeborges gnome org>
Date:   Fri Sep 27 16:10:26 2019 +0200

    flatpak: Update spice[-gtk] so we can build it with meson
    
    The newest versions of spice, spice-protocol, and spice-gtk are
    now building with the Meson buildsystem.
    
    This can improve our overall build time significantly.

 build-aux/flatpak/org.gnome.Boxes.json             |  82 ++++++------
 ...k-ungrab-mounse-on-leave-event-on-wayland.patch |  53 --------
 .../spice-gtk-use-gdkseat-api-on-wayland.patch     | 141 ---------------------
 build-aux/flatpak/spice-meson-fix-version.patch    |  43 +++++++
 4 files changed, 85 insertions(+), 234 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index dd76872c..0ec2e4db 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -191,34 +191,26 @@
         },
         {
             "name" : "spice-protocol",
+            "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/releases/spice-protocol-0.12.15.tar.bz2";,
-                    "sha256" : "8b4db23baa4b1337a50d049d9bf43f932331dd95f204836c0ce46c4962306419"
+                    "url" : "https://www.spice-space.org/download/releases/spice-protocol-0.14.0.tar.bz2";,
+                    "sha256" : "b6a4aa1ca32668790b45a494bbd000e9d05797b391d5a5d4b91adf1118216eac"
                 }
             ]
         },
         {
             "name" : "phodav",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "http://ftp.gnome.org/pub/GNOME/sources/phodav/2.2/phodav-2.2.tar.xz";,
-                    "sha256" : "080305dc9e804562f200ffc8c7d345c76754fce9cb01489dddb1b2c52c0557c1"
-                }
-            ]
-        },
-        {
-            "name" : "spice",
+            "buildsystem" : "meson",
             "config-opts" : [
-              "--disable-celt051"
+                "-Dsystemd=disabled"
             ],
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://spice-space.org/download/releases/spice-0.14.0.tar.bz2";,
-                    "sha256" : "3adb9495b51650e5eab53c74dd6a74919af4b339ff21721d9ab2a45b2e3bb848"
+                    "url" : "http://ftp.gnome.org/pub/GNOME/sources/phodav/2.3/phodav-2.3.tar.xz";,
+                    "sha256" : "6ef61e624c30a42fb720ef7ade7447e9ba922d69024b0326dc072fa3362ebe59"
                 }
             ]
         },
@@ -236,33 +228,53 @@
                 }
             ]
         },
+        {
+            "name" : "libcacard",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://www.spice-space.org/download/libcacard/libcacard-2.5.3.tar.xz";,
+                    "sha256": "243ff03c563a95faed497db7f524fcb34ccd6f388d1175ecf31c371a3188963b"
+                }
+            ]
+        },
+        {
+            "name" : "spice",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dlz4=false",
+                "-Dmanual=false"
+            ],
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://spice-space.org/download/releases/spice-0.14.2.tar.bz2";,
+                    "sha256" : "b203b3882e06f4c7249a3150d90c84e1a90490d41ead255a3d2cede46f4a29a7"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "spice-meson-fix-version.patch"
+                }
+            ]
+        },
         {
             "name" : "spice-gtk",
+            "buildsystem": "meson",
             "build-options" : {
                 "env" : {
                     "PYTHONPATH" : "/app"
                 }
             },
             "config-opts" : [
-                "--disable-controller",
-                "--enable-vala",
-                "--disable-gtk-doc",
-                "--enable-python-checks",
-                "--enable-webdav"
+                "-Dvapi=enabled",
+                "-Dwebdav=enabled",
+                "-Dgtk_doc=disabled"
             ],
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/gtk/spice-gtk-0.36.tar.bz2";,
-                    "sha256" : "7126c3584df12d40dcf4970f5f46fafd65b757620f911687e549f7da5c8fd7cd"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "spice-gtk-use-gdkseat-api-on-wayland.patch"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "spice-gtk-ungrab-mounse-on-leave-event-on-wayland.patch"
+                    "url" : "https://www.spice-space.org/download/gtk/spice-gtk-0.37.tar.bz2";,
+                    "sha256" : "1f28b706472ad391cda79a93fd7b4c7a03e84b88fc46ddb35dddbe323c923bb7"
                 }
             ]
         },
@@ -303,16 +315,6 @@
                 }
             ]
         },
-        {
-            "name" : "libcacard",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/libcacard/libcacard-2.5.3.tar.xz";,
-                    "sha256": "243ff03c563a95faed497db7f524fcb34ccd6f388d1175ecf31c371a3188963b"
-                }
-            ]
-        },
         {
             "name" : "python-mako",
             "buildsystem" : "simple",
diff --git a/build-aux/flatpak/spice-meson-fix-version.patch b/build-aux/flatpak/spice-meson-fix-version.patch
new file mode 100644
index 00000000..7954940e
--- /dev/null
+++ b/build-aux/flatpak/spice-meson-fix-version.patch
@@ -0,0 +1,43 @@
+From b4a6c1abcc71a66c5b3432787ff4131d082e95ef Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace protonmail ch>
+Date: Sat, 18 May 2019 22:40:39 -0400
+Subject: [PATCH] meson: correct some things
+
+We can get source_root from meson, and doing [3]
+can give you an out of bounds error in certain cases.
+
+Acked-by: Frediano Ziglio <fziglio redhat com>
+---
+ meson.build        | 2 +-
+ server/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 8b8ae8bb..e58c436c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2,7 +2,7 @@
+ # project definition
+ #
+ project('spice', 'c',
+-        version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : 
true).stdout().strip(),
++        version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check 
: true).stdout().strip(),
+         license : 'LGPLv2.1',
+         meson_version : '>= 0.48')
+ 
+diff --git a/server/meson.build b/server/meson.build
+index 2ca43e9c..a7676f7e 100644
+--- a/server/meson.build
++++ b/server/meson.build
+@@ -7,7 +7,7 @@ version_info = meson.project_version().split('.')
+ major = '@0@'.format(version_info[0])
+ minor = '@0@'.format(version_info[1])
+ micro = version_info[2].to_int()
+-if not version_info[3].contains('git')
++if not version_info.contains('git')
+   micro += 1
+ endif
+ micro = '@0@'.format(micro)
+-- 
+2.21.0
+