From 3584b79a4cdc410ee4aaf12b57bccd0ce035537c Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 20 May 2024 14:29:00 +0200 Subject: malcontent: move PV to malcontent.inc PV must be consistent for malcontent and malcontent-ui. Ensure this by moving PV to malcontent.inc Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- meta-oe/recipes-gnome/malcontent/malcontent-ui.bb | 48 ++++++++++++++++++++++ .../malcontent/malcontent-ui_0.12.0.bb | 48 ---------------------- meta-oe/recipes-gnome/malcontent/malcontent.bb | 44 ++++++++++++++++++++ meta-oe/recipes-gnome/malcontent/malcontent.inc | 1 + .../recipes-gnome/malcontent/malcontent_0.12.0.bb | 44 -------------------- 5 files changed, 93 insertions(+), 92 deletions(-) create mode 100644 meta-oe/recipes-gnome/malcontent/malcontent-ui.bb delete mode 100644 meta-oe/recipes-gnome/malcontent/malcontent-ui_0.12.0.bb create mode 100644 meta-oe/recipes-gnome/malcontent/malcontent.bb delete mode 100644 meta-oe/recipes-gnome/malcontent/malcontent_0.12.0.bb (limited to 'meta-oe/recipes-gnome') diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb new file mode 100644 index 0000000000..ca3bf081d6 --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb @@ -0,0 +1,48 @@ +SUMMARY = "User-Interface for malcontent." +HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +require malcontent.inc + +DEPENDS = " \ + malcontent \ + accountsservice \ + glib-2.0 \ + glib-testing \ + dbus \ + desktop-file-utils-native \ + itstool-native \ + libpam \ + polkit \ + appstream \ + flatpak \ + libadwaita \ + gtk4 \ +" + +GIR_MESON_OPTION = "" + +GTKIC_VERSION = "4" +inherit meson pkgconfig gtk-icon-cache gobject-introspection gettext features_check + +REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" + +EXTRA_OEMESON = "-Dui=enabled" + +do_install() { + install -d ${D}${datadir}/gir-1.0 ${D}${libdir}/girepository-1.0 ${D}${bindir} + install -d ${D}${datadir}/polkit-1/actions ${D}${datadir}/metainfo ${D}${datadir}/applications + install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.gir ${D}${datadir}/gir-1.0 + install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.typelib ${D}${libdir}/girepository-1.0 + install -m 0644 ${B}/libmalcontent-ui/libmalcontent-ui-1.so.${PV} ${D}${libdir} + ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so + ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1 + install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir} + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml ${D}${datadir}/metainfo + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications +} + +FILES:${PN} += "${bindir} ${libdir} ${datadir}" + diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui_0.12.0.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui_0.12.0.bb deleted file mode 100644 index ca3bf081d6..0000000000 --- a/meta-oe/recipes-gnome/malcontent/malcontent-ui_0.12.0.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "User-Interface for malcontent." -HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -require malcontent.inc - -DEPENDS = " \ - malcontent \ - accountsservice \ - glib-2.0 \ - glib-testing \ - dbus \ - desktop-file-utils-native \ - itstool-native \ - libpam \ - polkit \ - appstream \ - flatpak \ - libadwaita \ - gtk4 \ -" - -GIR_MESON_OPTION = "" - -GTKIC_VERSION = "4" -inherit meson pkgconfig gtk-icon-cache gobject-introspection gettext features_check - -REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" - -EXTRA_OEMESON = "-Dui=enabled" - -do_install() { - install -d ${D}${datadir}/gir-1.0 ${D}${libdir}/girepository-1.0 ${D}${bindir} - install -d ${D}${datadir}/polkit-1/actions ${D}${datadir}/metainfo ${D}${datadir}/applications - install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.gir ${D}${datadir}/gir-1.0 - install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.typelib ${D}${libdir}/girepository-1.0 - install -m 0644 ${B}/libmalcontent-ui/libmalcontent-ui-1.so.${PV} ${D}${libdir} - ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so - ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1 - install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir} - install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions - install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml ${D}${datadir}/metainfo - install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications -} - -FILES:${PN} += "${bindir} ${libdir} ${datadir}" - diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb new file mode 100644 index 0000000000..c4bc50fa8e --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb @@ -0,0 +1,44 @@ +SUMMARY = "malcontent implements support for restricting the type of content." +HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +require malcontent.inc + +DEPENDS = " \ + accountsservice \ + glib-2.0 \ + glib-testing \ + dbus \ + itstool-native \ + libpam \ + polkit \ +" + +GIR_MESON_OPTION = "" + +inherit meson pkgconfig gobject-introspection gettext features_check useradd + +REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" + +PACKAGECONFIG ?= "ui" +PACKAGECONFIG[ui] = ",,,malcontent-ui" + +EXTRA_OEMESON = "-Dui=disabled" + +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} += " \ + ${libdir}/security/pam_malcontent.so \ + ${datadir}/accountsservice \ + ${datadir}/help \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.inc b/meta-oe/recipes-gnome/malcontent/malcontent.inc index 0446005a35..d48be08bbc 100644 --- a/meta-oe/recipes-gnome/malcontent/malcontent.inc +++ b/meta-oe/recipes-gnome/malcontent/malcontent.inc @@ -1,3 +1,4 @@ SRC_URI = "git://gitlab.freedesktop.org/pwithnall/malcontent.git;protocol=https;branch=main" S = "${WORKDIR}/git" SRCREV = "3ba80995bb25b7aeda7e21d547f9e39ff9a81736" +PV = "0.12.0" diff --git a/meta-oe/recipes-gnome/malcontent/malcontent_0.12.0.bb b/meta-oe/recipes-gnome/malcontent/malcontent_0.12.0.bb deleted file mode 100644 index c4bc50fa8e..0000000000 --- a/meta-oe/recipes-gnome/malcontent/malcontent_0.12.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "malcontent implements support for restricting the type of content." -HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -require malcontent.inc - -DEPENDS = " \ - accountsservice \ - glib-2.0 \ - glib-testing \ - dbus \ - itstool-native \ - libpam \ - polkit \ -" - -GIR_MESON_OPTION = "" - -inherit meson pkgconfig gobject-introspection gettext features_check useradd - -REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" - -PACKAGECONFIG ?= "ui" -PACKAGECONFIG[ui] = ",,,malcontent-ui" - -EXTRA_OEMESON = "-Dui=disabled" - -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} += " \ - ${libdir}/security/pam_malcontent.so \ - ${datadir}/accountsservice \ - ${datadir}/help \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ -" -- cgit v1.2.3-54-g00ecf