2 files changed, 19 insertions, 16 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 c1bd34d14b..8515375638 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
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
  3 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/meson_options.txt b/meson_options.txt
-index b2302bf..5b9baf5 100644
+index 9aeeed313..6097263a6 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,3 +1,4 @@
@@ -22,28 +22,29 @@ index b2302bf..5b9baf5 100644
  option('documentation', type: 'boolean', value: false, description: 'build documentation')
  option('location-services', type: 'feature', value: 'enabled', description: 'build with location services')
 diff --git a/panels/background/meson.build b/panels/background/meson.build
-index 6ced050..df1f808 100644
+index 8f9cbecdf..17f17d395 100644
 --- a/panels/background/meson.build
 +++ b/panels/background/meson.build
-@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
+@@ -23,7 +23,7 @@ common_sources += gnome.mkenums_simple(
+ )
  
- enums = 'gdesktop-enums-types'
- enums_header = files(
+ gdesktop_enums_header = files(
 -  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
-+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
++  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
  )
  
- common_sources += gnome.mkenums(
+ common_sources += gnome.mkenums_simple(
 diff --git a/panels/system/meson.build b/panels/system/meson.build
-index 4fee822..979332a 100644
+index bbe004837..92e809fbe 100644
 --- a/panels/system/meson.build
 +++ b/panels/system/meson.build
-@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
+@@ -68,7 +68,7 @@ sources += gnome.compile_resources(
  )
  
- enums_header = files(
--  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
+ gdesktop_enums_header = files(
+-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
 +  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
-   'datetime/cc-datetime-page.h'
  )
  
+ sources += gnome.mkenums_simple(
+ 
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_47.0.1.bb
index ae96caf94f..f2b0d09d5c 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_47.0.1.bb
@@ -31,14 +31,17 @@ DEPENDS = " \
     tecla \
     udisks2 \
     upower \
+    ${@' libxslt-native docbook-xsl-stylesheets-native' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''} \
 "
 
-inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check
+inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext gi-docgen upstream-version-is-even bash-completion features_check
 
 REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
+SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1"
 
+S = "${WORKDIR}/git"
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
-SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d"
+SRCREV = "adb035fa5c61cdcff622536fde9456e3859211fd"
 
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper"
@@ -49,11 +52,10 @@ PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler"
 PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent,malcontent-ui"
 
 EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
+GIDOCGEN_MESON_OPTION = 'documentation'
 
 export XDG_DATA_DIRS = "${STAGING_DATADIR}"
 
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
 FILES:${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/gnome-shell \