1 |
commit: 38cdad5df60731d57bfd02d4413fa8e9071e5e9c |
2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 4 10:30:04 2018 +0000 |
4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 31 08:34:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cdad5d |
7 |
|
8 |
gnome-extra/cinnamon: New upstream version 3.8.8 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
gnome-extra/cinnamon/Manifest | 1 + |
13 |
gnome-extra/cinnamon/cinnamon-3.8.8.ebuild | 207 +++++++++++++++++++++ |
14 |
...amon-3.8.0-gnome-background-compatibility.patch | 25 +++ |
15 |
3 files changed, 233 insertions(+) |
16 |
|
17 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
18 |
index d5fec8d0789..d50a6456091 100644 |
19 |
--- a/gnome-extra/cinnamon/Manifest |
20 |
+++ b/gnome-extra/cinnamon/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642 |
23 |
+DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53 |
24 |
|
25 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..26e4c59984c |
28 |
--- /dev/null |
29 |
+++ b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild |
30 |
@@ -0,0 +1,207 @@ |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
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_4,3_5,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/" |
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/gconf:2[introspection] |
72 |
+ gnome-base/librsvg |
73 |
+ >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] |
74 |
+ >=gnome-extra/cinnamon-menus-3.6[introspection] |
75 |
+ >=gnome-extra/cjs-3.8.0 |
76 |
+ >=media-libs/clutter-1.10:1.0[introspection] |
77 |
+ media-libs/cogl:1.0=[introspection] |
78 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.91 |
79 |
+ media-libs/gstreamer:1.0 |
80 |
+ media-libs/gst-plugins-base:1.0 |
81 |
+ net-libs/libsoup:2.4[introspection] |
82 |
+ >=sys-auth/polkit-0.100[introspection] |
83 |
+ x11-libs/gdk-pixbuf:2[introspection] |
84 |
+ >=x11-libs/gtk+-3.12.0:3[introspection] |
85 |
+ x11-libs/pango[introspection] |
86 |
+ >=x11-libs/startup-notification-0.11 |
87 |
+ x11-libs/libX11 |
88 |
+ >=x11-libs/libXfixes-5.0 |
89 |
+ >=x11-wm/muffin-3.8.0[introspection] |
90 |
+" |
91 |
+# Runtime-only deps are probably incomplete and approximate. |
92 |
+# Each block: |
93 |
+# 2. Introspection stuff + dconf needed via imports.gi.* |
94 |
+# 3. gnome-session is needed for gnome-session-quit |
95 |
+# 4. Control shell settings |
96 |
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
97 |
+# user switching with gdm-3.1.x) |
98 |
+# 6. caribou needed for on-screen keyboard |
99 |
+# 7. xdg-utils needed for xdg-open, used by extension tool |
100 |
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
101 |
+# 9. gnome-icon-theme-symbolic needed for various icons |
102 |
+# 10. pygobject needed for menu editor |
103 |
+# 11. nemo - default file manager, tightly integrated with cinnamon |
104 |
+# 12. polkit-gnome - explicitly autostarted by us |
105 |
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
106 |
+RDEPEND="${COMMON_DEPEND} |
107 |
+ >=gnome-base/dconf-0.4.1 |
108 |
+ >=gnome-base/libgnomekbd-2.91.4[introspection] |
109 |
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
110 |
+ |
111 |
+ >=gnome-extra/cinnamon-session-3.8 |
112 |
+ >=gnome-extra/cinnamon-settings-daemon-3.8 |
113 |
+ |
114 |
+ >=app-accessibility/caribou-0.3 |
115 |
+ |
116 |
+ x11-misc/xdg-utils |
117 |
+ x11-libs/xapps[introspection] |
118 |
+ |
119 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
120 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
121 |
+ $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
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-3.8 |
133 |
+ >=gnome-extra/cinnamon-control-center-3.8 |
134 |
+ >=gnome-extra/cinnamon-screensaver-3.8 |
135 |
+ |
136 |
+ gnome-extra/polkit-gnome |
137 |
+ |
138 |
+ nls? ( >=gnome-extra/cinnamon-translations-3.8 ) |
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 |
+ # Use pkexec instead of gksu (from Arch) |
168 |
+ # https://github.com/linuxmint/Cinnamon/issues/3565 |
169 |
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
170 |
+ |
171 |
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
172 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
173 |
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
174 |
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
175 |
+ |
176 |
+ # python 2-and-3 shebang fixing craziness |
177 |
+ local p |
178 |
+ python_setup 'python3*' |
179 |
+ for p in $(grep -rl '#!.*python3'); do |
180 |
+ python_fix_shebang "${p}" |
181 |
+ done |
182 |
+ |
183 |
+ python_setup 'python2*' |
184 |
+ for p in $(grep -rl '#!.*python[^3]'); do |
185 |
+ python_fix_shebang "${p}" |
186 |
+ done |
187 |
+ |
188 |
+ eautoreconf |
189 |
+ gnome2_src_prepare |
190 |
+} |
191 |
+ |
192 |
+src_configure() { |
193 |
+ gnome2_src_configure \ |
194 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
195 |
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
196 |
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
197 |
+} |
198 |
+ |
199 |
+src_install() { |
200 |
+ gnome2_src_install |
201 |
+ python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
202 |
+ |
203 |
+ # Required for gnome-shell on hardened/PaX, bug #398941 |
204 |
+ pax-mark mr "${ED}usr/bin/cinnamon" |
205 |
+ |
206 |
+ # Doesn't exist on Gentoo, causing this to be a dead symlink |
207 |
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
208 |
+ |
209 |
+ # Ensure authentication-agent is started, bug #523958 |
210 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
211 |
+ insinto /etc/xdg/autostart/ |
212 |
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
213 |
+} |
214 |
+ |
215 |
+pkg_postinst() { |
216 |
+ gnome2_pkg_postinst |
217 |
+ |
218 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
219 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
220 |
+ ewarn "To make use of Cinnamon's built-in screen recording utility," |
221 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
222 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
223 |
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
224 |
+ fi |
225 |
+ |
226 |
+ if ! has_version ">=x11-base/xorg-server-1.11"; then |
227 |
+ ewarn "If you use multiple screens, it is highly recommended that you" |
228 |
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
229 |
+ ewarn "pointer barriers which will make it easier to use hot corners." |
230 |
+ fi |
231 |
+ |
232 |
+ if has_version "<x11-drivers/ati-drivers-12"; then |
233 |
+ ewarn "Cinnamon has been reported to show graphical corruption under" |
234 |
+ ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
235 |
+ ewarn "open-source drivers." |
236 |
+ fi |
237 |
+} |
238 |
|
239 |
diff --git a/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch b/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch |
240 |
new file mode 100644 |
241 |
index 00000000000..6f802fee658 |
242 |
--- /dev/null |
243 |
+++ b/gnome-extra/cinnamon/files/cinnamon-3.8.0-gnome-background-compatibility.patch |
244 |
@@ -0,0 +1,25 @@ |
245 |
+From 21710409c0ed8acfbad98131d1664006d32181bf Mon Sep 17 00:00:00 2001 |
246 |
+From: Kristian Fiskerstrand <kf@××××××××××××××××.com> |
247 |
+Date: Sat, 30 Jun 2018 20:24:55 +0200 |
248 |
+Subject: [PATCH] gnome-background-compatibility |
249 |
+ |
250 |
+--- |
251 |
+ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py | 2 +- |
252 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
253 |
+ |
254 |
+diff --git a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py |
255 |
+index 6e279ed..ec47983 100755 |
256 |
+--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py |
257 |
++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py |
258 |
+@@ -268,7 +268,7 @@ class Module: |
259 |
+ def get_system_backgrounds(self): |
260 |
+ picture_list = [] |
261 |
+ folder_list = [] |
262 |
+- properties_dir = "/usr/share/cinnamon-background-properties" |
263 |
++ properties_dir = "/usr/share/gnome-background-properties" |
264 |
+ backgrounds = [] |
265 |
+ if os.path.exists(properties_dir): |
266 |
+ for i in os.listdir(properties_dir): |
267 |
+-- |
268 |
+2.16.4 |
269 |
+ |