1 |
commit: 8da71837558fd68d32a72b8b7b5fb88071e78ecc |
2 |
Author: Matthew Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Wed May 13 05:52:22 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 29 00:10:46 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da71837 |
7 |
|
8 |
gnome-extra/cinnamon: 4.4.8 version bump |
9 |
|
10 |
Update cinnamon to 4.4.8. Re-work python support |
11 |
as python-single-r1 with python3_{6,7} compat. |
12 |
Clean-up dependencies and make networkmanager optional. |
13 |
|
14 |
Closes: https://bugs.gentoo.org/553946 |
15 |
Closes: https://bugs.gentoo.org/704532 |
16 |
Closes: https://bugs.gentoo.org/662546 |
17 |
Closes: https://bugs.gentoo.org/709016 |
18 |
Bug: https://bugs.gentoo.org/718316 |
19 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
20 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
21 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
22 |
|
23 |
gnome-extra/cinnamon/Manifest | 1 + |
24 |
gnome-extra/cinnamon/cinnamon-4.4.8.ebuild | 176 +++++++++++++++++++++++++++++ |
25 |
gnome-extra/cinnamon/metadata.xml | 8 ++ |
26 |
3 files changed, 185 insertions(+) |
27 |
|
28 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
29 |
index 8e3d2161a95..396de5e690f 100644 |
30 |
--- a/gnome-extra/cinnamon/Manifest |
31 |
+++ b/gnome-extra/cinnamon/Manifest |
32 |
@@ -1 +1,2 @@ |
33 |
DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1 |
34 |
+DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978 |
35 |
|
36 |
diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild |
37 |
new file mode 100644 |
38 |
index 00000000000..8fb8410e1ee |
39 |
--- /dev/null |
40 |
+++ b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild |
41 |
@@ -0,0 +1,176 @@ |
42 |
+# Copyright 1999-2020 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI=6 |
46 |
+GNOME2_LA_PUNT="yes" |
47 |
+PYTHON_COMPAT=( python3_{6,7} ) |
48 |
+PYTHON_REQ_USE="xml" |
49 |
+ |
50 |
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1 |
51 |
+ |
52 |
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
53 |
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
54 |
+ |
55 |
+MY_PV="${PV/_p/-UP}" |
56 |
+MY_P="${PN}-${MY_PV}" |
57 |
+ |
58 |
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
59 |
+ |
60 |
+LICENSE="GPL-2+" |
61 |
+SLOT="0" |
62 |
+ |
63 |
+IUSE="gtk-doc +nls +networkmanager" |
64 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
65 |
+ |
66 |
+KEYWORDS="~amd64 ~x86" |
67 |
+ |
68 |
+COMMON_DEPEND="${PYTHON_DEPS} |
69 |
+ app-accessibility/at-spi2-atk:2 |
70 |
+ app-misc/ca-certificates |
71 |
+ dev-libs/dbus-glib |
72 |
+ >=dev-libs/glib-2.35.0:2[dbus] |
73 |
+ >=dev-libs/gobject-introspection-1.29.15:= |
74 |
+ >=dev-libs/libcroco-0.6.2:0.6 |
75 |
+ dev-libs/libxml2:2 |
76 |
+ >=gnome-extra/cinnamon-desktop-4.4:0= |
77 |
+ >=gnome-extra/cinnamon-menus-4.4 |
78 |
+ >=gnome-extra/cjs-4.4.0[cairo] |
79 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.91 |
80 |
+ media-libs/gstreamer:1.0 |
81 |
+ media-libs/gst-plugins-base:1.0 |
82 |
+ net-libs/libsoup:2.4[introspection] |
83 |
+ >=sys-auth/polkit-0.100[introspection] |
84 |
+ x11-libs/gdk-pixbuf:2[introspection] |
85 |
+ >=x11-libs/gtk+-3.12.0:3[introspection] |
86 |
+ x11-libs/pango[introspection] |
87 |
+ >=x11-libs/startup-notification-0.11 |
88 |
+ x11-libs/libX11 |
89 |
+ >=x11-libs/libXfixes-5.0 |
90 |
+ >=x11-wm/muffin-4.0.3[introspection] |
91 |
+ dev-libs/keybinder:3[introspection] |
92 |
+ >=x11-libs/libnotify-0.7.3:0=[introspection] |
93 |
+" |
94 |
+# Runtime-only deps are probably incomplete and approximate. |
95 |
+# Each block: |
96 |
+# 2. Introspection stuff + dconf needed via imports.gi.* |
97 |
+# 3. gnome-session is needed for gnome-session-quit |
98 |
+# 4. Control shell settings |
99 |
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
100 |
+# user switching with gdm-3.1.x) |
101 |
+# 6. caribou needed for on-screen keyboard |
102 |
+# 7. xdg-utils needed for xdg-open, used by extension tool |
103 |
+# 8. imaging, lxml needed for cinnamon-settings |
104 |
+# 9. gnome-icon-theme-symbolic needed for various icons |
105 |
+# 10. pygobject needed for menu editor |
106 |
+# 11. nemo - default file manager, tightly integrated with cinnamon |
107 |
+# 12. polkit-gnome - explicitly autostarted by us |
108 |
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
109 |
+RDEPEND="${COMMON_DEPEND} |
110 |
+ >=gnome-base/dconf-0.4.1 |
111 |
+ >=gnome-base/libgnomekbd-2.91.4 |
112 |
+ sys-power/upower[introspection] |
113 |
+ |
114 |
+ >=gnome-extra/cinnamon-session-4.4 |
115 |
+ >=gnome-extra/cinnamon-settings-daemon-4.4 |
116 |
+ |
117 |
+ >=app-accessibility/caribou-0.3 |
118 |
+ |
119 |
+ dev-libs/libtimezonemap |
120 |
+ x11-misc/xdg-utils |
121 |
+ x11-libs/xapps[introspection] |
122 |
+ |
123 |
+ $(python_gen_cond_dep ' |
124 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
125 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
126 |
+ dev-python/pexpect[${PYTHON_USEDEP}] |
127 |
+ dev-python/pycairo[${PYTHON_USEDEP}] |
128 |
+ dev-python/pyinotify[${PYTHON_USEDEP}] |
129 |
+ dev-python/pypam[${PYTHON_USEDEP}] |
130 |
+ dev-python/pillow[${PYTHON_USEDEP}] |
131 |
+ dev-python/setproctitle[${PYTHON_USEDEP}] |
132 |
+ dev-python/tinycss[${PYTHON_USEDEP}] |
133 |
+ dev-python/pytz[${PYTHON_USEDEP}] |
134 |
+ dev-python/xapp[${PYTHON_USEDEP}] |
135 |
+ ') |
136 |
+ |
137 |
+ x11-themes/gnome-themes-standard |
138 |
+ x11-themes/adwaita-icon-theme |
139 |
+ |
140 |
+ >=gnome-extra/nemo-4.4 |
141 |
+ >=gnome-extra/cinnamon-control-center-4.4[networkmanager=] |
142 |
+ >=gnome-extra/cinnamon-screensaver-4.4 |
143 |
+ |
144 |
+ gnome-extra/polkit-gnome |
145 |
+ |
146 |
+ nls? ( >=gnome-extra/cinnamon-translations-4.4 ) |
147 |
+" |
148 |
+DEPEND="${COMMON_DEPEND} |
149 |
+ >=dev-util/intltool-0.40 |
150 |
+ >=sys-devel/gettext-0.17 |
151 |
+ virtual/pkgconfig |
152 |
+ !!=dev-lang/spidermonkey-1.8.2* |
153 |
+ gtk-doc? ( dev-util/gtk-doc ) |
154 |
+" |
155 |
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
156 |
+# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ # Fix backgrounds path as cinnamon doesn't provide them |
160 |
+ # https://github.com/linuxmint/Cinnamon/issues/3575 |
161 |
+ eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch |
162 |
+ |
163 |
+ # Use wheel group instead of sudo (from Fedora/Arch) |
164 |
+ # https://github.com/linuxmint/Cinnamon/issues/3576 |
165 |
+ eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch |
166 |
+ |
167 |
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
168 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
169 |
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
170 |
+ files/cinnamon*.session.in || die |
171 |
+ |
172 |
+ # shebang fixing craziness |
173 |
+ local p |
174 |
+ for p in $(grep -rl '#!.*python3'); do |
175 |
+ python_fix_shebang "${p}" |
176 |
+ done |
177 |
+ |
178 |
+ eautoreconf |
179 |
+ gnome2_src_prepare |
180 |
+} |
181 |
+ |
182 |
+src_configure() { |
183 |
+ gnome2_src_configure \ |
184 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
185 |
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
186 |
+ $(use_enable gtk-doc) \ |
187 |
+ $(use_enable networkmanager) \ |
188 |
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
189 |
+} |
190 |
+ |
191 |
+src_install() { |
192 |
+ gnome2_src_install |
193 |
+ python_optimize "${ED}"usr/share/cinnamon/ |
194 |
+ |
195 |
+ # Required for gnome-shell on hardened/PaX, bug #398941 |
196 |
+ pax-mark mr "${ED}usr/bin/cinnamon" |
197 |
+ |
198 |
+ # Doesn't exist on Gentoo, causing this to be a dead symlink |
199 |
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
200 |
+ |
201 |
+ # Ensure authentication-agent is started, bug #523958 |
202 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
203 |
+ insinto /etc/xdg/autostart/ |
204 |
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
205 |
+} |
206 |
+ |
207 |
+pkg_postinst() { |
208 |
+ gnome2_pkg_postinst |
209 |
+ |
210 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
211 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
212 |
+ ewarn "To make use of Cinnamon's built-in screen recording utility," |
213 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
214 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
215 |
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
216 |
+ fi |
217 |
+} |
218 |
|
219 |
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml |
220 |
index 216784b94f4..5070fef67ad 100644 |
221 |
--- a/gnome-extra/cinnamon/metadata.xml |
222 |
+++ b/gnome-extra/cinnamon/metadata.xml |
223 |
@@ -5,6 +5,14 @@ |
224 |
<email>cinnamon@g.o</email> |
225 |
<name>Cinnamon Project</name> |
226 |
</maintainer> |
227 |
+ <maintainer type="project"> |
228 |
+ <email>proxy-maint@g.o</email> |
229 |
+ <name>Proxy Maintainers</name> |
230 |
+ </maintainer> |
231 |
+ <maintainer type="person"> |
232 |
+ <email>sparky@××××××××××××××.com</email> |
233 |
+ <name>Matthew Turnbull</name> |
234 |
+ </maintainer> |
235 |
<upstream> |
236 |
<remote-id type="github">linuxmint/Cinnamon</remote-id> |
237 |
</upstream> |