03/03: gnu: epiphany: Fix build with libportal-0.5.

[guix-commits]

glv pushed a commit to branch master
in repository guix.

commit f7afefba00b65e94d073af3af2278a076c89dbc1
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Jan 11 16:09:06 2022 +0100

    gnu: epiphany: Fix build with libportal-0.5.
    
    * gnu/packages/patches/epiphany-update-libportal-usage.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/gnome.scm (epiphany)[source]: Use it.
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/gnome.scm                             |  7 +--
 .../patches/epiphany-update-libportal-usage.patch  | 53 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 370334d580..c1a1eb73f1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -20,7 +20,7 @@
 # Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
 # Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-# Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
+# Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
 # Copyright © 2019, 2020 John Soo <jsoo1@asu.edu>
 # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 # Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
@@ -1030,6 +1030,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/enjarify-setup-py.patch                 \
   %D%/packages/patches/enlightenment-fix-setuid-path.patch     \
   %D%/packages/patches/eog-update-libportal-usage.patch                \
+  %D%/packages/patches/epiphany-update-libportal-usage.patch   \
   %D%/packages/patches/erlang-man-path.patch                   \
   %D%/packages/patches/esmtp-add-lesmtp.patch          \
   %D%/packages/patches/eudev-rules-directory.patch             \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a3fd99312..21bd0d7d03 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -60,7 +60,7 @@
 ;;; Copyright © 2020, 2021 Sébastien Lerique <sl@eauchat.org>
 ;;; Copyright © 2021 Trevor Hass <thass@okstate.edu>
 ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
-;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch>
@@ -6793,8 +6793,9 @@ a secret password store, an adblocker, and a modern UI.")
                                   "epiphany-" version ".tar.xz"))
               (sha256
                (base32
-                "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))))
-
+                "0r7m34xzz3shdfxf2abxb069izak3yv3ijlg29qy4pfmyawkilfs"))
+              (patches
+               (search-patches "epiphany-update-libportal-usage.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
diff --git a/gnu/packages/patches/epiphany-update-libportal-usage.patch 
b/gnu/packages/patches/epiphany-update-libportal-usage.patch
new file mode 100644
index 0000000000..0d8ea045fb
--- /dev/null
+++ b/gnu/packages/patches/epiphany-update-libportal-usage.patch
@@ -0,0 +1,53 @@
+Fix for epiphany with libportal-0.5.
+
+This patch was adapted from upstream
+https://gitlab.gnome.org/GNOME/epiphany/-/commit/e4d259f614f75c26ad0d2094f4f569ffd1bc06d1
+
+diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c
+index 
6fc9a5dec17a63c0660cbc1d95103c8f77231d30..0fd90b3f178392930e812a8391fd81bf1371b8bf
 100644
+--- a/lib/ephy-flatpak-utils.c
++++ b/lib/ephy-flatpak-utils.c
+@@ -29,7 +29,7 @@
+ #include <gio/gio.h>
+ #include <gio/gunixfdlist.h>
+ #if USE_LIBPORTAL
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+ #endif
+ #include <string.h>
+ #include <sys/stat.h>
+diff --git a/lib/meson.build b/lib/meson.build
+index 
264f9c5fb66268fc248f780b8d1c06c8291f856d..db0a0557f0ae634d7fb95e57aba0cd901ca4d6c1
 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -66,6 +66,7 @@ libephymisc_deps = [
+   libxml_dep,
+   m_dep,
+   portal_dep,
++  portal_gtk_dep,
+   sqlite3_dep,
+   webkit2gtk_dep
+ ]
+diff --git a/meson.build b/meson.build
+index 
0b9f862b22a23619289342ec39fa0a0274558c25..4285a975004e48366789a4e66f8b23f3af05a636
 100644
+--- a/meson.build
++++ b/meson.build
+@@ -95,7 +95,8 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0')
+ libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
+ libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12')
+ nettle_dep = dependency('nettle', version: nettle_requirement)
+-portal_dep = dependency('libportal', version: '>= 0.0.2', required: 
get_option('libportal'))
++portal_dep = dependency('libportal', version: '>= 0.5', required: 
get_option('libportal'))
++portal_gtk_dep = dependency('libportal-gtk3', version: '>= 0.5', required: 
get_option('libportal'))
+ sqlite3_dep = dependency('sqlite3', version: '>= 3.22')
+ 
+ if get_option('soup2').enabled()
+@@ -108,7 +109,7 @@ else
+   webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', 
version: webkitgtk_requirement)
+ endif
+ 
+-conf.set10('USE_LIBPORTAL', portal_dep.found())
++conf.set10('USE_LIBPORTAL', portal_dep.found() and portal_gtk_dep.found())
+ 
+ webkit_revision = webkit2gtk_dep.get_variable(pkgconfig : 'revision', 
default_value : '')
+ if webkit_revision == 'tarball'