diff options
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch | 1 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb (renamed from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb) | 45 |
2 files changed, 26 insertions, 20 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 768ba54390..11ad30eda6 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch | |||
| @@ -42,4 +42,3 @@ index 3634c47..459ccfe 100644 | |||
| 42 | 42 | ||
| 43 | -- | 43 | -- |
| 44 | 2.34.1 | 44 | 2.34.1 |
| 45 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb index 6fe999a191..830f3ec684 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb | |||
| @@ -4,35 +4,40 @@ LICENSE = "GPL-2.0-only" | |||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" |
| 5 | 5 | ||
| 6 | GNOMEBASEBUILDCLASS = "meson" | 6 | GNOMEBASEBUILDCLASS = "meson" |
| 7 | 7 | GTKIC_VERSION = "4" | |
| 8 | inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check | ||
| 9 | 8 | ||
| 10 | DEPENDS = " \ | 9 | DEPENDS = " \ |
| 11 | gdk-pixbuf-native \ | ||
| 12 | colord-gtk \ | ||
| 13 | udisks2 \ | ||
| 14 | upower \ | ||
| 15 | polkit \ | ||
| 16 | pulseaudio \ | ||
| 17 | accountsservice \ | 10 | accountsservice \ |
| 18 | samba \ | 11 | colord-gtk \ |
| 19 | gsettings-desktop-schemas \ | 12 | gcr3 \ |
| 20 | gnome-settings-daemon \ | 13 | gdk-pixbuf \ |
| 14 | glib-2.0 \ | ||
| 15 | gnome-bluetooth \ | ||
| 21 | gnome-desktop \ | 16 | gnome-desktop \ |
| 22 | gnome-online-accounts \ | 17 | gnome-online-accounts \ |
| 23 | libnma \ | 18 | gnome-settings-daemon \ |
| 24 | gnome-bluetooth \ | 19 | gsettings-desktop-schemas \ |
| 25 | grilo \ | 20 | gtk4 \ |
| 21 | libadwaita \ | ||
| 22 | libepoxy \ | ||
| 26 | libgtop \ | 23 | libgtop \ |
| 27 | gsound \ | 24 | libgudev \ |
| 25 | libnma \ | ||
| 28 | libpwquality \ | 26 | libpwquality \ |
| 29 | libadwaita \ | 27 | libxml2 \ |
| 28 | polkit \ | ||
| 29 | pulseaudio \ | ||
| 30 | samba \ | ||
| 31 | udisks2 \ | ||
| 32 | upower \ | ||
| 30 | " | 33 | " |
| 31 | 34 | ||
| 32 | REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" | 35 | inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd |
| 36 | |||
| 37 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" | ||
| 33 | 38 | ||
| 34 | SRC_URI[archive.sha256sum] = "0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda" | ||
| 35 | SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" | 39 | SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" |
| 40 | SRC_URI[archive.sha256sum] = "d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563" | ||
| 36 | 41 | ||
| 37 | PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" | 42 | PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" |
| 38 | PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" | 43 | PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" |
| @@ -42,8 +47,10 @@ EXTRA_OEMESON = " \ | |||
| 42 | -Doe_sysroot=${STAGING_DIR_HOST} \ | 47 | -Doe_sysroot=${STAGING_DIR_HOST} \ |
| 43 | " | 48 | " |
| 44 | 49 | ||
| 50 | USERADD_PACKAGES = "${PN}" | ||
| 51 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" | ||
| 52 | |||
| 45 | do_install:append() { | 53 | do_install:append() { |
| 46 | # If polkit is setup fixup permissions and ownership | ||
| 47 | if [ -d ${D}${datadir}/polkit-1/rules.d ]; then | 54 | if [ -d ${D}${datadir}/polkit-1/rules.d ]; then |
| 48 | chmod 700 ${D}${datadir}/polkit-1/rules.d | 55 | chmod 700 ${D}${datadir}/polkit-1/rules.d |
| 49 | chown polkitd:root ${D}${datadir}/polkit-1/rules.d | 56 | chown polkitd:root ${D}${datadir}/polkit-1/rules.d |
