[gnome-builder/abderrahim/libportal-release] flatpak: use latest release of libportal

[Abderrahim Kitouni <akitouni src gnome org>]

commit 2aea4bd7d0ced77a7d0778517b4505af5dea2dac
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Nov 12 16:56:23 2021 +0100

    flatpak: use latest release of libportal
    
    This reverts commits 12102ca678fdf87d992ac578859e544085aaae87
    0bb9f5625f0e57c9336279bbb529d0464bf87ed0 and
    9b2a89ab341c11b9405a62b04935e24952cd1c14.

 build-aux/flatpak/org.gnome.Builder.json                 | 8 ++++----
 meson.build                                              | 2 +-
 src/gstyle/gstyle-color-panel.c                          | 2 +-
 src/plugins/devhelp/gbp-devhelp-page.c                   | 2 +-
 src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 2653e90fe..c6c2fa862 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -599,15 +599,15 @@
             "name" : "libportal",
             "config-opts" : [
                 "--libdir=/app/lib",
-                "--buildtype=debugoptimized",
-                "-Dbackends=gtk3"
+                "--buildtype=debugoptimized"
             ],
             "buildsystem" : "meson",
             "builddir" : true,
             "sources" : [
                 {
-                    "type" : "git",
-                    "url" : "https://github.com/flatpak/libportal.git";
+                    "type" : "archive",
+                    "url" : 
"https://github.com/flatpak/libportal/releases/download/0.4/libportal-0.4.tar.xz";,
+                    "sha256" : "3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28"
                 }
             ]
         },
diff --git a/meson.build b/meson.build
index a9e140144..15d0fda10 100644
--- a/meson.build
+++ b/meson.build
@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.29.91')
 libm_dep = cc.find_library('m', required: false)
 libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0')
 libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
-libportal_dep = dependency('libportal-gtk3', version: '>= 0.4', required: false)
+libportal_dep = dependency('libportal', version: '>= 0.3', required: false)
 libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0')
 libvte_dep = dependency('vte-2.91', version: '>= 0.65.0')
 libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false)
diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c
index a6295c168..15742a7be 100644
--- a/src/gstyle/gstyle-color-panel.c
+++ b/src/gstyle/gstyle-color-panel.c
@@ -30,7 +30,7 @@
 #include "gstyle-color.h"
 
 #include <libportal/portal.h>
-#include <libportal-gtk3/portal-gtk3.h>
+#include <libportal/portal-gtk3.h>
 
 #define HSV_TO_SCALE_FACTOR (1.0 / 256.0)
 #define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0)
diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c
index 2ac788414..5d5c52b0d 100644
--- a/src/plugins/devhelp/gbp-devhelp-page.c
+++ b/src/plugins/devhelp/gbp-devhelp-page.c
@@ -25,7 +25,7 @@
 #include <webkit2/webkit2.h>
 
 #include <libportal/portal.h>
-#include <libportal-gtk3/portal-gtk3.h>
+#include <libportal/portal-gtk3.h>
 
 #include "gbp-devhelp-page.h"
 #include "gbp-devhelp-search.h"
diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c 
b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
index 816fe643f..51d2da844 100644
--- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c
+++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
@@ -23,7 +23,7 @@
 #include "gbp-owe-workbench-addin.h"
 
 #include <libportal/portal.h>
-#include <libportal-gtk3/portal-gtk3.h>
+#include <libportal/portal-gtk3.h>
 
 struct _GbpOweWorkbenchAddin
 {