From 1deb06f77f71d5bab74afa02fa86b141fe37f2f9 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 10 Dec 2022 07:29:16 +0100 Subject: geoclue: update to latest commit to allow to build with libsoup-3.0 Hereby gnome-session will be buildable without libsoup2 - fix polkit-1 directory permissions Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../recipes-navigation/geoclue/geoclue_2.5.7.bb | 47 ------------------ .../recipes-navigation/geoclue/geoclue_2.6.0.bb | 57 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 47 deletions(-) delete mode 100644 meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb create mode 100644 meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb deleted file mode 100644 index 3abb629446..0000000000 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "The Geolocation Service" -DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ -The primary goal of the Geoclue project is to make creating location-aware applications \ -as simple as possible, while the secondary goal is to ensure that no application \ -can access location information without explicit permission from user." -LICENSE = "GPL-2.0-or-later" -SECTION = "console/network" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" - -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" - -inherit meson pkgconfig gtk-doc gobject-introspection vala - -SRCREV = "3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8" -SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" - -S = "${WORKDIR}/git" - -# Without this line, package is declared a library and named libgeoclue* -AUTO_LIBNAME_PKGS = "" - -PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" -PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" -PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" -PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" -PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" -PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" - -GTKDOC_MESON_OPTION = "gtk-doc" - -EXTRA_OEMESON += " \ - -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ - -Ddemo-agent=false \ -" - -FILES:${PN} += " \ - ${datadir}/dbus-1/system-services \ - ${libdir} \ - ${systemd_unitdir} \ - ${prefix}/libexec \ -" - -FILES:${PN}-dev += " \ - ${datadir}/dbus-1/interfaces \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb new file mode 100644 index 0000000000..61b37cd9e8 --- /dev/null +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "The Geolocation Service" +DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ +The primary goal of the Geoclue project is to make creating location-aware applications \ +as simple as possible, while the secondary goal is to ensure that no application \ +can access location information without explicit permission from user." +LICENSE = "GPL-2.0-or-later" +SECTION = "console/network" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" + +DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" + +inherit meson pkgconfig gtk-doc gobject-introspection vala useradd + +SRCREV = "becfa5837cfafa064219a5ab2c2a4eaf35b24c0b" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" + +S = "${WORKDIR}/git" + +# Without this line, package is declared a library and named libgeoclue* +AUTO_LIBNAME_PKGS = "" + +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" +PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" +PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" +PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" + +GTKDOC_MESON_OPTION = "gtk-doc" + +EXTRA_OEMESON += " \ + -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ + -Ddemo-agent=false \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" + +do_install:append() { + #Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d +} + +FILES:${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/polkit-1/rules.d \ + ${libdir} \ + ${systemd_unitdir} \ + ${prefix}/libexec \ +" + +FILES:${PN}-dev += " \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/gir-1.0 \ +" -- cgit v1.2.3-54-g00ecf