[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...

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

commit:     f89958738ce41b71aa322024d92ae0c9553c1120
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Dec  9 06:11:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 02:24:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8995873

gnome-extra/cinnamon-settings-daemon: add 6.4.3

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

 gnome-extra/cinnamon-settings-daemon/Manifest      |   1 +
 .../cinnamon-settings-daemon-6.4.3.ebuild          | 118 ++++++++++++++++++
 ...on-settings-daemon-6.4.0-generate-tz-data.patch | 135 +++++++++++++++++++++
 3 files changed, 254 insertions(+)

diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 39a55c895ccd..1b240f2e9cd8 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-settings-daemon-6.2.0.tar.gz 578907 BLAKE2B 24b9591f5e6bbacd92f564bfb4f1960c14bca78194dd00746ff4b31f2a6b99d09a701ca939aa39b932141c7c13d998b1a061185bd7b751815dbd8b43d1fceec2 SHA512 c2102ace141448694a4d22331f1b039ccdca41988165f0e1af4446c527be89f8ae2f87e0555a0cf4fa5bbb31e5c866f0c9c7a52174a1664183695695b5eed7be
+DIST cinnamon-settings-daemon-6.4.3.tar.gz 601452 BLAKE2B 1cb9b49c04f03f3c9d8357e3f9570aecd41bfc4abe5c9fa84410d33566906e4ee8ba44947a98958633ca423b394efc07c0dd670206b332f0efcaf3839e682830 SHA512 d21d8e1fa80f54b7bc5bde9e42c939e99247df6cb1c1f00ec0de46f938c476bf3633647fa8a1d9962498d62aecd7a624826f97c145d9bd05aaf3f82180a95a5a

diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild
new file mode 100644
index 000000000000..6d30ff904984
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.4.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit meson flag-o-matic gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd wayland"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2[dbus]
+	dev-libs/libgudev
+	>=gnome-base/libgnomekbd-3.6:=
+	>=gnome-extra/cinnamon-desktop-6.4:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-),pulseaudio]
+	)
+	>=media-libs/libpulse-0.9.16[glib]
+	>=sys-auth/polkit-0.97
+	sys-libs/timezone-data:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	>=x11-libs/libxklavier-5.0:=
+	>=x11-libs/pango-1.20.0
+	>=sys-power/upower-0.9.11:=
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? (
+		>=x11-libs/gtk+-3.24.41-r1:3[wayland?,X]
+		>=dev-libs/libwacom-0.7:=
+		>=gnome-base/librsvg-2.36.2
+	)
+	!input_devices_wacom? (
+		>=x11-libs/gtk+-3.14.0:3
+	)
+	smartcard? (
+		dev-libs/nspr
+		>=dev-libs/nss-3.11.2
+	)
+	systemd? ( sys-apps/systemd:0= )
+	!systemd? ( sys-auth/elogind )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libxml2:2
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Generate tz data header on build
+	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/405
+	"${FILESDIR}/${PN}-6.4.0-generate-tz-data.patch"
+)
+
+src_prepare() {
+	default
+	python_fix_shebang install-scripts plugins/color
+	rm plugins/color/tz-coords.h || die "Error removing stale tz-coords.h"
+}
+
+src_configure() {
+	# The only component that uses gdk backends is the wacom plugin
+	if use input_devices_wacom; then
+		# defang automagic dependencies
+		use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+	fi
+
+	# gudev not optional on Linux platforms
+	local emesonargs=(
+		-Duse_gudev=enabled
+		-Duse_polkit=enabled
+		-Duse_logind=enabled
+		-Dgenerate_tz_coords=true
+		-Dzone_tab="${EPREFIX}/usr/share/zoneinfo/zone1970.tab"
+		$(meson_feature colord use_color)
+		$(meson_feature cups use_cups)
+		$(meson_feature smartcard use_smartcard)
+		$(meson_feature input_devices_wacom use_wacom)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}

diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch
new file mode 100644
index 000000000000..eeb8535fe9f5
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.4.0-generate-tz-data.patch
@@ -0,0 +1,135 @@
+From 2f235c32d055d0a2f0683855a283a049a1905e7c Mon Sep 17 00:00:00 2001
+From: Sparky Bluefang <sparky@bluefang-logic.com>
+Date: Mon, 9 Dec 2024 00:24:08 -0500
+Subject: [PATCH] Add options to call generate-tz-header as part of the build
+ process.
+
+---
+ meson_options.txt                   | 12 +++++++++++
+ plugins/color/generate-tz-header.py | 33 +++++++++++++++++------------
+ plugins/color/meson.build           | 14 +++++++++++-
+ 3 files changed, 45 insertions(+), 14 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index e3c89f3..81db2ba 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -58,3 +58,15 @@ option(
+     value: false,
+     description: 'Show additional build warnings'
+ )
++option(
++    'generate_tz_coords',
++    type: 'boolean',
++    value: false,
++    description: 'Generate TZCoords header from tzdata'
++)
++option(
++    'zone_tab',
++    type: 'string',
++    value: '/usr/share/zoneinfo/zone.tab',
++    description: 'Path to tzdata zone.tab or zone1970.tab'
++)
+diff --git a/plugins/color/generate-tz-header.py b/plugins/color/generate-tz-header.py
+index cc1d399..d725727 100755
+--- a/plugins/color/generate-tz-header.py
++++ b/plugins/color/generate-tz-header.py
+@@ -1,20 +1,27 @@
+-#!/usr/bin/python3
++#!/usr/bin/env python3
+ 
+ import re
++from argparse import ArgumentParser
++from pathlib import Path
++
++COORDS_RE = re.compile(r"([+-])([0-9]+)([+-])([0-9]+)")
+ 
+ d = {}
+ 
++parser = ArgumentParser(prog='generate-tz-header',
++                        description='Generate tz-coords.h header from timezone-data')
++parser.add_argument('-i', '--zone_tab', nargs='?', default='/usr/share/zoneinfo/zone.tab', type=Path)
++parser.add_argument('-o', '--out_file', nargs='?', default='tz-coords.h', type=Path)
++args = parser.parse_args()
+ 
+-with open("/usr/share/zoneinfo/zone.tab", "r") as f:
++with open(args.zone_tab, "r") as f:
+     for line in f:
+-        if line.startswith("#"):
++        line = line.strip()
++        if not line or line.startswith("#"):
+             continue
+ 
+-        res = re.search(r"([A-Z]{2})\s([0-9-+]+)\s([\w/_\-]+)\s", line)
+-        code, coords, tz = res.groups()
+-
+-        res = re.search(r"([+-]{1})([0-9]+)([+-]{1})([0-9]+)", coords)
+-        lat_sign, lat_val, long_sign, long_val = res.groups()
++        coords, tz = line.split('\t')[1:3]
++        lat_sign, lat_val, long_sign, long_val = COORDS_RE.search(coords).groups()
+ 
+         lat_str = lat_sign + lat_val[0:2] + "." + lat_val[2:]
+         long_str = long_sign + long_val[0:3] + "." + long_val[3:]
+@@ -25,17 +32,17 @@
+         d[tz] = [lat, long]
+ 
+ header = """
+-// Generated from /usr/share/zoneinfo/zone.tab, used by csd-nightlight.c to calculate sunrise and sunset based on the system timezone
++// Generated from %s, used by csd-nightlight.c to calculate sunrise and sunset based on the system timezone
+ 
+ typedef struct
+ {
+-    const char *timezone;
++    const gchar *timezone;
+     double latitude;
+     double longitude;
+ } TZCoords;
+ 
+ static TZCoords tz_coord_list[] = {
+-"""
++""" % (args.zone_tab)
+ 
+ for zone in sorted(d.keys()):
+     latitude, longitude = d[zone]
+@@ -44,7 +51,7 @@
+ 
+ header += "};"
+ 
+-with open("tz-coords.h", "w") as f:
++with open(args.out_file, "w") as f:
+     f.write(header)
+ 
+-quit()
+\ No newline at end of file
++quit()
+diff --git a/plugins/color/meson.build b/plugins/color/meson.build
+index 42638cf..e421e52 100644
+--- a/plugins/color/meson.build
++++ b/plugins/color/meson.build
+@@ -1,5 +1,17 @@
+ plugin_name='color'
+ 
++if get_option('generate_tz_coords')
++  prog_python = find_program('python3')
++
++  tz_coords_h = custom_target(
++    'tz_coords_h',
++    input: get_option('zone_tab'),
++    output: 'tz-coords.h',
++    command: [prog_python, '@CURRENT_SOURCE_DIR@/generate-tz-header.py', '-i', '@INPUT@', '-o', '@OUTPUT@']
++  )
++else
++  tz_coords_h = files('tz-coords.h')
++endif
+ 
+ built_sources = gnome.gdbus_codegen(
+   'cinnamon-session-dbus',
+@@ -32,7 +44,7 @@ color_deps = [
+ 
+ executable(
+   'csd-' + plugin_name,
+-  sources + built_sources,
++  sources + built_sources + [tz_coords_h],
+   include_directories: [include_dirs, common_inc],
+   dependencies: color_deps,
+   c_args: [