gentoo auto-resync : 24:12:2022 - 14:02:21

3 files changed, 66 insertions, 2 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a396f6b7c427..00534b5536e5 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,8 +1,9 @@
 AUX cinnamon-control-center-5.2.1-fix-libgnomekbd.patch 1929 BLAKE2B b541f8105a18316961ab53471de074f0e610aaeb96fb67c682e61ba8ca677eecce5fceddb3e7989d3d259943212da9d7e565d4999552a9664cb225484a2c1f1f SHA512 dd62de8e8284c650304ae1681ea9ddf1bcfde197e19fcecc44442844ced4203d5c503f08a19103330a992040ae5ae3b8005d6898fce91b9336d59a0a3ffe774d
 AUX cinnamon-control-center-5.2.1-fix-libnma.patch 1922 BLAKE2B af679e2e7744dee5f600ef7474795e4362e9d019289785752979bdd2eebdb21b59bc00765ddb5cbdfd57dc7a106856b6916792d01f5b589b0fb9df2f87108fe1 SHA512 0323343831012e7724694818d9cbe65b7ba91effd06811ddfa4e4b75a44029f83f1497a3495facbfa05cbd0450e14b327d15c13cc357851172566a80f309708a
+AUX cinnamon-control-center-5.6.0-fix-icon-build.patch 1670 BLAKE2B 3cc64e45c8d0b5677e911389cfed7f42c02e61ca55240c49efadde39d179f27c44af6c90b98f46b7e5a769a4a75c163f43f26aec6f10eb80c924074bc2b7a880 SHA512 8233b225a744e79ebce2c78b19df96eff49fb37cda445777a5e7f2c3896ebc5ca194ad6ffe27b1c1ab7df65c55c3389796d89590766a6e757f7e404d4741c635
 DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
 DIST cinnamon-control-center-5.6.0.tar.gz 3872303 BLAKE2B c0db21dbad031e3a3e06ea2f6253421c548b993eef323e2be1ad131e0a8e980b7b3a93d9a7a6d1feaf13ebe8c5f77fd286f0cb56b7d22c7cb447e46178c6f328 SHA512 336c554c93212c28df4f163b6a06d2c287901c167dc8e5563dbb44ddd69119db36d15086b6b1e78ff1b199424a4a24ac9605d59877a3f8174fd1f406a0f7ca4f
 EBUILD cinnamon-control-center-5.2.1-r2.ebuild 2594 BLAKE2B c229543e972a9f40d2b7035763ce7ed8949d50e752afcd4f727de7d2b1afe80fa18e487eb685305d6736e0a428713dfd1bc8caa53e4b2bf8a2f3c2627c936e65 SHA512 7295fff20615abbab0e8165afe7dd2d38f632fabf221b8923d238fffc46f4f8f77740c34892b274a26bea941e52a4a023bb673a828a6096d4ee400a150126470
 EBUILD cinnamon-control-center-5.2.1-r3.ebuild 2776 BLAKE2B 708d96dc2e7471bff964bb338b5391c52f7ae75aecd9b849a453db5b21226d6ffaf37dbadd36cae2e2596a53afd9248e38b1a1928307125a97c94f988b323a99 SHA512 9104d1b98c5dcc443f8e1aac343819a66733bb2ba1bf396663d770eeffca7b9edfe424c962c573da926a7a849a91c94b15408d4ec2b9f3513a36fe35999dbbb6
-EBUILD cinnamon-control-center-5.6.0.ebuild 2426 BLAKE2B 4d8bee1080de36b156e88202f418569438a60fb4ef4ac8ffd49ccea755e700d9adf4069fae8add15b17c5a52225894bd98b7bb99a133e78759c51bc40d7c0a2b SHA512 f7f467e0b971b042780b5cd339529c0b605ab56310a25ebad9ed93f6d122c6f2dcbb65161deaff0a401c9cfb804b0338c494f08ef2aba39d13c6a3dee112a572
+EBUILD cinnamon-control-center-5.6.0.ebuild 2589 BLAKE2B d74fb95586b531b225319ae823e4de50ef479bdad7ba050ac7aa8f3f8a38e5aa58e89e6f329e7052bf4e928bbe9af8797f74682c49708ea60da216b9138ef705 SHA512 01e466dfa9be365e61f646f213187b62d768d5e9ac35714d85e70b988ad5676153bf4b807aaf586441e8fed0456f80c9179031f6268011c171bb09140dc8109d
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
index 2d9a5bb44676..3f0eb2ef7511 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9,10,11} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson gnome2-utils python-any-r1 xdg virtualx
 
@@ -69,6 +69,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix build when colord flag disabled
+	# https://github.com/linuxmint/cinnamon-control-center/issues/309
+	"${FILESDIR}"/${PN}-5.6.0-fix-icon-build.patch
+)
+
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
new file mode 100644
index 000000000000..a874152cfe27
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
@@ -0,0 +1,57 @@
+From 65fb97ead94f7d531491ca6e59f2acff0192023f Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 19 Dec 2022 10:42:00 -0500
+Subject: [PATCH] Fix build when the color panel is disabled.
+
+A typo in the display panel's build was resulting in it using
+the 'sizes' variable defined in the color panel, as its build
+file was being processed first.
+
+When the color panel is disabled, that variable is no longer
+pre-defined, exposing the typo and breaking the build.
+
+Fixes #309.
+---
+ panels/color/icons/meson.build   | 4 ++--
+ panels/display/icons/meson.build | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/panels/color/icons/meson.build b/panels/color/icons/meson.build
+index 1d5680e1..271d894d 100644
+--- a/panels/color/icons/meson.build
++++ b/panels/color/icons/meson.build
+@@ -1,5 +1,5 @@
+ 
+-sizes = [
++color_icon_sizes = [
+   '16x16',
+   '22x22',
+   '24x24',
+@@ -10,7 +10,7 @@ sizes = [
+   'scalable',
+ ]
+ 
+-foreach size : sizes
++foreach size : color_icon_sizes
+   install_subdir(size,
+     strip_directory: true,
+     install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',
+diff --git a/panels/display/icons/meson.build b/panels/display/icons/meson.build
+index 3ee26b87..454f608f 100644
+--- a/panels/display/icons/meson.build
++++ b/panels/display/icons/meson.build
+@@ -1,4 +1,4 @@
+-icon_sizes = [
++display_icon_sizes = [
+   '16x16',
+   '22x22',
+   '24x24',
+@@ -6,7 +6,7 @@ icon_sizes = [
+   'scalable'
+ ]
+ 
+-foreach size : sizes
++foreach size : display_icon_sizes
+   install_subdir(size,
+     strip_directory: true,
+     install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',