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