1 |
commit: 1c427f0f90d8c1ca128e216d8bb351e09d29d42c |
2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Thu Dec 24 06:52:55 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 05:06:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c427f0f |
7 |
|
8 |
gnome-extra/cinnamon-settings-daemon: Remove old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/734384 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
12 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
gnome-extra/cinnamon-settings-daemon/Manifest | 1 - |
16 |
.../cinnamon-settings-daemon-4.4.0.ebuild | 94 ---------------------- |
17 |
.../cinnamon-settings-daemon-3.0.1-optional.patch | 84 ------------------- |
18 |
.../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 --------- |
19 |
4 files changed, 215 deletions(-) |
20 |
|
21 |
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest |
22 |
index 1b1c7374faa..23c2aa901c2 100644 |
23 |
--- a/gnome-extra/cinnamon-settings-daemon/Manifest |
24 |
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81 |
27 |
DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208 |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index c38c65257e3..00000000000 |
32 |
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,94 +0,0 @@ |
35 |
-# Copyright 1999-2020 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-GNOME2_LA_PUNT="yes" |
40 |
- |
41 |
-inherit autotools eutils gnome2 virtualx |
42 |
- |
43 |
-DESCRIPTION="Cinnamon's settings daemon" |
44 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
45 |
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-2+" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="+colord cups input_devices_wacom smartcard systemd" |
51 |
-RESTRICT=test |
52 |
- |
53 |
-# udev is non-optional since lots of plugins, not just gudev, pull it in |
54 |
-RDEPEND=" |
55 |
- >=dev-libs/glib-2.38:2 |
56 |
- dev-libs/libgudev:= |
57 |
- >=gnome-base/libgnomekbd-3.6 |
58 |
- >=gnome-extra/cinnamon-desktop-4.4:0= |
59 |
- media-libs/fontconfig |
60 |
- >=media-libs/lcms-2.2:2 |
61 |
- media-libs/libcanberra:0=[gtk3] |
62 |
- >=sys-apps/dbus-1.1.2 |
63 |
- dev-libs/dbus-glib |
64 |
- >=sys-auth/polkit-0.97 |
65 |
- x11-libs/gdk-pixbuf:2 |
66 |
- >=x11-libs/gtk+-3.9.10:3 |
67 |
- >=x11-libs/libnotify-0.7.3:0= |
68 |
- x11-libs/libX11 |
69 |
- x11-libs/libXext |
70 |
- x11-libs/libXfixes |
71 |
- x11-libs/libXi |
72 |
- >=x11-libs/libxklavier-5.0 |
73 |
- >=sys-power/upower-0.9.11 |
74 |
- |
75 |
- colord? ( >=x11-misc/colord-0.1.27:= ) |
76 |
- cups? ( |
77 |
- >=net-print/cups-1.4[dbus] |
78 |
- app-admin/system-config-printer |
79 |
- net-print/cups-pk-helper ) |
80 |
- input_devices_wacom? ( |
81 |
- >=dev-libs/libwacom-0.7 |
82 |
- >=gnome-base/librsvg-2.36.2 |
83 |
- x11-drivers/xf86-input-wacom |
84 |
- x11-libs/libXtst ) |
85 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
86 |
- systemd? ( sys-apps/systemd:0= ) |
87 |
- !systemd? ( sys-auth/elogind:0= ) |
88 |
-" |
89 |
-DEPEND="${RDEPEND} |
90 |
- dev-util/glib-utils |
91 |
- dev-util/gdbus-codegen |
92 |
- dev-libs/libxml2:2 |
93 |
- >=dev-util/intltool-0.37.1 |
94 |
- x11-base/xorg-proto |
95 |
- virtual/pkgconfig |
96 |
-" |
97 |
- |
98 |
-src_prepare() { |
99 |
- # make colord and wacom optional |
100 |
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch |
101 |
- eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch |
102 |
- eapply "${FILESDIR}"/${PN}-4.4.0-systemd.patch |
103 |
- |
104 |
- # Disable broken test |
105 |
- sed -e '/g_test_add_func ("\/color\/edid/d' \ |
106 |
- -i plugins/color/gcm-self-test.c || die |
107 |
- |
108 |
- eautoreconf |
109 |
- gnome2_src_prepare |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- # no point in disabling gudev since other plugins pull it in |
114 |
- gnome2_src_configure \ |
115 |
- --disable-static \ |
116 |
- --enable-gudev \ |
117 |
- --enable-polkit \ |
118 |
- --enable-logind \ |
119 |
- --disable-accountservice \ |
120 |
- $(use_enable colord color) \ |
121 |
- $(use_enable cups) \ |
122 |
- $(use_enable smartcard smartcard-support) \ |
123 |
- $(use_enable input_devices_wacom wacom) |
124 |
-} |
125 |
- |
126 |
-src_test() { |
127 |
- virtx emake check |
128 |
-} |
129 |
|
130 |
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 |
131 |
deleted file mode 100644 |
132 |
index c12d7636f96..00000000000 |
133 |
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch |
134 |
+++ /dev/null |
135 |
@@ -1,84 +0,0 @@ |
136 |
---- a/configure.ac~ 2016-05-10 17:30:40.000000000 +0200 |
137 |
-+++ b/configure.ac 2016-06-25 17:43:46.554279197 +0200 |
138 |
-@@ -259,14 +259,28 @@ |
139 |
- dnl - color |
140 |
- dnl --------------------------------------------------------------------------- |
141 |
- |
142 |
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
143 |
-+AC_ARG_ENABLE(color, |
144 |
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),, |
145 |
-+ enable_color=yes) |
146 |
-+build_color=false |
147 |
-+if test x"$enable_color" != x"no" ; then |
148 |
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) |
149 |
-+ build_color=true |
150 |
-+fi |
151 |
-+ |
152 |
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"]) |
153 |
- |
154 |
- dnl --------------------------------------------------------------------------- |
155 |
- dnl - wacom |
156 |
- dnl --------------------------------------------------------------------------- |
157 |
-+AC_ARG_ENABLE(wacom, |
158 |
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),, |
159 |
-+ enable_wacom=auto) |
160 |
- build_wacom=false |
161 |
--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], |
162 |
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) |
163 |
-+if test x"$enable_wacom" != x"no" ; then |
164 |
-+ 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], |
165 |
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"]) |
166 |
-+fi |
167 |
- |
168 |
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") |
169 |
- |
170 |
-@@ -372,9 +386,15 @@ |
171 |
- dnl Check for logind |
172 |
- dnl ==================================================================== |
173 |
- |
174 |
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [ |
175 |
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no]) |
176 |
--]) |
177 |
-+AC_ARG_ENABLE([logind], |
178 |
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]), |
179 |
-+ [enable_logind=$enableval], |
180 |
-+ [enable_logind=auto]) |
181 |
-+ |
182 |
-+have_logind=no |
183 |
-+if test x$enable_logind != xno ; then |
184 |
-+ PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no]) |
185 |
-+fi |
186 |
- |
187 |
- if test x$have_logind = xyes; then |
188 |
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) |
189 |
-@@ -595,6 +615,7 @@ |
190 |
- LCMS DICT support: ${have_new_lcms} |
191 |
- Libnotify support: ${have_libnotify} |
192 |
- |
193 |
-+ Colord support: ${build_color} |
194 |
- Wacom support: ${build_wacom} |
195 |
- |
196 |
- Smartcard support: ${have_smartcard_support} |
197 |
---- a/plugins/Makefile.am~ 2016-05-10 17:30:40.000000000 +0200 |
198 |
-+++ b/plugins/Makefile.am 2016-06-25 17:44:30.021307677 +0200 |
199 |
-@@ -6,7 +6,6 @@ |
200 |
- automount \ |
201 |
- background \ |
202 |
- clipboard \ |
203 |
-- color \ |
204 |
- cursor \ |
205 |
- dummy \ |
206 |
- datetime \ |
207 |
-@@ -23,6 +22,12 @@ |
208 |
- |
209 |
- disabled_plugins = $(NULL) |
210 |
- |
211 |
-+if BUILD_COLOR |
212 |
-+enabled_plugins += color |
213 |
-+else |
214 |
-+disabled_plugins += color |
215 |
-+endif |
216 |
-+ |
217 |
- if BUILD_WACOM |
218 |
- enabled_plugins += wacom |
219 |
- else |
220 |
|
221 |
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 |
222 |
deleted file mode 100644 |
223 |
index 90b63731f87..00000000000 |
224 |
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch |
225 |
+++ /dev/null |
226 |
@@ -1,36 +0,0 @@ |
227 |
-From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001 |
228 |
-From: Leigh Scott <leigh123linux@×××××.com> |
229 |
-Date: Wed, 11 Dec 2019 23:29:08 +0000 |
230 |
-Subject: [PATCH] Restore old check for logind |
231 |
- |
232 |
---- |
233 |
- cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +- |
234 |
- plugins/common/csd-power-helper.c | 2 +- |
235 |
- 2 files changed, 2 insertions(+), 2 deletions(-) |
236 |
- |
237 |
-diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c |
238 |
-index adbe1e7..4d52b21 100644 |
239 |
---- a/cinnamon-settings-daemon/cinnamon-settings-session.c |
240 |
-+++ b/cinnamon-settings-daemon/cinnamon-settings-session.c |
241 |
-@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session) |
242 |
- session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session); |
243 |
- |
244 |
- #ifdef HAVE_LOGIND |
245 |
-- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted () |
246 |
-+ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted () |
247 |
- sd_pid_get_session (getpid(), &session->priv->session_id); |
248 |
- session->priv->sd_source = sd_source_new (); |
249 |
- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); |
250 |
-diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c |
251 |
-index 5a83072..82c0b22 100644 |
252 |
---- a/plugins/common/csd-power-helper.c |
253 |
-+++ b/plugins/common/csd-power-helper.c |
254 |
-@@ -41,7 +41,7 @@ use_logind (void) |
255 |
- static gsize once_init_value = 0; |
256 |
- |
257 |
- if (g_once_init_enter (&once_init_value)) { |
258 |
-- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted () |
259 |
-+ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted () |
260 |
- |
261 |
- g_once_init_leave (&once_init_value, 1); |
262 |
- } |