commit: 61dc69e3f082efdfab09d88623449dc5969a7eb9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 17 03:11:59 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 17 03:11:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61dc69e3
gnome-extra/cinnamon-settings-daemon: fix modern C issue Closes: https://bugs.gentoo.org/919084 Signed-off-by: Sam James <sam <AT> gentoo.org> .../cinnamon-settings-daemon-6.0.0-r1.ebuild | 99 ++++++++++++++++++++++ .../files/cinnamon-settings-daemon-6.0.0-c99.patch | 26 ++++++ 2 files changed, 125 insertions(+) diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild new file mode 100644 index 000000000000..dffa7e4efb41 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-6.0.0-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit meson 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.0:0= + media-libs/fontconfig + >=media-libs/lcms-2.2:2 + media-libs/libcanberra[gtk3,pulseaudio] + >=media-libs/libpulse-0.9.16[glib] + >=sys-auth/polkit-0.97 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.14.0:3[wayland=] + >=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? ( + >=dev-libs/libwacom-0.7:= + >=gnome-base/librsvg-2.36.2 ) + 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=( + "${FILESDIR}"/${PN}-6.0.0-c99.patch +) + +src_prepare() { + default + python_fix_shebang install-scripts +} + +src_configure() { + # gudev not optional on Linux platforms + local emesonargs=( + -Duse_gudev=enabled + -Duse_polkit=enabled + -Duse_logind=enabled + $(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.0.0-c99.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch new file mode 100644 index 000000000000..36ce9365a554 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-6.0.0-c99.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/919084 +https://github.com/linuxmint/cinnamon-settings-daemon/commit/48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc + +From 48da3c4763bea93ea3e1d2ba2e2dfdb7f41d8afc Mon Sep 17 00:00:00 2001 +From: Leigh Scott <leigh123li...@gmail.com> +Date: Mon, 5 Feb 2024 16:07:03 +0000 +Subject: [PATCH] Fix compile issue (#386) + +(Warning becomes an error due to gcc 14 changes) +--- a/plugins/keyboard/gkbd-configuration.c ++++ b/plugins/keyboard/gkbd-configuration.c +@@ -340,11 +340,11 @@ gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration) + const char * const * + gkbd_configuration_get_group_names (GkbdConfiguration *configuration) + { +- return configuration->priv->full_group_names; ++ return (const char * const *)configuration->priv->full_group_names; + } + + const char * const * + gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration) + { +- return configuration->priv->short_group_names; ++ return (const char * const *)configuration->priv->short_group_names; + } +
