1 |
commit: 513af20d19b76dd314b3abf4fd9f6e7c3d2a9cae |
2 |
Author: Matthew Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Wed May 13 02:58:30 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 00:10:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513af20d |
7 |
|
8 |
gnome-extra/cinnamon-settings-daemon: 4.4.0 version bump |
9 |
|
10 |
Update cinnamon-settings-daemon to 4.4.0. CUPS dependencies |
11 |
belong here instead of cinnamon-control-center. Include |
12 |
patch to fix systemd detection. |
13 |
|
14 |
Bug: https://bugs.gentoo.org/704532 |
15 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
16 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
17 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
18 |
|
19 |
gnome-extra/cinnamon-settings-daemon/Manifest | 1 + |
20 |
.../cinnamon-settings-daemon-4.4.0.ebuild | 92 ++++++++++++++++++++++ |
21 |
.../cinnamon-settings-daemon-4.4.0-systemd.patch | 36 +++++++++ |
22 |
gnome-extra/cinnamon-settings-daemon/metadata.xml | 8 ++ |
23 |
4 files changed, 137 insertions(+) |
24 |
|
25 |
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest |
26 |
index b8caf111fdc..92b72ec7d11 100644 |
27 |
--- a/gnome-extra/cinnamon-settings-daemon/Manifest |
28 |
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest |
29 |
@@ -1 +1,2 @@ |
30 |
DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e |
31 |
+DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81 |
32 |
|
33 |
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 |
34 |
new file mode 100644 |
35 |
index 00000000000..674a8d9e562 |
36 |
--- /dev/null |
37 |
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild |
38 |
@@ -0,0 +1,92 @@ |
39 |
+# Copyright 1999-2020 Gentoo Authors |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=6 |
43 |
+GNOME2_LA_PUNT="yes" |
44 |
+ |
45 |
+inherit autotools eutils gnome2 virtualx |
46 |
+ |
47 |
+DESCRIPTION="Cinnamon's settings daemon" |
48 |
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
49 |
+SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" |
50 |
+ |
51 |
+LICENSE="GPL-2+" |
52 |
+SLOT="0" |
53 |
+KEYWORDS="~amd64 ~x86" |
54 |
+IUSE="+colord cups input_devices_wacom smartcard systemd" |
55 |
+RESTRICT=test |
56 |
+ |
57 |
+# udev is non-optional since lots of plugins, not just gudev, pull it in |
58 |
+RDEPEND=" |
59 |
+ >=dev-libs/glib-2.38:2 |
60 |
+ dev-libs/libgudev:= |
61 |
+ >=gnome-base/libgnomekbd-3.6 |
62 |
+ >=gnome-extra/cinnamon-desktop-4.4:0= |
63 |
+ media-libs/fontconfig |
64 |
+ >=media-libs/lcms-2.2:2 |
65 |
+ media-libs/libcanberra:0=[gtk3] |
66 |
+ >=sys-apps/dbus-1.1.2 |
67 |
+ >=sys-auth/polkit-0.97 |
68 |
+ x11-libs/gdk-pixbuf:2 |
69 |
+ >=x11-libs/gtk+-3.9.10:3 |
70 |
+ >=x11-libs/libnotify-0.7.3:0= |
71 |
+ x11-libs/libX11 |
72 |
+ x11-libs/libXext |
73 |
+ x11-libs/libXfixes |
74 |
+ x11-libs/libXi |
75 |
+ >=x11-libs/libxklavier-5.0 |
76 |
+ >=sys-power/upower-0.9.11 |
77 |
+ |
78 |
+ colord? ( >=x11-misc/colord-0.1.27:= ) |
79 |
+ cups? ( |
80 |
+ >=net-print/cups-1.4[dbus] |
81 |
+ app-admin/system-config-printer |
82 |
+ net-print/cups-pk-helper ) |
83 |
+ input_devices_wacom? ( |
84 |
+ >=dev-libs/libwacom-0.7 |
85 |
+ >=gnome-base/librsvg-2.36.2 |
86 |
+ x11-drivers/xf86-input-wacom |
87 |
+ x11-libs/libXtst ) |
88 |
+ smartcard? ( >=dev-libs/nss-3.11.2 ) |
89 |
+ systemd? ( sys-apps/systemd:0= ) |
90 |
+ !systemd? ( sys-auth/elogind:0= ) |
91 |
+" |
92 |
+DEPEND="${RDEPEND} |
93 |
+ dev-util/gdbus-codegen |
94 |
+ dev-libs/libxml2:2 |
95 |
+ >=dev-util/intltool-0.37.1 |
96 |
+ x11-base/xorg-proto |
97 |
+ virtual/pkgconfig |
98 |
+" |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ # make colord and wacom optional |
102 |
+ eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch |
103 |
+ eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch |
104 |
+ eapply "${FILESDIR}"/${PN}-4.4.0-systemd.patch |
105 |
+ |
106 |
+ # Disable broken test |
107 |
+ sed -e '/g_test_add_func ("\/color\/edid/d' \ |
108 |
+ -i plugins/color/gcm-self-test.c || die |
109 |
+ |
110 |
+ eautoreconf |
111 |
+ gnome2_src_prepare |
112 |
+} |
113 |
+ |
114 |
+src_configure() { |
115 |
+ # no point in disabling gudev since other plugins pull it in |
116 |
+ gnome2_src_configure \ |
117 |
+ --disable-static \ |
118 |
+ --enable-gudev \ |
119 |
+ --enable-polkit \ |
120 |
+ --enable-logind \ |
121 |
+ --disable-accountservice \ |
122 |
+ $(use_enable colord color) \ |
123 |
+ $(use_enable cups) \ |
124 |
+ $(use_enable smartcard smartcard-support) \ |
125 |
+ $(use_enable input_devices_wacom wacom) |
126 |
+} |
127 |
+ |
128 |
+src_test() { |
129 |
+ virtx emake check |
130 |
+} |
131 |
|
132 |
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 |
133 |
new file mode 100644 |
134 |
index 00000000000..90b63731f87 |
135 |
--- /dev/null |
136 |
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch |
137 |
@@ -0,0 +1,36 @@ |
138 |
+From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001 |
139 |
+From: Leigh Scott <leigh123linux@×××××.com> |
140 |
+Date: Wed, 11 Dec 2019 23:29:08 +0000 |
141 |
+Subject: [PATCH] Restore old check for logind |
142 |
+ |
143 |
+--- |
144 |
+ cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +- |
145 |
+ plugins/common/csd-power-helper.c | 2 +- |
146 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
147 |
+ |
148 |
+diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c |
149 |
+index adbe1e7..4d52b21 100644 |
150 |
+--- a/cinnamon-settings-daemon/cinnamon-settings-session.c |
151 |
++++ b/cinnamon-settings-daemon/cinnamon-settings-session.c |
152 |
+@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session) |
153 |
+ session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session); |
154 |
+ |
155 |
+ #ifdef HAVE_LOGIND |
156 |
+- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted () |
157 |
++ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted () |
158 |
+ sd_pid_get_session (getpid(), &session->priv->session_id); |
159 |
+ session->priv->sd_source = sd_source_new (); |
160 |
+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); |
161 |
+diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c |
162 |
+index 5a83072..82c0b22 100644 |
163 |
+--- a/plugins/common/csd-power-helper.c |
164 |
++++ b/plugins/common/csd-power-helper.c |
165 |
+@@ -41,7 +41,7 @@ use_logind (void) |
166 |
+ static gsize once_init_value = 0; |
167 |
+ |
168 |
+ if (g_once_init_enter (&once_init_value)) { |
169 |
+- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted () |
170 |
++ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted () |
171 |
+ |
172 |
+ g_once_init_leave (&once_init_value, 1); |
173 |
+ } |
174 |
|
175 |
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml |
176 |
index da9442eb021..966474ecf7b 100644 |
177 |
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml |
178 |
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml |
179 |
@@ -5,6 +5,14 @@ |
180 |
<email>cinnamon@g.o</email> |
181 |
<name>Cinnamon Project</name> |
182 |
</maintainer> |
183 |
+ <maintainer type="project"> |
184 |
+ <email>proxy-maint@g.o</email> |
185 |
+ <name>Proxy Maintainers</name> |
186 |
+ </maintainer> |
187 |
+ <maintainer type="person"> |
188 |
+ <email>sparky@××××××××××××××.com</email> |
189 |
+ <name>Matthew Turnbull</name> |
190 |
+ </maintainer> |
191 |
<upstream> |
192 |
<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id> |
193 |
</upstream> |