From f87993a918f3087284ac7f1d96701c7bfbbef725 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 9 Jan 2022 23:27:28 +0100 Subject: [PATCH] epiphany: make libportal optional, and move it to meta-oe Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - meta/recipes-gnome/epiphany/epiphany_41.0.bb | 2 +- meta/recipes-gnome/libportal/libportal_0.5.bb | 17 ----------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 meta/recipes-gnome/libportal/libportal_0.5.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0af6974a3d..ab7915482a 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -369,7 +369,6 @@ RECIPE_MAINTAINER:pn-libpcre = "Yi Zhao " RECIPE_MAINTAINER:pn-libpcre2 = "Unassigned " RECIPE_MAINTAINER:pn-libpipeline = "Wang Mingyu " RECIPE_MAINTAINER:pn-libpng = "Anuj Mittal " -RECIPE_MAINTAINER:pn-libportal = "Alexander Kanavin " RECIPE_MAINTAINER:pn-libproxy = "Anuj Mittal " RECIPE_MAINTAINER:pn-libpthread-stubs = "Alexander Kanavin " RECIPE_MAINTAINER:pn-libptytty = "Alexander Kanavin " diff --git a/meta/recipes-gnome/epiphany/epiphany_41.0.bb b/meta/recipes-gnome/epiphany/epiphany_41.0.bb index 8f3bd87340..a64cdefd86 100644 --- a/meta/recipes-gnome/epiphany/epiphany_41.0.bb +++ b/meta/recipes-gnome/epiphany/epiphany_41.0.bb @@ -15,7 +15,6 @@ DEPENDS = " \ libarchive \ libdazzle \ libhandy \ - libportal \ glib-2.0-native \ " @@ -37,6 +36,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3" PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal" FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" diff --git a/meta/recipes-gnome/libportal/libportal_0.5.bb b/meta/recipes-gnome/libportal/libportal_0.5.bb deleted file mode 100644 index 67f63fea68..0000000000 --- a/meta/recipes-gnome/libportal/libportal_0.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals." -DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \ -with a familiar GObject API along side the D-Bus API" -HOMEPAGE = "https://github.com/flatpak/libportal" -BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" - -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" -S = "${WORKDIR}/git" - -inherit meson gtk-doc gobject-introspection - -DEPENDS += "glib-2.0 glib-2.0-native gtk+3" - -EXTRA_OEMESON = "-Dbackends=gtk3 -Dvapi=false" -- 2.40.1