1 |
commit: 0243efe68f2add43971c90c9497dd2d04ae9cc8b |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 26 14:27:24 2015 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 15:28:35 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0243efe6 |
7 |
|
8 |
gnome-extra/cinnamon: Version bump, cjs-2.8 needed (#566900 by Marc Andi) |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
gnome-extra/cinnamon/Manifest | 1 + |
13 |
gnome-extra/cinnamon/cinnamon-2.8.6.ebuild | 247 +++++++++++++++++++++++++++++ |
14 |
2 files changed, 248 insertions(+) |
15 |
|
16 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
17 |
index 10a13b8..25f364a 100644 |
18 |
--- a/gnome-extra/cinnamon/Manifest |
19 |
+++ b/gnome-extra/cinnamon/Manifest |
20 |
@@ -1,2 +1,3 @@ |
21 |
DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a |
22 |
DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566 |
23 |
+DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8 |
24 |
|
25 |
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild |
26 |
new file mode 100644 |
27 |
index 0000000..62a193c |
28 |
--- /dev/null |
29 |
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild |
30 |
@@ -0,0 +1,247 @@ |
31 |
+# Copyright 1999-2015 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+# $Id$ |
34 |
+ |
35 |
+EAPI="5" |
36 |
+GCONF_DEBUG="no" |
37 |
+GNOME2_LA_PUNT="yes" |
38 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
39 |
+PYTHON_REQ_USE="xml" |
40 |
+ |
41 |
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
42 |
+ |
43 |
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
44 |
+HOMEPAGE="http://cinnamon.linuxmint.com/" |
45 |
+ |
46 |
+MY_PV="${PV/_p/-UP}" |
47 |
+MY_P="${PN}-${MY_PV}" |
48 |
+ |
49 |
+SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
50 |
+ |
51 |
+LICENSE="GPL-2+" |
52 |
+SLOT="0" |
53 |
+ |
54 |
+# bluetooth support dropped due bug #511648 |
55 |
+IUSE="+nls +networkmanager" #+bluetooth |
56 |
+ |
57 |
+# We need *both* python 2.7 and 3.x |
58 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
59 |
+ python_targets_python2_7 |
60 |
+ || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) |
61 |
+" |
62 |
+ |
63 |
+KEYWORDS="~amd64 ~x86" |
64 |
+ |
65 |
+COMMON_DEPEND=" |
66 |
+ app-accessibility/at-spi2-atk:2 |
67 |
+ app-misc/ca-certificates |
68 |
+ dev-libs/dbus-glib |
69 |
+ >=dev-libs/glib-2.35.0:2[dbus] |
70 |
+ >=dev-libs/gobject-introspection-0.10.1:= |
71 |
+ >=dev-libs/json-glib-0.13.2 |
72 |
+ >=dev-libs/libcroco-0.6.2:0.6 |
73 |
+ dev-libs/libxml2:2 |
74 |
+ gnome-base/gconf:2[introspection] |
75 |
+ gnome-base/librsvg |
76 |
+ >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
77 |
+ gnome-extra/cinnamon-menus[introspection] |
78 |
+ >=gnome-extra/cjs-2.8.0 |
79 |
+ >=media-libs/clutter-1.10:1.0[introspection] |
80 |
+ media-libs/cogl:1.0=[introspection] |
81 |
+ >=gnome-base/gsettings-desktop-schemas-2.91.91 |
82 |
+ media-libs/gstreamer:1.0 |
83 |
+ media-libs/gst-plugins-base:1.0 |
84 |
+ media-sound/pulseaudio:0=[glib] |
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-2.5[introspection] |
94 |
+ ${PYTHON_DEPS} |
95 |
+ networkmanager? ( |
96 |
+ gnome-base/libgnome-keyring |
97 |
+ >=net-misc/networkmanager-0.8.999[introspection] ) |
98 |
+" |
99 |
+#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
100 |
+ |
101 |
+# Runtime-only deps are probably incomplete and approximate. |
102 |
+# Each block: |
103 |
+# 2. Introspection stuff + dconf needed via imports.gi.* |
104 |
+# 3. gnome-session is needed for gnome-session-quit |
105 |
+# 4. Control shell settings |
106 |
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
107 |
+# user switching with gdm-3.1.x) |
108 |
+# 6. caribou needed for on-screen keyboard |
109 |
+# 7. xdg-utils needed for xdg-open, used by extension tool |
110 |
+# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
111 |
+# 9. gnome-icon-theme-symbolic needed for various icons |
112 |
+# 10. pygobject needed for menu editor |
113 |
+# 11. nemo - default file manager, tightly integrated with cinnamon |
114 |
+# 12. polkit-gnome - explicitly autostarted by us |
115 |
+# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
116 |
+RDEPEND="${COMMON_DEPEND} |
117 |
+ >=gnome-base/dconf-0.4.1 |
118 |
+ >=gnome-base/libgnomekbd-2.91.4[introspection] |
119 |
+ || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
120 |
+ |
121 |
+ >=gnome-extra/cinnamon-session-2.4 |
122 |
+ >=gnome-extra/cinnamon-settings-daemon-2.4 |
123 |
+ |
124 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
125 |
+ |
126 |
+ >=app-accessibility/caribou-0.3 |
127 |
+ |
128 |
+ x11-misc/xdg-utils |
129 |
+ |
130 |
+ dev-python/dbus-python[python_targets_python2_7] |
131 |
+ dev-python/gconf-python:2[python_targets_python2_7] |
132 |
+ dev-python/lxml[python_targets_python2_7] |
133 |
+ dev-python/pexpect[python_targets_python2_7] |
134 |
+ dev-python/pycairo[python_targets_python2_7] |
135 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
136 |
+ dev-python/pyinotify[python_targets_python2_7] |
137 |
+ dev-python/pypam[python_targets_python2_7] |
138 |
+ dev-python/pillow[python_targets_python2_7] |
139 |
+ |
140 |
+ x11-themes/gnome-themes-standard[gtk] |
141 |
+ x11-themes/gnome-icon-theme-symbolic |
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 |
+ dev-python/polib[python_targets_python2_7] |
159 |
+ >=sys-devel/gettext-0.17 |
160 |
+ virtual/pkgconfig |
161 |
+ >=dev-util/intltool-0.40 |
162 |
+ gnome-base/gnome-common |
163 |
+ !!=dev-lang/spidermonkey-1.8.2* |
164 |
+" |
165 |
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
166 |
+# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
167 |
+ |
168 |
+S="${WORKDIR}/Cinnamon-${PV}" |
169 |
+ |
170 |
+pkg_setup() { |
171 |
+ python_setup |
172 |
+} |
173 |
+ |
174 |
+src_prepare() { |
175 |
+ # Fix backgrounds path as cinnamon doesn't provide them |
176 |
+ # https://github.com/linuxmint/Cinnamon/issues/3575 |
177 |
+ epatch "${FILESDIR}"/${PN}-2.8.0-background.patch |
178 |
+ |
179 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
180 |
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
181 |
+ |
182 |
+ # Optional NetworkManager, bug #488684 |
183 |
+ epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
184 |
+ |
185 |
+ # Use wheel group instead of sudo (from Fedora/Arch) |
186 |
+ # https://github.com/linuxmint/Cinnamon/issues/3576 |
187 |
+ epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
188 |
+ |
189 |
+ # Fix GNOME 3.14 support (from Fedora/Arch) |
190 |
+ # https://github.com/linuxmint/Cinnamon/issues/3577 |
191 |
+ epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch |
192 |
+ |
193 |
+ # Use pkexec instead of gksu (from Arch) |
194 |
+ # https://github.com/linuxmint/Cinnamon/issues/3565 |
195 |
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
196 |
+ |
197 |
+ # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
198 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
199 |
+ sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
200 |
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
201 |
+ |
202 |
+ if ! use networkmanager; then |
203 |
+ rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
204 |
+ fi |
205 |
+ |
206 |
+ epatch_user |
207 |
+ |
208 |
+ # python 2-and-3 shebang fixing craziness |
209 |
+ local p |
210 |
+ python_setup 'python3*' |
211 |
+ for p in $(grep -rl '#!.*python3'); do |
212 |
+ python_fix_shebang "${p}" |
213 |
+ done |
214 |
+ |
215 |
+ python_setup 'python2*' |
216 |
+ for p in $(grep -rl '#!.*python[^3]'); do |
217 |
+ python_fix_shebang "${p}" |
218 |
+ done |
219 |
+ |
220 |
+ eautoreconf |
221 |
+ gnome2_src_prepare |
222 |
+} |
223 |
+ |
224 |
+src_configure() { |
225 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
226 |
+ # https://github.com/linuxmint/Cinnamon/issues/3843 |
227 |
+ append-ldflags $(no-as-needed) |
228 |
+ |
229 |
+ gnome2_src_configure \ |
230 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
231 |
+ --disable-rpath \ |
232 |
+ --disable-jhbuild-wrapper-script \ |
233 |
+ $(use_enable networkmanager) \ |
234 |
+ --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
235 |
+ BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
236 |
+ --without-bluetooth |
237 |
+} |
238 |
+ |
239 |
+src_install() { |
240 |
+ gnome2_src_install |
241 |
+ python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
242 |
+ |
243 |
+ # Required for gnome-shell on hardened/PaX, bug #398941 |
244 |
+ pax-mark mr "${ED}usr/bin/cinnamon" |
245 |
+ |
246 |
+ # Doesn't exist on Gentoo, causing this to be a dead symlink |
247 |
+ rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
248 |
+ |
249 |
+ # Ensure authentication-agent is started, bug #523958 |
250 |
+ # https://github.com/linuxmint/Cinnamon/issues/3579 |
251 |
+ insinto /etc/xdg/autostart/ |
252 |
+ doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
253 |
+} |
254 |
+ |
255 |
+pkg_postinst() { |
256 |
+ gnome2_pkg_postinst |
257 |
+ |
258 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
259 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
260 |
+ ewarn "To make use of Cinnamon's built-in screen recording utility," |
261 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
262 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
263 |
+ ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
264 |
+ fi |
265 |
+ |
266 |
+ if ! has_version ">=x11-base/xorg-server-1.11"; then |
267 |
+ ewarn "If you use multiple screens, it is highly recommended that you" |
268 |
+ ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
269 |
+ ewarn "pointer barriers which will make it easier to use hot corners." |
270 |
+ fi |
271 |
+ |
272 |
+ if has_version "<x11-drivers/ati-drivers-12"; then |
273 |
+ ewarn "Cinnamon has been reported to show graphical corruption under" |
274 |
+ ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
275 |
+ ewarn "open-source drivers." |
276 |
+ fi |
277 |
+} |