1 |
pacho 13/09/01 08:49:47 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cinnamon-1.8.8.1.ebuild |
5 |
Removed: cinnamon-1.6.7-r1.ebuild |
6 |
Log: |
7 |
Version bump |
8 |
|
9 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.25 gnome-extra/cinnamon/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.25&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.25&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?r1=1.24&r2=1.25 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v |
21 |
retrieving revision 1.24 |
22 |
retrieving revision 1.25 |
23 |
diff -u -r1.24 -r1.25 |
24 |
--- ChangeLog 10 Jun 2013 16:16:41 -0000 1.24 |
25 |
+++ ChangeLog 1 Sep 2013 08:49:47 -0000 1.25 |
26 |
@@ -1,6 +1,17 @@ |
27 |
# ChangeLog for gnome-extra/cinnamon |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.24 2013/06/10 16:16:41 floppym Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.25 2013/09/01 08:49:47 pacho Exp $ |
31 |
+ |
32 |
+*cinnamon-1.8.8.1 (01 Sep 2013) |
33 |
+ |
34 |
+ 01 Sep 2013; Pacho Ramos <pacho@g.o> +cinnamon-1.8.8.1.ebuild, |
35 |
+ +files/background.patch, +files/bluetooth_obex_transfer.patch, |
36 |
+ +files/cinnamon-1.7.8-settings-lspci.patch, |
37 |
+ +files/cinnamon-screensaver.desktop, +files/cinnamon2d-screensaver.desktop, |
38 |
+ +files/fix-control-center-check.patch, +files/idle-dim.patch, |
39 |
+ +files/keyboard_applet.patch, +files/menu_editor.patch, |
40 |
+ +files/remove_GC.patch, +files/screensaver.patch, -cinnamon-1.6.7-r1.ebuild: |
41 |
+ Version bump |
42 |
|
43 |
*cinnamon-1.6.7-r2 (10 Jun 2013) |
44 |
|
45 |
|
46 |
|
47 |
|
48 |
1.1 gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: cinnamon-1.8.8.1.ebuild |
54 |
=================================================================== |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1.ebuild,v 1.1 2013/09/01 08:49:47 pacho Exp $ |
58 |
|
59 |
EAPI="5" |
60 |
GCONF_DEBUG="no" |
61 |
GNOME2_LA_PUNT="yes" |
62 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
63 |
PYTHON_REQ_USE="xml" |
64 |
|
65 |
inherit autotools eutils gnome2 multilib pax-utils python-single-r1 |
66 |
|
67 |
DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
68 |
HOMEPAGE="http://cinnamon.linuxmint.com/" |
69 |
|
70 |
MY_PV="${PV/_p/-UP}" |
71 |
MY_P="${PN}-${MY_PV}" |
72 |
|
73 |
SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz |
74 |
http://dev.gentoo.org/~pacho/gnome/cinnamon-1.8/gnome-3.8.patch" |
75 |
|
76 |
LICENSE="GPL-2+" |
77 |
SLOT="0" |
78 |
IUSE="+bluetooth +networkmanager" |
79 |
KEYWORDS="~amd64 ~x86" |
80 |
|
81 |
# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop |
82 |
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6 |
83 |
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 |
84 |
# libXfixes-5.0 needed for pointer barriers |
85 |
# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome |
86 |
COMMON_DEPEND=" |
87 |
>=dev-libs/glib-2.29.10:2 |
88 |
>=dev-libs/gjs-1.29.18 |
89 |
>=dev-libs/gobject-introspection-0.10.1 |
90 |
x11-libs/gdk-pixbuf:2[introspection] |
91 |
>=x11-libs/gtk+-3.0.0:3[introspection] |
92 |
>=media-libs/clutter-1.7.5:1.0[introspection] |
93 |
media-libs/cogl:1.0=[introspection] |
94 |
app-misc/ca-certificates |
95 |
>=dev-libs/json-glib-0.13.2 |
96 |
>=gnome-base/gnome-desktop-3.0.0:3=[introspection] |
97 |
>=gnome-base/gsettings-desktop-schemas-2.91.91 |
98 |
>=media-libs/gstreamer-0.10.16:0.10 |
99 |
>=media-libs/gst-plugins-base-0.10.16:0.10 |
100 |
net-libs/libsoup:2.4[introspection] |
101 |
>=sys-auth/polkit-0.100[introspection] |
102 |
>=x11-wm/muffin-1.7.4[introspection] |
103 |
|
104 |
dev-libs/dbus-glib |
105 |
dev-libs/libxml2:2 |
106 |
x11-libs/pango[introspection] |
107 |
>=dev-libs/libcroco-0.6.2:0.6 |
108 |
|
109 |
gnome-base/gconf:2[introspection] |
110 |
>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] |
111 |
gnome-base/librsvg |
112 |
media-libs/libcanberra |
113 |
media-sound/pulseaudio |
114 |
|
115 |
>=x11-libs/startup-notification-0.11 |
116 |
x11-libs/libX11 |
117 |
>=x11-libs/libXfixes-5.0 |
118 |
x11-apps/mesa-progs |
119 |
|
120 |
${PYTHON_DEPS} |
121 |
|
122 |
bluetooth? ( >=net-wireless/gnome-bluetooth-3.4:=[introspection] ) |
123 |
networkmanager? ( |
124 |
gnome-base/libgnome-keyring |
125 |
>=net-misc/networkmanager-0.8.999[introspection] ) |
126 |
" |
127 |
# Runtime-only deps are probably incomplete and approximate. |
128 |
# Each block: |
129 |
# 2. Introspection stuff + dconf needed via imports.gi.* |
130 |
# 3. gnome-session is needed for gnome-session-quit |
131 |
# 4. Control shell settings |
132 |
# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
133 |
# user switching with gdm-3.1.x) |
134 |
# 6. caribou needed for on-screen keyboard |
135 |
# 7. xdg-utils needed for xdg-open, used by extension tool |
136 |
# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
137 |
# 9. gnome-icon-theme-symbolic needed for various icons |
138 |
# 10. pygobject needed for menu editor |
139 |
# 11. nemo - default file manager, tightly integrated with cinnamon |
140 |
# 12. timedated or DateTimeMechanism implementation for cinnamon-settings |
141 |
# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
142 |
# =gnome-extra/cinnamon-control-center-1.8* |
143 |
RDEPEND="${COMMON_DEPEND} |
144 |
>=gnome-base/dconf-0.4.1 |
145 |
>=gnome-base/libgnomekbd-2.91.4[introspection] |
146 |
sys-power/upower[introspection] |
147 |
|
148 |
>=gnome-base/gnome-session-3.8 |
149 |
|
150 |
>=gnome-base/gnome-settings-daemon-2.91 |
151 |
|
152 |
>=sys-apps/accountsservice-0.6.14[introspection] |
153 |
|
154 |
>=app-accessibility/caribou-0.3 |
155 |
|
156 |
x11-misc/xdg-utils |
157 |
|
158 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
159 |
dev-python/gconf-python:2 |
160 |
virtual/python-imaging |
161 |
dev-python/lxml |
162 |
|
163 |
x11-themes/gnome-icon-theme-symbolic |
164 |
|
165 |
dev-python/pygobject:3[${PYTHON_USEDEP}] |
166 |
|
167 |
gnome-extra/nemo |
168 |
gnome-extra/gnome-screensaver |
169 |
|
170 |
|| ( |
171 |
app-admin/openrc-settingsd |
172 |
>=sys-apps/systemd-30 |
173 |
<gnome-base/gnome-settings-daemon-3.3.5 ) |
174 |
|
175 |
networkmanager? ( |
176 |
net-misc/mobile-broadband-provider-info |
177 |
sys-libs/timezone-data ) |
178 |
" |
179 |
# gnome-extra/gnome-screensaver due screensaver patch, otherwise it uses |
180 |
# cinnamon-screensaver |
181 |
|
182 |
DEPEND="${COMMON_DEPEND} |
183 |
>=sys-devel/gettext-0.17 |
184 |
virtual/pkgconfig |
185 |
>=dev-util/intltool-0.40 |
186 |
gnome-base/gnome-common |
187 |
!!=dev-lang/spidermonkey-1.8.2* |
188 |
" |
189 |
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
190 |
# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
191 |
|
192 |
S="${WORKDIR}/Cinnamon-${PV}" |
193 |
|
194 |
pkg_setup() { |
195 |
python-single-r1_pkg_setup |
196 |
} |
197 |
|
198 |
src_prepare() { |
199 |
# Fix GNOME 3.8 support |
200 |
epatch "${DISTDIR}/gnome-3.8.patch" |
201 |
epatch "${FILESDIR}/background.patch" |
202 |
epatch "${FILESDIR}/idle-dim.patch" |
203 |
# https://github.com/linuxmint/Cinnamon/issues/1337 |
204 |
epatch "${FILESDIR}/keyboard_applet.patch" |
205 |
epatch "${FILESDIR}/screensaver.patch" |
206 |
epatch "${FILESDIR}/bluetooth_obex_transfer.patch" |
207 |
epatch "${FILESDIR}/remove_GC.patch" |
208 |
epatch "${FILESDIR}/menu_editor.patch" |
209 |
|
210 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
211 |
epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch" |
212 |
|
213 |
# Gentoo uses /usr/libexec |
214 |
sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \ |
215 |
-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed" |
216 |
|
217 |
# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python |
218 |
sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ |
219 |
-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \ |
220 |
-i files/usr/bin/cinnamon-menu-editor \ |
221 |
-i files/usr/bin/cinnamon-settings \ |
222 |
-i files/usr/lib/cinnamon-menu-editor/cme/config.py \ |
223 |
-i files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py \ |
224 |
-i files/usr/lib/cinnamon-settings/cinnamon-settings.py || die "sed 2 failed" |
225 |
if [[ "$(get_libdir)" != lib ]]; then |
226 |
mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed" |
227 |
fi |
228 |
|
229 |
if ! use bluetooth; then |
230 |
rm -rv files/usr/share/cinnamon/applets/bluetooth@××××××××.org || die |
231 |
fi |
232 |
|
233 |
if ! use networkmanager; then |
234 |
rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
235 |
fi |
236 |
|
237 |
eautoreconf |
238 |
gnome2_src_prepare |
239 |
} |
240 |
|
241 |
src_configure() { |
242 |
# Don't error out on warnings |
243 |
gnome2_src_configure \ |
244 |
--disable-jhbuild-wrapper-script \ |
245 |
$(use_with bluetooth) \ |
246 |
--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
247 |
BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
248 |
} |
249 |
|
250 |
src_install() { |
251 |
gnome2_src_install |
252 |
python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{settings,menu-editor} |
253 |
# Fix broken shebangs |
254 |
sed -e "s%#!.*python%#!$(python_get_PYTHON)%" \ |
255 |
-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \ |
256 |
-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die |
257 |
|
258 |
insinto /usr/share/applications |
259 |
doins "${FILESDIR}/cinnamon-screensaver.desktop" |
260 |
doins "${FILESDIR}/cinnamon2d-screensaver.desktop" |
261 |
|
262 |
# Required for gnome-shell on hardened/PaX, bug #398941 |
263 |
pax-mark mr "${ED}usr/bin/cinnamon" |
264 |
|
265 |
# Doesn't exist on Gentoo, causing this to be a dead symlink |
266 |
rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
267 |
} |
268 |
|
269 |
pkg_postinst() { |
270 |
gnome2_pkg_postinst |
271 |
|
272 |
if ! has_version '>=media-libs/gst-plugins-good-0.10.23:0.10' || \ |
273 |
! has_version 'media-plugins/gst-plugins-vp8:0.10'; then |
274 |
ewarn "To make use of Cinnamon's built-in screen recording utility," |
275 |
ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23:0.10" |
276 |
ewarn "and media-plugins/gst-plugins-vp8:0.10, or use dconf-editor to change" |
277 |
ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
278 |
fi |
279 |
|
280 |
if ! has_version ">=x11-base/xorg-server-1.11"; then |
281 |
ewarn "If you use multiple screens, it is highly recommended that you" |
282 |
ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
283 |
ewarn "pointer barriers which will make it easier to use hot corners." |
284 |
fi |
285 |
|
286 |
if has_version "<x11-drivers/ati-drivers-12"; then |
287 |
ewarn "Cinnamon has been reported to show graphical corruption under" |
288 |
ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
289 |
ewarn "open-source drivers." |
290 |
fi |
291 |
|
292 |
if has_version "media-libs/mesa[video_cards_radeon]"; then |
293 |
elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers." |
294 |
elog "Make sure that gallium architecture for r300 and r600 drivers is" |
295 |
elog "selected using 'eselect mesa'." |
296 |
if ! has_version "media-libs/mesa[gallium]"; then |
297 |
ewarn "You will need to emerge media-libs/mesa with USE=gallium." |
298 |
fi |
299 |
fi |
300 |
|
301 |
if has_version "media-libs/mesa[video_cards_intel]"; then |
302 |
elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers." |
303 |
elog "Make sure that classic architecture for i915 and i965 drivers is" |
304 |
elog "selected using 'eselect mesa'." |
305 |
if ! has_version "media-libs/mesa[classic]"; then |
306 |
ewarn "You will need to emerge media-libs/mesa with USE=classic." |
307 |
fi |
308 |
fi |
309 |
} |