From f4fd3f30429abe5cb6d2882b181a650d1fa823a7 Mon Sep 17 00:00:00 2001
From: Denis Zheleztsov <d_zheleztsov@wargaming.net>
Date: Thu, 9 Dec 2021 16:37:38 +0300
Subject: [PATCH] Fix flatpak build

Also, update gtksourceview dependency
---
 meson.build          |  7 ++++++-
 org.vaccine.app.json | 17 +++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index af601fe..face0bc 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,11 @@ conf = configuration_data()
 conf.set('package', 'Vaccine')
 conf.set('version', '0.0.2')
 
+gtksourceview = dependency('gtksourceview-3.0', required: false)
+if not gtksourceview.found()
+  gtksourceview = dependency('gtksourceview-4')
+endif
+
 deps = [
     dependency('glib-2.0', version: '>=2.44'),
     dependency('gobject-2.0'),
@@ -13,7 +18,7 @@ deps = [
     dependency('gee-0.8'),
     dependency('gstreamer-1.0'),
     dependency('gstreamer-base-1.0'),
-    dependency('gtksourceview-3.0'),
+    gtksourceview,
     meson.get_compiler('c').find_library('m', required: false)
 ]
 
diff --git a/org.vaccine.app.json b/org.vaccine.app.json
index 21eda09..760cd5d 100644
--- a/org.vaccine.app.json
+++ b/org.vaccine.app.json
@@ -1,7 +1,7 @@
 {
   "app-id": "org.vaccine.app",
   "runtime": "org.gnome.Platform",
-  "runtime-version": "3.24",
+  "runtime-version": "3.38",
   "sdk": "org.gnome.Sdk",
   "command": "vaccine",
   "finish-args": [
@@ -13,11 +13,15 @@
     "--talk-name=ca.desrt.dconf",
     "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
   ],
-  "cleanup": ["*.a", "*.la", "/include"],
+  "cleanup": [
+    "*.a",
+    "*.la",
+    "/include"
+  ],
   "modules": [
     {
       "name": "gee-0.8",
-      "build-options" : {
+      "build-options": {
         "env": {
           "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
           "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
@@ -26,17 +30,18 @@
       "sources": [
         {
           "type": "git",
-          "url": "git://git.gnome.org/libgee"
+          "url": "https://gitlab.gnome.org/GNOME/libgee.git"
         }
       ]
     },
     {
       "name": "gtksourceview",
+      "buildsystem": "meson",
       "sources": [
         {
           "type": "git",
-          "url": "git://git.gnome.org/gtksourceview",
-          "branch": "gnome-3-24"
+          "url": "https://gitlab.gnome.org/GNOME/gtksourceview.git",
+          "branch": "4.6.1"
         }
       ]
     },