From 8d595d2dadcd43486300b9e99a7d5711b90ba192 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Tue, 6 Jun 2023 18:49:07 +0200 Subject: gnome-control-center: upgrade 44.1 -> 44.2 Signed-off-by: Markus Volk Signed-off-by: Khem Raj --- .../0001-Add-meson-option-to-pass-sysroot.patch | 17 +++++- .../gnome-control-center_44.1.bb | 69 ---------------------- .../gnome-control-center_44.2.bb | 69 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 71 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb create mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb 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 11ad30eda6..5c0eee5764 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 @@ -28,10 +28,10 @@ index dbca723..af0f871 100644 option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 3634c47..459ccfe 100644 +index 69af0cfea..6edcaa5ff 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -25,7 +25,7 @@ common_sources = [] +@@ -19,7 +19,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( @@ -40,5 +40,18 @@ index 3634c47..459ccfe 100644 'cc-background-item.h' ) +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 3b6f5e197..30b207882 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -45,7 +45,7 @@ sources = files( + + enums = 'gdesktop-enums-types' + enums_header = files( +- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'cc-datetime-panel.h' + ) + -- 2.34.1 diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb deleted file mode 100644 index a64c2410a5..0000000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "GNOME Settings" -DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" -GTKIC_VERSION = "4" - -DEPENDS = " \ - accountsservice \ - colord-gtk \ - gcr3 \ - gdk-pixbuf \ - glib-2.0 \ - gnome-bluetooth \ - gnome-desktop \ - gnome-online-accounts \ - gnome-settings-daemon \ - gsettings-desktop-schemas \ - gtk4 \ - libadwaita \ - libepoxy \ - libgtop \ - libgudev \ - libnma \ - libpwquality \ - libxml2 \ - polkit \ - pulseaudio \ - samba \ - udisks2 \ - upower \ -" - -inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd - -REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" - -SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "7abd365018e28679def60a5ecd3049db0fb85de6da49a96dadd21fba8db002e7" - -PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[cups] = ",,cups,cups" -PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" -PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" - -EXTRA_OEMESON = " \ - -Doe_sysroot=${STAGING_DIR_HOST} \ -" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" - -do_install:append() { - if [ -d ${D}${datadir}/polkit-1/rules.d ]; then - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi -} - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ -" - -FILES:${PN}-dev += "${datadir}/gettext" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb new file mode 100644 index 0000000000..b2c04c2f68 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" +GTKIC_VERSION = "4" + +DEPENDS = " \ + accountsservice \ + colord-gtk \ + gcr3 \ + gdk-pixbuf \ + glib-2.0 \ + gnome-bluetooth \ + gnome-desktop \ + gnome-online-accounts \ + gnome-settings-daemon \ + gsettings-desktop-schemas \ + gtk4 \ + libadwaita \ + libepoxy \ + libgtop \ + libgudev \ + libnma \ + libpwquality \ + libxml2 \ + polkit \ + pulseaudio \ + samba \ + udisks2 \ + upower \ +" + +inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd + +REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" + +SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" +SRC_URI[archive.sha256sum] = "0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c" + +PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[cups] = ",,cups,cups" +PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" + +EXTRA_OEMESON = " \ + -Doe_sysroot=${STAGING_DIR_HOST} \ +" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" + +do_install:append() { + if [ -d ${D}${datadir}/polkit-1/rules.d ]; then + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d + fi +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES:${PN}-dev += "${datadir}/gettext" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" -- cgit v1.2.3-54-g00ecf