1 |
commit: b62db7c94cf9b636dd0206fb571741a921e9e2d5 |
2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Fri Jun 11 16:40:13 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 12 03:55:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62db7c9 |
7 |
|
8 |
gnome-extra/cinnamon-settings-daemon: drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
gnome-extra/cinnamon-settings-daemon/Manifest | 1 - |
15 |
.../cinnamon-settings-daemon-4.6.4.ebuild | 114 --------------------- |
16 |
...amon-settings-daemon-3.8.0-accountservice.patch | 57 ----------- |
17 |
3 files changed, 172 deletions(-) |
18 |
|
19 |
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest |
20 |
index 9aa971d4d2e..35b6896bbd7 100644 |
21 |
--- a/gnome-extra/cinnamon-settings-daemon/Manifest |
22 |
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208 |
25 |
DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a |
26 |
DIST cinnamon-settings-daemon-5.0.0.tar.gz 662485 BLAKE2B 33c7cf208f66f480ab3d70e4e7627e65f059ae13a3f24142f6cd0743752f9d636066c2ed8a805c649726280887b882bc0bc53e4c590888937bb977183a43e4ef SHA512 0e2ef144717ca41d946d6467931fb45eabf3468025e6bc4cf25f9b11f2d94dae07f7649874d801b312d94905d30d4e74202bf8f01af53689179039865ea54052 |
27 |
|
28 |
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild |
29 |
deleted file mode 100644 |
30 |
index 41f1514f1b0..00000000000 |
31 |
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,114 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
-inherit autotools eutils gnome2-utils virtualx xdg |
39 |
- |
40 |
-DESCRIPTION="Cinnamon's settings daemon" |
41 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
42 |
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="GPL-2+" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ~arm64 x86" |
47 |
-IUSE="+colord cups input_devices_wacom smartcard systemd" |
48 |
-RESTRICT="test" |
49 |
- |
50 |
-# udev is non-optional since lots of plugins, not just gudev, pull it in |
51 |
-RDEPEND=" |
52 |
- >=dev-libs/glib-2.38:2 |
53 |
- dev-libs/libgudev:= |
54 |
- >=gnome-base/libgnomekbd-3.6 |
55 |
- >=gnome-extra/cinnamon-desktop-4.6:0= |
56 |
- media-libs/fontconfig |
57 |
- >=media-libs/lcms-2.2:2 |
58 |
- media-libs/libcanberra:0=[gtk3] |
59 |
- >=sys-apps/dbus-1.1.2 |
60 |
- dev-libs/dbus-glib |
61 |
- >=sys-auth/polkit-0.97 |
62 |
- x11-libs/gdk-pixbuf:2 |
63 |
- >=x11-libs/gtk+-3.9.10:3 |
64 |
- >=x11-libs/libnotify-0.7.3:0= |
65 |
- x11-libs/libX11 |
66 |
- x11-libs/libXext |
67 |
- x11-libs/libXfixes |
68 |
- x11-libs/libXi |
69 |
- >=x11-libs/libxklavier-5.0 |
70 |
- >=sys-power/upower-0.9.11 |
71 |
- |
72 |
- colord? ( >=x11-misc/colord-0.1.27:= ) |
73 |
- cups? ( |
74 |
- >=net-print/cups-1.4[dbus] |
75 |
- app-admin/system-config-printer |
76 |
- net-print/cups-pk-helper ) |
77 |
- input_devices_wacom? ( |
78 |
- >=dev-libs/libwacom-0.7 |
79 |
- >=gnome-base/librsvg-2.36.2 |
80 |
- x11-drivers/xf86-input-wacom |
81 |
- x11-libs/libXtst ) |
82 |
- smartcard? ( >=dev-libs/nss-3.11.2 ) |
83 |
- systemd? ( sys-apps/systemd:0= ) |
84 |
- !systemd? ( sys-auth/elogind:0= ) |
85 |
-" |
86 |
-DEPEND="${RDEPEND} |
87 |
- dev-libs/libxml2:2 |
88 |
- x11-base/xorg-proto |
89 |
-" |
90 |
-BDEPEND=" |
91 |
- dev-util/glib-utils |
92 |
- dev-util/gdbus-codegen |
93 |
- >=dev-util/intltool-0.37.1 |
94 |
- virtual/pkgconfig |
95 |
-" |
96 |
- |
97 |
-PATCHES=( |
98 |
- # Make account-services optional |
99 |
- "${FILESDIR}"/${PN}-3.8.0-accountservice.patch |
100 |
-) |
101 |
- |
102 |
-src_prepare() { |
103 |
- xdg_src_prepare |
104 |
- eautoreconf |
105 |
- gnome2_disable_deprecation_warning |
106 |
- |
107 |
- # Disable broken test |
108 |
- sed -e '/g_test_add_func ("\/color\/edid/d' \ |
109 |
- -i plugins/color/gcm-self-test.c || die |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- # no point in disabling gudev since other plugins pull it in |
114 |
- econf \ |
115 |
- --disable-maintainer-mode \ |
116 |
- --disable-schemas-compile \ |
117 |
- --enable-compile-warnings=minimum \ |
118 |
- --disable-static \ |
119 |
- --enable-gudev \ |
120 |
- --enable-polkit \ |
121 |
- --enable-logind \ |
122 |
- --disable-accountservice \ |
123 |
- $(use_enable colord color) \ |
124 |
- $(use_enable cups) \ |
125 |
- $(use_enable smartcard smartcard-support) \ |
126 |
- $(use_enable input_devices_wacom wacom) |
127 |
-} |
128 |
- |
129 |
-src_test() { |
130 |
- virtx emake check |
131 |
-} |
132 |
- |
133 |
-src_install() { |
134 |
- default |
135 |
- find "${D}" -name '*.la' -delete || die |
136 |
- dodoc MAINTAINERS |
137 |
-} |
138 |
- |
139 |
-pkg_postinst() { |
140 |
- xdg_pkg_postinst |
141 |
- gnome2_schemas_update |
142 |
-} |
143 |
- |
144 |
-pkg_postrm() { |
145 |
- xdg_pkg_postrm |
146 |
- gnome2_schemas_update |
147 |
-} |
148 |
|
149 |
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch |
150 |
deleted file mode 100644 |
151 |
index c12f2730cea..00000000000 |
152 |
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch |
153 |
+++ /dev/null |
154 |
@@ -1,57 +0,0 @@ |
155 |
-From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001 |
156 |
-From: Kristian Fiskerstrand <kf@××××××××××××××××.com> |
157 |
-Date: Sat, 30 Jun 2018 22:35:52 +0200 |
158 |
-Subject: [PATCH] Make account service optional |
159 |
- |
160 |
---- |
161 |
- configure.ac | 6 ++++++ |
162 |
- plugins/background/csd-background-manager.c | 4 ++-- |
163 |
- 2 files changed, 8 insertions(+), 2 deletions(-) |
164 |
- |
165 |
-diff --git a/configure.ac b/configure.ac |
166 |
-index af5d3a4..a30126e 100644 |
167 |
---- a/configure.ac |
168 |
-+++ b/configure.ac |
169 |
-@@ -166,6 +166,12 @@ else |
170 |
- fi |
171 |
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) |
172 |
- |
173 |
-+AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval) |
174 |
-+ |
175 |
-+if test x$enable_accountservice = "xyes"; then |
176 |
-+ AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available]) |
177 |
-+fi |
178 |
-+ |
179 |
- dnl --------------------------------------------------------------------------- |
180 |
- dnl - common |
181 |
- dnl --------------------------------------------------------------------------- |
182 |
-diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c |
183 |
-index 282094a..a692c6e 100644 |
184 |
---- a/plugins/background/csd-background-manager.c |
185 |
-+++ b/plugins/background/csd-background-manager.c |
186 |
-@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings *settings, |
187 |
- { |
188 |
- gnome_bg_load_from_preferences (manager->priv->bg, |
189 |
- manager->priv->settings); |
190 |
-- |
191 |
-+#ifdef HAVE_ACCOUNTSERVICE |
192 |
- gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); |
193 |
-- |
194 |
-+#endif |
195 |
- return FALSE; |
196 |
- } |
197 |
- |
198 |
-diff --git a/plugins/background/csd-background-manager.c |
199 |
-b/plugins/background/csd-background-manager.c |
200 |
-index a692c6e..a99b478 100644 |
201 |
---- a/plugins/background/csd-background-manager.c |
202 |
-+++ b/plugins/background/csd-background-manager.c |
203 |
-@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager) |
204 |
- watch_bg_preferences (manager); |
205 |
- gnome_bg_load_from_preferences (manager->priv->bg, |
206 |
- manager->priv->settings); |
207 |
-- |
208 |
-+#ifdef HAVE_ACCOUNTSERVICE |
209 |
- gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg)); |
210 |
-+#endif |
211 |
- } |