From 513af20d19b76dd314b3abf4fd9f6e7c3d2a9cae Mon Sep 17 00:00:00 2001 From: Matthew Turnbull Date: Tue, 12 May 2020 22:58:30 -0400 Subject: gnome-extra/cinnamon-settings-daemon: 4.4.0 version bump Update cinnamon-settings-daemon to 4.4.0. CUPS dependencies belong here instead of cinnamon-control-center. Include patch to fix systemd detection. Bug: https://bugs.gentoo.org/704532 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew S. Turnbull Signed-off-by: Matt Turner --- gnome-extra/cinnamon-settings-daemon/Manifest | 1 + .../cinnamon-settings-daemon-4.4.0.ebuild | 92 ++++++++++++++++++++++ .../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 +++++++++ gnome-extra/cinnamon-settings-daemon/metadata.xml | 8 ++ 4 files changed, 137 insertions(+) create mode 100644 gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild create mode 100644 gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch (limited to 'gnome-extra/cinnamon-settings-daemon') diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest index b8caf111fdcc..92b72ec7d11f 100644 --- a/gnome-extra/cinnamon-settings-daemon/Manifest +++ b/gnome-extra/cinnamon-settings-daemon/Manifest @@ -1 +1,2 @@ DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e +DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild new file mode 100644 index 000000000000..674a8d9e5626 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 virtualx + +DESCRIPTION="Cinnamon's settings daemon" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/" +SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+colord cups input_devices_wacom smartcard systemd" +RESTRICT=test + +# udev is non-optional since lots of plugins, not just gudev, pull it in +RDEPEND=" + >=dev-libs/glib-2.38:2 + dev-libs/libgudev:= + >=gnome-base/libgnomekbd-3.6 + >=gnome-extra/cinnamon-desktop-4.4:0= + media-libs/fontconfig + >=media-libs/lcms-2.2:2 + media-libs/libcanberra:0=[gtk3] + >=sys-apps/dbus-1.1.2 + >=sys-auth/polkit-0.97 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.9.10:3 + >=x11-libs/libnotify-0.7.3:0= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + >=x11-libs/libxklavier-5.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 + x11-drivers/xf86-input-wacom + x11-libs/libXtst ) + smartcard? ( >=dev-libs/nss-3.11.2 ) + systemd? ( sys-apps/systemd:0= ) + !systemd? ( sys-auth/elogind:0= ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + dev-libs/libxml2:2 + >=dev-util/intltool-0.37.1 + x11-base/xorg-proto + virtual/pkgconfig +" + +src_prepare() { + # make colord and wacom optional + eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch + eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch + eapply "${FILESDIR}"/${PN}-4.4.0-systemd.patch + + # Disable broken test + sed -e '/g_test_add_func ("\/color\/edid/d' \ + -i plugins/color/gcm-self-test.c || die + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + # no point in disabling gudev since other plugins pull it in + gnome2_src_configure \ + --disable-static \ + --enable-gudev \ + --enable-polkit \ + --enable-logind \ + --disable-accountservice \ + $(use_enable colord color) \ + $(use_enable cups) \ + $(use_enable smartcard smartcard-support) \ + $(use_enable input_devices_wacom wacom) +} + +src_test() { + virtx emake check +} diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch new file mode 100644 index 000000000000..90b63731f870 --- /dev/null +++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch @@ -0,0 +1,36 @@ +From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001 +From: Leigh Scott +Date: Wed, 11 Dec 2019 23:29:08 +0000 +Subject: [PATCH] Restore old check for logind + +--- + cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +- + plugins/common/csd-power-helper.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c +index adbe1e7..4d52b21 100644 +--- a/cinnamon-settings-daemon/cinnamon-settings-session.c ++++ b/cinnamon-settings-daemon/cinnamon-settings-session.c +@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session) + session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_LOGIND +- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted () ++ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted () + sd_pid_get_session (getpid(), &session->priv->session_id); + session->priv->sd_source = sd_source_new (); + g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c +index 5a83072..82c0b22 100644 +--- a/plugins/common/csd-power-helper.c ++++ b/plugins/common/csd-power-helper.c +@@ -41,7 +41,7 @@ use_logind (void) + static gsize once_init_value = 0; + + if (g_once_init_enter (&once_init_value)) { +- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted () ++ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted () + + g_once_init_leave (&once_init_value, 1); + } diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml index da9442eb0216..966474ecf7be 100644 --- a/gnome-extra/cinnamon-settings-daemon/metadata.xml +++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml @@ -5,6 +5,14 @@ cinnamon@gentoo.org Cinnamon Project + + proxy-maint@gentoo.org + Proxy Maintainers + + + sparky@bluefang-logic.com + Matthew Turnbull + linuxmint/cinnamon-settings-daemon -- cgit v1.2.3-65-gdbad