[polari/wip/fmuellner/nm-portal-fixes: 8/9] flatpak: Drop workarounds

[Florian Müllner <fmuellner src gnome org>]

commit 9c3e431e4055a7ed7bdbd5d6585fa6d9de9c5bc4
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Aug 31 17:20:22 2018 +0200

    flatpak: Drop workarounds
    
    The first issue was fixed in gjs and is no longer needed.
    
    The second issue has been partially addressed in that the portal
    will now fetch the initial state, albeit asynchronously and thus
    with a small delay. This is unfortunately going to stay with us,
    so we'll need to properly address this in master instead of adding
    a partial workaround in the flatpak.
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/68

 .gitlab-ci.yml                        |  2 -
 flatpak/org.gnome.Polari.json         |  4 --
 flatpak/work-around-regressions.patch | 87 -----------------------------------
 3 files changed, 93 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1748a9f..bfa05ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,6 @@ flatpak:
         - tar -xzf cache.tar.gz .flatpak-builder/cache || true
     script:
         - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        # Work around for gjs/gio regressions until we get a proper fix
-        - patch -p1 <flatpak/work-around-regressions.patch
         # Make sure to keep this in sync with the Flatpak manifest, all arguments
         # are passed except the config-args because we build it ourselves
         - flatpak build app meson --prefix=/app ${MESON_ARGS} _build
diff --git a/flatpak/org.gnome.Polari.json b/flatpak/org.gnome.Polari.json
index ef3b45a..d500e66 100644
--- a/flatpak/org.gnome.Polari.json
+++ b/flatpak/org.gnome.Polari.json
@@ -145,10 +145,6 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/polari.git";
-                },
-                {
-                    "type": "patch",
-                    "path": "work-around-regressions.patch"
                 }
             ]
         }