diff --git a/recipes-gtk/budgie/budgie-control-center/budgie-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/recipes-gtk/budgie/budgie-control-center/budgie-control-center/0001-Add-meson-option-to-pass-sysroot.patch index d1848ff..6d8c17c 100644 --- a/recipes-gtk/budgie/budgie-control-center/budgie-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/recipes-gtk/budgie/budgie-control-center/budgie-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -1,4 +1,4 @@ -From 3cd73885cc5e39d6fc8b32b168d832e0840bf7d4 Mon Sep 17 00:00:00 2001 +From aa880e1d9c373a955b95a552c73f32b18c63f73b Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot @@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [OE specific] 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index cec114ca0..9dfab0e4d 100644 +index 206e3ebd9..d9d43b3f7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') option('ssh', type: 'boolean', value: false, description: 'build with SSH Socket based connection for remote login') - option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') + option('ibus', type: 'boolean', value: true, description: 'build with IBus support') diff --git a/panels/background/meson.build b/panels/background/meson.build index a036d2546..f1764f915 100644 --- a/panels/background/meson.build diff --git a/recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.0.0.bb b/recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.1.1.bb similarity index 84% rename from recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.0.0.bb rename to recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.1.1.bb index a95d366..d2f20f0 100644 --- a/recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.0.0.bb +++ b/recipes-gtk/budgie/budgie-control-center/budgie-control-center_2.1.1.bb @@ -43,7 +43,7 @@ inherit meson gtk-icon-cache gsettings bash-completion pkgconfig gettext gi-docg SRC_URI = "gitsm://github.com/BuddiesOfBudgie/budgie-control-center.git;protocol=https;nobranch=1" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRCREV = "5d4d82b19894cb4378654b7a2339abde21b68842" +SRCREV = "8b7b4be0d70bc94224265a7af3f459c84e4546b0" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" GIDOCGEN_MESON_OPTION = 'documentation' @@ -51,18 +51,14 @@ GIDOCGEN_MESON_OPTION = 'documentation' EXTRA_OEMESON += "-Dprofile=default" PACKAGECONFIG ?= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth wayland', d)} \ - cheese \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ ibus \ cups \ malcontent \ - bluetooth \ " PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native wayland-protocols" -PACKAGECONFIG[cheese] = "-Dcheese=true,-Dcheese=false,cheese" PACKAGECONFIG[ibus] = "-Dibus=true,-Dibus=false,ibus" PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent" -PACKAGECONFIG[bluetooth] = "-Dbluetooth=true,-Dbluetooth=false,gnome-bluetooth3" PACKAGECONFIG[ssh] = "-Dssh=true,-Dssh=false" PACKAGECONFIG[cups] = ",,,cups system-config-printer cups-pk-helper"