1 |
commit: 61bd2ca245bb9fbbb6f4decc4cf5c2b04a4f7f70 |
2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 26 14:59:09 2017 +0000 |
4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 26 15:11:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61bd2ca2 |
7 |
|
8 |
gnome-extra/cinnamon: Version bump 3.6.6 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
gnome-extra/cinnamon/Manifest | 3 +- |
13 |
gnome-extra/cinnamon/cinnamon-3.6.6.ebuild | 227 +++++++++++++++++++++++++++++ |
14 |
2 files changed, 229 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
17 |
index 3b781cf1687..9e4f71e7612 100644 |
18 |
--- a/gnome-extra/cinnamon/Manifest |
19 |
+++ b/gnome-extra/cinnamon/Manifest |
20 |
@@ -3,4 +3,5 @@ DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f |
21 |
DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f |
22 |
DIST cinnamon-3.2.7.tar.gz 2226152 SHA256 69ab4510e4239f577a7acc7ea987d0522caa9796bfaa4a062a5009009ebc5a80 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df WHIRLPOOL fd3a0bbed451ca26844b9063d2a82aef7151a554a33522d5d765c4c871871d7a73ea9f4f5768f6d6135d45fd626fd871dc1cff4bcc5ff2f028694bc792207942 |
23 |
DIST cinnamon-3.4.2.tar.gz 2213346 SHA256 182ed619f92831b83e9bfd89803bbd750c6cb0ee9d097120cdd40eb19d41e302 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 WHIRLPOOL 27a508e693d32c1c297df545028ca3737a15e91de197f52fbb41854b3b1f7aa813e20d6062fb1ece432166004651c4cf17d38551a1e79bc2ea1c1f652d96b76f |
24 |
-DIST cinnamon-3.4.6.tar.gz 2217209 SHA256 857cd68ca4744332e9b20456ae3a0d63ee8a3eacd108ec82dd26b124765a45b4 SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd WHIRLPOOL fcc2d2ea60099e021e6a761d7a519bc773430d128506d38f0d7653d586d79c3019af8c739b2b013dc3faadfbecae8643f5aa87c4137e9da5098e337623620f4f |
25 |
+DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd |
26 |
+DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642 |
27 |
|
28 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..16d2c5e028c |
31 |
--- /dev/null |
32 |
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6.ebuild |
33 |
@@ -0,0 +1,227 @@ |
34 |
+# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+GNOME2_LA_PUNT="yes" |
39 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
40 |
+PYTHON_REQ_USE="xml" |
41 |
+ |
42 |
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
43 |
+ |
44 |
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
45 |
+HOMEPAGE="http://developer.linuxmint.com/" |
46 |
+ |
47 |
+MY_PV="${PV/_p/-UP}" |
48 |
+MY_P="${PN}-${MY_PV}" |
49 |
+ |
50 |
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
51 |
+ |
52 |
+LICENSE="GPL-2+" |
53 |
+SLOT="0" |
54 |
+ |
55 |
+# bluetooth support dropped due to bug #511648 |
56 |
+IUSE="+nls +networkmanager" #+bluetooth |
57 |
+ |
58 |
+# We need *both* python 2.x and 3.x |
59 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
60 |
+ || ( $(python_gen_useflags 'python2*') ) |
61 |
+ || ( $(python_gen_useflags 'python3*') ) |
62 |
+" |
63 |
+ |
64 |
+KEYWORDS="~amd64 ~x86" |
65 |
+ |
66 |
+COMMON_DEPEND="${PYTHON_DEPS} |
67 |
+ app-accessibility/at-spi2-atk:2 |
68 |
+ app-misc/ca-certificates |
69 |
+ dev-libs/dbus-glib |
70 |
+ >=dev-libs/glib-2.35.0:2[dbus] |
71 |
+ >=dev-libs/gobject-introspection-0.10.1:= |
72 |
+ >=dev-libs/json-glib-0.13.2 |
73 |
+ >=dev-libs/libcroco-0.6.2:0.6 |
74 |
+ dev-libs/libxml2:2 |
75 |
+ gnome-base/gconf:2[introspection] |
76 |
+ gnome-base/librsvg |
77 |
+ >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
78 |
+ >=gnome-extra/cinnamon-menus-3.0[introspection] |
79 |
+ >=gnome-extra/cjs-3.2.0 |
80 |
+ >=media-libs/clutter-1.10:1.0[introspection] |
81 |
+ media-libs/cogl:1.0=[introspection] |
82 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.91 |
83 |
+ media-libs/gstreamer:1.0 |
84 |
+ media-libs/gst-plugins-base:1.0 |
85 |
+ net-libs/libsoup:2.4[introspection] |
86 |
+ >=sys-auth/polkit-0.100[introspection] |
87 |
+ x11-libs/gdk-pixbuf:2[introspection] |
88 |
+ >=x11-libs/gtk+-3.9.12:3[introspection] |
89 |
+ x11-libs/pango[introspection] |
90 |
+ >=x11-libs/startup-notification-0.11 |
91 |
+ x11-libs/libX11 |
92 |
+ >=x11-libs/libXfixes-5.0 |
93 |
+ >=x11-wm/muffin-3.2.0[introspection] |
94 |
+ networkmanager? ( |
95 |
+ gnome-base/libgnome-keyring |
96 |
+ >=net-misc/networkmanager-0.8.999:=[introspection] ) |
97 |
+" |
98 |
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
99 |
+ |
100 |
+# Runtime-only deps are probably incomplete and approximate. |
101 |
+# Each block: |
102 |
+# 2. Introspection stuff + dconf needed via imports.gi.* |
103 |
+# 3. gnome-session is needed for gnome-session-quit |
104 |
+# 4. Control shell settings |
105 |
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
106 |
+# user switching with gdm-3.1.x) |
107 |
+# 6. caribou needed for on-screen keyboard |
108 |
+# 7. xdg-utils needed for xdg-open, used by extension tool |
109 |
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
110 |
+# 9. gnome-icon-theme-symbolic needed for various icons |
111 |
+# 10. pygobject needed for menu editor |
112 |
+# 11. nemo - default file manager, tightly integrated with cinnamon |
113 |
+# 12. polkit-gnome - explicitly autostarted by us |
114 |
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
115 |
+RDEPEND="${COMMON_DEPEND} |
116 |
+ >=gnome-base/dconf-0.4.1 |
117 |
+ >=gnome-base/libgnomekbd-2.91.4[introspection] |
118 |
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
119 |
+ |
120 |
+ >=gnome-extra/cinnamon-session-2.4 |
121 |
+ >=gnome-extra/cinnamon-settings-daemon-2.4 |
122 |
+ |
123 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
124 |
+ |
125 |
+ >=app-accessibility/caribou-0.3 |
126 |
+ |
127 |
+ x11-misc/xdg-utils |
128 |
+ x11-libs/xapps[introspection] |
129 |
+ |
130 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
131 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
132 |
+ $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
133 |
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
134 |
+ $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
135 |
+ $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
136 |
+ $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
137 |
+ $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
138 |
+ $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
139 |
+ |
140 |
+ x11-themes/gnome-themes-standard |
141 |
+ x11-themes/adwaita-icon-theme |
142 |
+ |
143 |
+ >=gnome-extra/nemo-2.4 |
144 |
+ >=gnome-extra/cinnamon-control-center-2.4 |
145 |
+ >=gnome-extra/cinnamon-screensaver-2.4 |
146 |
+ |
147 |
+ gnome-extra/polkit-gnome |
148 |
+ |
149 |
+ networkmanager? ( |
150 |
+ gnome-extra/nm-applet |
151 |
+ net-misc/mobile-broadband-provider-info |
152 |
+ sys-libs/timezone-data ) |
153 |
+ nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
154 |
+" |
155 |
+#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
156 |
+ |
157 |
+DEPEND="${COMMON_DEPEND} |
158 |
+ $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
159 |
+ dev-util/gtk-doc |
160 |
+ >=dev-util/intltool-0.4 |
161 |
+ >=sys-devel/gettext-0.17 |
162 |
+ virtual/pkgconfig |
163 |
+ gnome-base/gnome-common |
164 |
+ !!=dev-lang/spidermonkey-1.8.2* |
165 |
+" |
166 |
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
167 |
+# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
168 |
+ |
169 |
+S="${WORKDIR}/Cinnamon-${PV}" |
170 |
+ |
171 |
+pkg_setup() { |
172 |
+ python_setup |
173 |
+} |
174 |
+ |
175 |
+src_prepare() { |
176 |
+ # Fix backgrounds path as cinnamon doesn't provide them |
177 |
+ # https://github.com/linuxmint/Cinnamon/issues/3575 |
178 |
+ eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
179 |
+ |
180 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
181 |
+ eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
182 |
+ |
183 |
+ # Use pkexec instead of gksu (from Arch) |
184 |
+ # https://github.com/linuxmint/Cinnamon/issues/3565 |
185 |
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
186 |
+ |
187 |
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
188 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
189 |
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
190 |
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
191 |
+ |
192 |
+ if ! use networkmanager; then |
193 |
+ rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
194 |
+ fi |
195 |
+ |
196 |
+ # python 2-and-3 shebang fixing craziness |
197 |
+ local p |
198 |
+ python_setup 'python3*' |
199 |
+ for p in $(grep -rl '#!.*python3'); do |
200 |
+ python_fix_shebang "${p}" |
201 |
+ done |
202 |
+ |
203 |
+ python_setup 'python2*' |
204 |
+ for p in $(grep -rl '#!.*python[^3]'); do |
205 |
+ python_fix_shebang "${p}" |
206 |
+ done |
207 |
+ |
208 |
+ eautoreconf |
209 |
+ gnome2_src_prepare |
210 |
+} |
211 |
+ |
212 |
+src_configure() { |
213 |
+ gnome2_src_configure \ |
214 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
215 |
+ --disable-jhbuild-wrapper-script \ |
216 |
+ $(use_enable networkmanager) \ |
217 |
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
218 |
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
219 |
+ --without-bluetooth |
220 |
+} |
221 |
+ |
222 |
+src_install() { |
223 |
+ gnome2_src_install |
224 |
+ python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
225 |
+ |
226 |
+ # Required for gnome-shell on hardened/PaX, bug #398941 |
227 |
+ pax-mark mr "${ED}usr/bin/cinnamon" |
228 |
+ |
229 |
+ # Doesn't exist on Gentoo, causing this to be a dead symlink |
230 |
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
231 |
+ |
232 |
+ # Ensure authentication-agent is started, bug #523958 |
233 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
234 |
+ insinto /etc/xdg/autostart/ |
235 |
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
236 |
+} |
237 |
+ |
238 |
+pkg_postinst() { |
239 |
+ gnome2_pkg_postinst |
240 |
+ |
241 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
242 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
243 |
+ ewarn "To make use of Cinnamon's built-in screen recording utility," |
244 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
245 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
246 |
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
247 |
+ fi |
248 |
+ |
249 |
+ if ! has_version ">=x11-base/xorg-server-1.11"; then |
250 |
+ ewarn "If you use multiple screens, it is highly recommended that you" |
251 |
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
252 |
+ ewarn "pointer barriers which will make it easier to use hot corners." |
253 |
+ fi |
254 |
+ |
255 |
+ if has_version "<x11-drivers/ati-drivers-12"; then |
256 |
+ ewarn "Cinnamon has been reported to show graphical corruption under" |
257 |
+ ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
258 |
+ ewarn "open-source drivers." |
259 |
+ fi |
260 |
+} |