From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, ...
Date: Sun, 27 Dec 2020 05:06:46 +0000 (UTC) [thread overview]
Message-ID: <1609045595.1c427f0f90d8c1ca128e216d8bb351e09d29d42c.sam@gentoo> (raw)
commit: 1c427f0f90d8c1ca128e216d8bb351e09d29d42c
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Thu Dec 24 06:52:55 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 05:06:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c427f0f
gnome-extra/cinnamon-settings-daemon: Remove old
Closes: https://bugs.gentoo.org/734384
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 1 -
.../cinnamon-settings-daemon-4.4.0.ebuild | 94 ----------------------
.../cinnamon-settings-daemon-3.0.1-optional.patch | 84 -------------------
.../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 ---------
4 files changed, 215 deletions(-)
--git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 1b1c7374faa..23c2aa901c2 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
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
deleted file mode 100644
index c38c65257e3..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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
- dev-libs/dbus-glib
- >=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/glib-utils
- 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-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f96..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac 2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
---- a/plugins/Makefile.am~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am 2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
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
deleted file mode 100644
index 90b63731f87..00000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-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);
- }
next reply other threads:[~2020-12-27 5:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-27 5:06 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-10 2:25 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/, Sam James
2024-09-27 5:57 Eli Schwartz
2021-06-12 3:55 Sam James
2021-01-24 17:31 Joonas Niilola
2018-05-26 11:32 Mart Raudsepp
2015-11-15 22:30 Pacho Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609045595.1c427f0f90d8c1ca128e216d8bb351e09d29d42c.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox