[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/

["Sam James" <sam@gentoo.org>]

commit:     005caff7672d4b882ff4aaf9d2987ddada6e614f
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Dec 20 01:52:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:04:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005caff7

gnome-extra/cinnamon-control-center: Fix build when colord flag disabled

Closes: https://bugs.gentoo.org/886259
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../cinnamon-control-center-5.6.0.ebuild           |  6 +++
 ...namon-control-center-5.6.0-fix-icon-build.patch | 57 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

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..0728e8be39a3 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
@@ -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',