From 5135348ca36ba35dac9b40bc7ad78009b881f9f4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 30 Jun 2023 08:54:03 +0200
Subject: Sync flatpak-manifest.in with Flathub

...including
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/1e12b1f1de1f5f3dbe65f2f973d411388166f4ed>
"Change gvfs source back to download.gnome.org",
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/dc0eccf0258c430602c07ad38f12bc084f716162>
"Add metadata for flatpak-external-data-checker",
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/155bff6463688904e14db1374393894daa459492>
"Update bundled krb5",
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/ec8c3556e423d435599a5b24234caa5ffe9db2a7>
"Reformat the JSON source (#240)", and
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/e09a13847fdc6c18d42aa99fa476e2b736c0c9e0>
"Update gvfs-1.50.4.tar.xz to 1.50.5 (#244)".

Change-Id: I970276ebe815b9dd2f61000abcb1a726cfd258ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153787
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 solenv/flatpak-manifest.in | 53 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bdc7bf63cce4..10b4001b5de6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -18,17 +18,44 @@
         {
             "name": "gvfs",
             "buildsystem": "meson",
-            "config-opts": [ "-Dsystemduserunitdir=no", "-Dtmpfilesdir=no", "-Dinstalled_tests=true",
-            "-Dadmin=false", "-Dafc=false", "-Dafp=false",
-            "-Darchive=false", "-Dcdda=false", "-Ddnssd=false", "-Dgoa=false", "-Dgoogle=false",
-            "-Dgphoto2=false", "-Dhttp=false", "-Dmtp=false", "-Dnfs=false", "-Dsftp=false", "-Dsmb=false",
-            "-Dudisks2=false", "-Dbluray=false", "-Dfuse=false", "-Dgcr=false", "-Dgcrypt=false",
-            "-Dgudev=false", "-Dkeyring=false", "-Dlogind=false", "-Dlibusb=false" ],
+            "config-opts": [
+                "-Dsystemduserunitdir=no",
+                "-Dtmpfilesdir=no",
+                "-Dinstalled_tests=true",
+                "-Dadmin=false",
+                "-Dafc=false",
+                "-Dafp=false",
+                "-Darchive=false",
+                "-Dcdda=false",
+                "-Ddnssd=false",
+                "-Dgoa=false",
+                "-Dgoogle=false",
+                "-Dgphoto2=false",
+                "-Dhttp=false",
+                "-Dmtp=false",
+                "-Dnfs=false",
+                "-Dsftp=false",
+                "-Dsmb=false",
+                "-Dudisks2=false",
+                "-Dbluray=false",
+                "-Dfuse=false",
+                "-Dgcr=false",
+                "-Dgcrypt=false",
+                "-Dgudev=false",
+                "-Dkeyring=false",
+                "-Dlogind=false",
+                "-Dlibusb=false"
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://gitlab.gnome.org/GNOME/gvfs/-/archive/1.50.4/gvfs-1.50.4.tar.gz",
-                    "sha256": "c67bba49c5b1dbe0b8b8f53b45eab545f6a6ce36fcdf3c11ac92464732b60ea5"
+                    "url": "https://download.gnome.org/sources/gvfs/1.50/gvfs-1.50.5.tar.xz",
+                    "sha256": "b86f09b7331c8642ecebf46a3cda0692f5eb26086f132326a5483c2ebf86a4cb",
+                    "x-checker-data": {
+                        "type": "gnome",
+                        "name": "gvfs",
+                        "stable-only": true
+                    }
                 }
             ]
         },
@@ -48,8 +75,14 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://kerberos.org/dist/krb5/1.20/krb5-1.20.1.tar.gz",
-                    "sha256": "704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851"
+                    "url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.tar.gz",
+                    "sha256": "69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b",
+                    "x-checker-data": {
+                        "type": "html",
+                        "url": "https://kerberos.org/dist/",
+                        "version-pattern": "Kerberos V5 Release ([\\d\\.]+) - current release",
+                        "url-template": "https://kerberos.org/dist/krb5/$major.$minor/krb5-$version.tar.gz"
+                    }
                 }
             ]
         },
-- 
cgit