From 45994ac07eea9a4abdfcbacdb616fa8f0770bb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sat, 9 Oct 2021 02:20:11 +0100
Subject: [PATCH] recipes-flatpak/flatpak/flatpak_git.bb: Update to 1.12.1

Fixes #3
---
 recipes-flatpak/flatpak/files/vartmp.patch | 50 ----------------------
 recipes-flatpak/flatpak/flatpak_git.bb     |  7 ++-
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 recipes-flatpak/flatpak/files/vartmp.patch

diff --git a/recipes-flatpak/flatpak/files/vartmp.patch b/recipes-flatpak/flatpak/files/vartmp.patch
deleted file mode 100644
index 52462e8..0000000
--- a/recipes-flatpak/flatpak/files/vartmp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
-index 7e26d034..904198b0 100644
---- a/common/flatpak-exports.c
-+++ b/common/flatpak-exports.c
-@@ -657,10 +657,10 @@ flatpak_exports_path_is_visible (FlatpakExports *exports,
- static gboolean
- never_export_as_symlink (const char *path)
- {
--  /* Don't export /tmp as a symlink even if it is on the host, because
--     that will fail with the pre-existing directory we created for /tmp,
-+  /* Don't export {/var,}/tmp as a symlink even if it is on the host, because
-+     that will fail with the pre-existing directory we created for it,
-      and anyway, it being a symlink is not useful in the sandbox */
--  if (strcmp (path, "/tmp") == 0)
-+  if (strcmp (path, "/tmp") == 0 || strcmp (path, "/var/tmp") == 0)
-     return TRUE;
- 
-   return FALSE;
-diff --git a/tests/test-exports.c b/tests/test-exports.c
-index b39fd477..c0af5689 100644
---- a/tests/test-exports.c
-+++ b/tests/test-exports.c
-@@ -1305,6 +1305,8 @@ test_exports_unusual (void)
-     { "usr/lib", FAKE_DIR },
-     { "usr/share", FAKE_DIR },
-     { "var/home/me", FAKE_DIR },
-+    { "var/volatile/tmp", FAKE_DIR },
-+    { "var/tmp", FAKE_SYMLINK, "volatile/tmp" },
-     { NULL }
-   };
-   g_autoptr(FlatpakBwrap) bwrap = flatpak_bwrap_new (NULL);
-@@ -1333,6 +1335,9 @@ test_exports_unusual (void)
-   flatpak_exports_add_path_expose (exports,
-                                    FLATPAK_FILESYSTEM_MODE_READ_ONLY,
-                                    "/tmp");
-+  flatpak_exports_add_path_expose (exports,
-+                                   FLATPAK_FILESYSTEM_MODE_READ_WRITE,
-+                                   "/var/tmp");
-   flatpak_exports_add_path_expose (exports,
-                                    FLATPAK_FILESYSTEM_MODE_READ_ONLY,
-                                    "not-absolute");
-@@ -1346,6 +1351,8 @@ test_exports_unusual (void)
-   i = assert_next_is_bind (bwrap, i, "--ro-bind", "/tmp", "/tmp");
-   i = assert_next_is_bind (bwrap, i, "--ro-bind", "/var/home/me",
-                            "/var/home/me");
-+  i = assert_next_is_bind (bwrap, i, "--bind", "/var/tmp",
-+                           "/var/tmp");
-   i = assert_next_is_bind (bwrap, i, "--ro-bind", "/usr", "/run/host/usr");
-   i = assert_next_is_symlink (bwrap, i, "usr/bin", "/run/host/bin");
-   i = assert_next_is_symlink (bwrap, i, "usr/lib", "/run/host/lib");
diff --git a/recipes-flatpak/flatpak/flatpak_git.bb b/recipes-flatpak/flatpak/flatpak_git.bb
index c112f90..1aed8de 100644
--- a/recipes-flatpak/flatpak/flatpak_git.bb
+++ b/recipes-flatpak/flatpak/flatpak_git.bb
@@ -4,13 +4,12 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = " \
-    gitsm://git@github.com/flatpak/flatpak;protocol=https;branch=master \
+    gitsm://git@github.com/flatpak/flatpak;protocol=https;branch=flatpak-1.12.x \
 "
-SRC_URI += " file://vartmp.patch "
 
-SRCREV = "dd6b99d0d30129c1beab8fe61ba4f1beb15930c5"
+SRCREV = "afb3575d3113a8491af25af3bbc7bcf1cb5b9b33"
 
-PV = "1.11.3+git${SRCPV}"
+PV = "1.12.1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext systemd gobject-introspection gtk-doc manpages