mirror of
https://codeberg.org/flk/meta-wayland.git
synced 2026-04-09 14:22:30 +02:00
budgie-control-center: update
This commit is contained in:
@@ -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 <f_l_k@t-online.de>
|
From: Markus Volk <f_l_k@t-online.de>
|
||||||
Date: Mon, 18 Mar 2024 05:50:21 +0100
|
Date: Mon, 18 Mar 2024 05:50:21 +0100
|
||||||
Subject: [PATCH] Add meson option to pass sysroot
|
Subject: [PATCH] Add meson option to pass sysroot
|
||||||
@@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [OE specific]
|
|||||||
3 files changed, 6 insertions(+), 5 deletions(-)
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
index cec114ca0..9dfab0e4d 100644
|
index 206e3ebd9..d9d43b3f7 100644
|
||||||
--- a/meson_options.txt
|
--- a/meson_options.txt
|
||||||
+++ b/meson_options.txt
|
+++ b/meson_options.txt
|
||||||
@@ -1,3 +1,4 @@
|
@@ -1,3 +1,4 @@
|
||||||
+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot')
|
+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('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('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
|
diff --git a/panels/background/meson.build b/panels/background/meson.build
|
||||||
index a036d2546..f1764f915 100644
|
index a036d2546..f1764f915 100644
|
||||||
--- a/panels/background/meson.build
|
--- a/panels/background/meson.build
|
||||||
|
|||||||
@@ -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 = "gitsm://github.com/BuddiesOfBudgie/budgie-control-center.git;protocol=https;nobranch=1"
|
||||||
SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
|
SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
|
||||||
SRCREV = "5d4d82b19894cb4378654b7a2339abde21b68842"
|
SRCREV = "8b7b4be0d70bc94224265a7af3f459c84e4546b0"
|
||||||
|
|
||||||
EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
|
EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
|
||||||
GIDOCGEN_MESON_OPTION = 'documentation'
|
GIDOCGEN_MESON_OPTION = 'documentation'
|
||||||
@@ -51,18 +51,14 @@ GIDOCGEN_MESON_OPTION = 'documentation'
|
|||||||
EXTRA_OEMESON += "-Dprofile=default"
|
EXTRA_OEMESON += "-Dprofile=default"
|
||||||
|
|
||||||
PACKAGECONFIG ?= " \
|
PACKAGECONFIG ?= " \
|
||||||
${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth wayland', d)} \
|
${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
|
||||||
cheese \
|
|
||||||
ibus \
|
ibus \
|
||||||
cups \
|
cups \
|
||||||
malcontent \
|
malcontent \
|
||||||
bluetooth \
|
|
||||||
"
|
"
|
||||||
PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native wayland-protocols"
|
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[ibus] = "-Dibus=true,-Dibus=false,ibus"
|
||||||
PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent"
|
PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent"
|
||||||
PACKAGECONFIG[bluetooth] = "-Dbluetooth=true,-Dbluetooth=false,gnome-bluetooth3"
|
|
||||||
PACKAGECONFIG[ssh] = "-Dssh=true,-Dssh=false"
|
PACKAGECONFIG[ssh] = "-Dssh=true,-Dssh=false"
|
||||||
PACKAGECONFIG[cups] = ",,,cups system-config-printer cups-pk-helper"
|
PACKAGECONFIG[cups] = ",,,cups system-config-printer cups-pk-helper"
|
||||||
|
|
||||||
Reference in New Issue
Block a user