Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/, gnome-extra/cinnamon/files/
Date: Sun, 31 May 2020 19:05:25
Message-Id: 1590951869.397183c7b99af3ee77204fa58d22a70d7b7e8ff6.mattst88@gentoo
1 commit: 397183c7b99af3ee77204fa58d22a70d7b7e8ff6
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 18:45:11 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 19:04:29 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397183c7
7
8 gnome-extra/cinnamon: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 gnome-extra/cinnamon/Manifest | 1 -
13 gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild | 209 ---------------------
14 .../files/cinnamon-4.0-fix-pillow-settings.patch | 43 -----
15 3 files changed, 253 deletions(-)
16
17 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
18 index 396de5e690f..62012379d1a 100644
19 --- a/gnome-extra/cinnamon/Manifest
20 +++ b/gnome-extra/cinnamon/Manifest
21 @@ -1,2 +1 @@
22 -DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
23 DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
24
25 diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
26 deleted file mode 100644
27 index 5362f3afea6..00000000000
28 --- a/gnome-extra/cinnamon/cinnamon-4.0.3-r2.ebuild
29 +++ /dev/null
30 @@ -1,209 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -GNOME2_LA_PUNT="yes"
36 -PYTHON_COMPAT=( python{2_7,3_6} )
37 -PYTHON_REQ_USE="xml"
38 -
39 -inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
40 -
41 -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
42 -HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
43 -
44 -MY_PV="${PV/_p/-UP}"
45 -MY_P="${PN}-${MY_PV}"
46 -
47 -SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
48 -
49 -LICENSE="GPL-2+"
50 -SLOT="0"
51 -
52 -IUSE="+nls"
53 -
54 -# We need *both* python 2.x and 3.x
55 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
56 - || ( $(python_gen_useflags 'python2*') )
57 - || ( $(python_gen_useflags 'python3*') )
58 -"
59 -
60 -KEYWORDS="amd64 x86"
61 -
62 -COMMON_DEPEND="${PYTHON_DEPS}
63 - app-accessibility/at-spi2-atk:2
64 - app-misc/ca-certificates
65 - dev-libs/dbus-glib
66 - >=dev-libs/glib-2.35.0:2[dbus]
67 - >=dev-libs/gobject-introspection-0.10.1:=
68 - >=dev-libs/json-glib-0.13.2
69 - >=dev-libs/libcroco-0.6.2:0.6
70 - dev-libs/libxml2:2
71 - gnome-base/librsvg
72 - >=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
73 - >=gnome-extra/cinnamon-menus-4.0[introspection]
74 - >=gnome-extra/cjs-4.0.0[cairo]
75 - >=media-libs/clutter-1.10:1.0[introspection]
76 - media-libs/cogl:1.0=[introspection]
77 - >=gnome-base/gsettings-desktop-schemas-2.91.91
78 - media-libs/gstreamer:1.0
79 - media-libs/gst-plugins-base:1.0
80 - net-libs/libsoup:2.4[introspection]
81 - >=sys-auth/polkit-0.100[introspection]
82 - x11-libs/gdk-pixbuf:2[introspection]
83 - >=x11-libs/gtk+-3.12.0:3[introspection]
84 - x11-libs/pango[introspection]
85 - >=x11-libs/startup-notification-0.11
86 - x11-libs/libX11
87 - >=x11-libs/libXfixes-5.0
88 - >=x11-wm/muffin-4.0.0[introspection]
89 - dev-libs/keybinder:3[introspection]
90 - >=x11-libs/libnotify-0.7.3:0=[introspection]
91 -"
92 -# Runtime-only deps are probably incomplete and approximate.
93 -# Each block:
94 -# 2. Introspection stuff + dconf needed via imports.gi.*
95 -# 3. gnome-session is needed for gnome-session-quit
96 -# 4. Control shell settings
97 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
98 -# user switching with gdm-3.1.x)
99 -# 6. caribou needed for on-screen keyboard
100 -# 7. xdg-utils needed for xdg-open, used by extension tool
101 -# 8. imaging, lxml needed for cinnamon-settings
102 -# 9. gnome-icon-theme-symbolic needed for various icons
103 -# 10. pygobject needed for menu editor
104 -# 11. nemo - default file manager, tightly integrated with cinnamon
105 -# 12. polkit-gnome - explicitly autostarted by us
106 -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
107 -RDEPEND="${COMMON_DEPEND}
108 - >=gnome-base/dconf-0.4.1
109 - >=gnome-base/libgnomekbd-2.91.4[introspection]
110 - sys-power/upower[introspection]
111 -
112 - >=gnome-extra/cinnamon-session-4.0
113 - >=gnome-extra/cinnamon-settings-daemon-4.0
114 -
115 - >=app-accessibility/caribou-0.3
116 -
117 - x11-misc/xdg-utils
118 - x11-libs/xapps[introspection]
119 -
120 - dev-python/dbus-python[${PYTHON_USEDEP}]
121 - dev-python/pygobject:3[${PYTHON_USEDEP}]
122 - $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
123 - $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
124 - $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
125 - $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
126 - $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
127 - $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
128 -
129 - x11-themes/gnome-themes-standard
130 - x11-themes/adwaita-icon-theme
131 -
132 - >=gnome-extra/nemo-4.0
133 - >=gnome-extra/cinnamon-control-center-4.0
134 - >=gnome-extra/cinnamon-screensaver-4.0
135 -
136 - gnome-extra/polkit-gnome
137 -
138 - nls? ( >=gnome-extra/cinnamon-translations-4.0 )
139 -"
140 -DEPEND="${COMMON_DEPEND}
141 - $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
142 - dev-util/gtk-doc
143 - >=dev-util/intltool-0.4
144 - >=sys-devel/gettext-0.17
145 - virtual/pkgconfig
146 - gnome-base/gnome-common
147 - !!=dev-lang/spidermonkey-1.8.2*
148 -"
149 -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
150 -# https://bugs.gentoo.org/show_bug.cgi?id=360413
151 -
152 -S="${WORKDIR}/Cinnamon-${PV}"
153 -
154 -pkg_setup() {
155 - python_setup
156 -}
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 - eapply -p0 "${FILESDIR}"/${PN}-4.0-fix-pillow-settings.patch
168 -
169 - # Use pkexec instead of gksu (from Arch)
170 - # https://github.com/linuxmint/Cinnamon/issues/3565
171 - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
172 -
173 - # Add polkit agent to required components (from Fedora/Arch), bug #523958
174 - # https://github.com/linuxmint/Cinnamon/issues/3579
175 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
176 - files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
177 -
178 - # python 2-and-3 shebang fixing craziness
179 - local p
180 - python_setup 'python3*'
181 - for p in $(grep -rl '#!.*python3'); do
182 - python_fix_shebang "${p}"
183 - done
184 -
185 - python_setup 'python2*'
186 - for p in $(grep -rl '#!.*python[^3]'); do
187 - python_fix_shebang "${p}"
188 - done
189 -
190 - eautoreconf
191 - gnome2_src_prepare
192 -}
193 -
194 -src_configure() {
195 - gnome2_src_configure \
196 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
197 - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
198 - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
199 -}
200 -
201 -src_install() {
202 - gnome2_src_install
203 - python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
204 -
205 - # Required for gnome-shell on hardened/PaX, bug #398941
206 - pax-mark mr "${ED}usr/bin/cinnamon"
207 -
208 - # Doesn't exist on Gentoo, causing this to be a dead symlink
209 - rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
210 -
211 - # Ensure authentication-agent is started, bug #523958
212 - # https://github.com/linuxmint/Cinnamon/issues/3579
213 - insinto /etc/xdg/autostart/
214 - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
215 -}
216 -
217 -pkg_postinst() {
218 - gnome2_pkg_postinst
219 -
220 - if ! has_version 'media-libs/gst-plugins-good:1.0' || \
221 - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
222 - ewarn "To make use of Cinnamon's built-in screen recording utility,"
223 - ewarn "you need to either install media-libs/gst-plugins-good:1.0"
224 - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
225 - ewarn "org.cinnamon.recorder/pipeline to what you want to use."
226 - fi
227 -
228 - if ! has_version ">=x11-base/xorg-server-1.11"; then
229 - ewarn "If you use multiple screens, it is highly recommended that you"
230 - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
231 - ewarn "pointer barriers which will make it easier to use hot corners."
232 - fi
233 -
234 - if has_version "<x11-drivers/ati-drivers-12"; then
235 - ewarn "Cinnamon has been reported to show graphical corruption under"
236 - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
237 - ewarn "open-source drivers."
238 - fi
239 -}
240
241 diff --git a/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch b/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
242 deleted file mode 100644
243 index e06c86b8f3d..00000000000
244 --- a/gnome-extra/cinnamon/files/cinnamon-4.0-fix-pillow-settings.patch
245 +++ /dev/null
246 @@ -1,43 +0,0 @@
247 ---- files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py.orig 2019-03-21 16:46:14 UTC
248 -+++ files/usr/share/cinnamon/cinnamon-settings/bin/imtools.py
249 -@@ -620,31 +620,6 @@ def has_transparency(image):
250 - has_alpha(image)
251 -
252 -
253 --if Image.VERSION == '1.1.7':
254 --
255 -- def split(image):
256 -- """Work around for bug in Pil 1.1.7
257 --
258 -- :param image: input image
259 -- :type image: PIL image object
260 -- :returns: the different color bands of the image (eg R, G, B)
261 -- :rtype: tuple
262 -- """
263 -- image.load()
264 -- return image.split()
265 --else:
266 --
267 -- def split(image):
268 -- """Work around for bug in Pil 1.1.7
269 --
270 -- :param image: input image
271 -- :type image: PIL image object
272 -- :returns: the different color bands of the image (eg R, G, B)
273 -- :rtype: tuple
274 -- """
275 -- return image.split()
276 --
277 --
278 - def get_alpha(image):
279 - """Gets the image alpha band. Can handles P mode images with transpareny.
280 - Returns a band with all values set to 255 if no alpha band exists.
281 -@@ -655,7 +630,7 @@ def get_alpha(image):
282 - :rtype: single band image object
283 - """
284 - if has_alpha(image):
285 -- return split(image)[-1]
286 -+ return image.split()[-1]
287 - if image.mode == 'P' and 'transparency' in image.info:
288 - return image.convert('RGBA').split()[-1]
289 - # No alpha layer, create one.