diff mbox series

[meta-gnome,PATCHv2] geoclue: update to latest commit to allow to build with libsoup-3.0

Message ID 20221210055532.599338-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome,PATCHv2] geoclue: update to latest commit to allow to build with libsoup-3.0 | expand

Commit Message

Markus Volk Dec. 10, 2022, 5:55 a.m. UTC
Hereby gnome-session will be buildable without libsoup2

- fix polkit-1 directory permissions

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../{geoclue_2.5.7.bb => geoclue_2.6.0.bb}       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-navigation/geoclue/{geoclue_2.5.7.bb => geoclue_2.6.0.bb} (72%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb
similarity index 72%
rename from meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb
rename to meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb
index 3abb62944..eb6a2c4f1 100644
--- a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.6.0.bb
@@ -8,11 +8,11 @@  SECTION = "console/network"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6"
 
-DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native"
+DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native"
 
-inherit meson pkgconfig gtk-doc gobject-introspection vala
+inherit meson pkgconfig gtk-doc gobject-introspection vala useradd
 
-SRCREV = "3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8"
+SRCREV = "becfa5837cfafa064219a5ab2c2a4eaf35b24c0b"
 SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1"
 
 S = "${WORKDIR}/git"
@@ -34,8 +34,18 @@  EXTRA_OEMESON += " \
     -Ddemo-agent=false \
 "
 
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-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 \