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 #include #if USE_LIBPORTAL -#include +#include #endif #include #include 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' b3e9f71c6b000'>images
AgeCommit message (Expand)Author
2020-05-22doc: Update 'Bootstrapping' for further binary seed reduction....* doc/images/gcc-core-mesboot0-graph.dot: New image, replacing * doc/images/gcc-mesboot0-bag-graph.dot: ... remove file. * doc/local.mk (DOT_FILES): Update for new image file. * doc/guix.texi (Reduced Binary Seed Bootstrap): Use it in updated description of further reduction of the trusted computing base. Jan Nieuwenhuizen
2019-03-14Merge branch 'staging' into core-updatesMarius Bakke
2019-03-13doc: Document the graphical installer some more....* doc/guix.texi (Preparing for Installation): Rewrite to specify the two installation modes. (Guided Graphical Installation): New node. (Manual Installation): New node, with the former sections. (After System Installation): New node. * doc/images/installer-network.png, doc/images/installer-partitions.png, doc/images/installer-resume.png: New files. * doc/local.mk (dist_infoimage_DATA): Add them. Ludovic Courtès
2018-12-16doc: Update mesboot graph without bootstrap-guile....* doc/images/gcc-mesboot-bag-graph.dot: Update. Jan Nieuwenhuizen
2018-11-24doc: Update for bootstrap-mescc-tools change....* doc/guix.texi (Reduced Binary Seed Bootstrap): Update for bootstrap-mescc-tools change. * doc/images/gcc-mesboot-bag-graph.dot: Regenerate. Jan Nieuwenhuizen
2018-09-23doc: Describe the Reduced Binary Seed bootstrap....* doc/guix.texi (Reduced Binary Seed Bootstrap): New node. * doc/images/gcc-mesboot-bag-graph.dot: New file. * doc/local.mk (DOT_FILES): Add it. Jan Nieuwenhuizen
2016-12-17doc: Update dot graphs....* doc/images/bootstrap-packages.dot, doc/images/coreutils-bag-graph.dot, doc/images/coreutils-graph.dot, doc/images/shepherd-graph.dot: Regenerate. Ludovic Courtès