1 |
commit: b3f6ae0f8587391e06b6833371c4b6d8165ea746 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Jul 27 03:26:39 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Jul 27 03:52:58 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b3f6ae0f |
7 |
|
8 |
gnome-base/gnome-shell: 3.0.2 → 3.1.3 |
9 |
|
10 |
Bump to gnome-3.1.x version. Warning: this is very nearly untested. Drop |
11 |
patch that was applied upstream and update dependencies. |
12 |
|
13 |
--- |
14 |
.../gnome-shell-3.0.2-user-removed-signals.patch | 33 -------------------- |
15 |
...shell-3.0.2.ebuild => gnome-shell-3.1.3.ebuild} | 27 ++++++--------- |
16 |
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 30 ++++++++--------- |
17 |
3 files changed, 25 insertions(+), 65 deletions(-) |
18 |
|
19 |
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch |
20 |
deleted file mode 100644 |
21 |
index adae1f0..0000000 |
22 |
--- a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch |
23 |
+++ /dev/null |
24 |
@@ -1,33 +0,0 @@ |
25 |
-From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001 |
26 |
-From: Ray Strode <rstrode@××××××.com> |
27 |
-Date: Tue, 24 May 2011 22:15:10 -0400 |
28 |
-Subject: [PATCH] gdm: ignore user-removed signals for untracked users |
29 |
- |
30 |
-If we don't know about a user, we don't care if it goes away, |
31 |
-and we shouldn't try to remove it from the book keeping. |
32 |
- |
33 |
-https://bugzilla.gnome.org/show_bug.cgi?id=647893 |
34 |
---- |
35 |
- src/gdmuser/gdm-user-manager.c | 7 +++++++ |
36 |
- 1 files changed, 7 insertions(+), 0 deletions(-) |
37 |
- |
38 |
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c |
39 |
-index e7ca833..561be32 100644 |
40 |
---- a/src/gdmuser/gdm-user-manager.c |
41 |
-+++ b/src/gdmuser/gdm-user-manager.c |
42 |
-@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy, |
43 |
- |
44 |
- user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path); |
45 |
- |
46 |
-+ if (user == NULL) { |
47 |
-+ g_debug ("GdmUserManager: ignoring untracked user %s", object_path); |
48 |
-+ return; |
49 |
-+ } else { |
50 |
-+ g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path); |
51 |
-+ } |
52 |
-+ |
53 |
- manager->priv->new_users = g_slist_remove (manager->priv->new_users, user); |
54 |
- |
55 |
- remove_user (manager, user); |
56 |
--- |
57 |
-1.7.5.1 |
58 |
\ No newline at end of file |
59 |
|
60 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild |
61 |
similarity index 86% |
62 |
rename from gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild |
63 |
rename to gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild |
64 |
index 14feacb..0c898a4 100644 |
65 |
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild |
66 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild |
67 |
@@ -3,11 +3,12 @@ |
68 |
# $Header: $ |
69 |
|
70 |
EAPI="3" |
71 |
+GNOME_TARBALL_SUFFIX="xz" |
72 |
GCONF_DEBUG="no" |
73 |
GNOME2_LA_PUNT="yes" |
74 |
PYTHON_DEPEND="2:2.5" |
75 |
|
76 |
-inherit eutils gnome2 python |
77 |
+inherit gnome2 python |
78 |
if [[ ${PV} = 9999 ]]; then |
79 |
inherit gnome2-live |
80 |
fi |
81 |
@@ -28,6 +29,7 @@ fi |
82 |
# FIXME: Automagic gnome-bluetooth[introspection] support. |
83 |
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6 |
84 |
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 |
85 |
+# libXfixes-5.0 needed for pointer barriers |
86 |
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 |
87 |
>=dev-libs/gjs-0.7.11 |
88 |
>=dev-libs/gobject-introspection-0.10.1 |
89 |
@@ -36,19 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 |
90 |
>=media-libs/clutter-1.5.15:1.0[introspection] |
91 |
>=gnome-base/gnome-desktop-2.91.2:3 |
92 |
>=gnome-base/gsettings-desktop-schemas-2.91.91 |
93 |
- >=gnome-extra/evolution-data-server-2.32.0 |
94 |
+ >=gnome-extra/evolution-data-server-2.91.6 |
95 |
>=media-libs/gstreamer-0.10.16:0.10 |
96 |
>=media-libs/gst-plugins-base-0.10.16:0.10 |
97 |
>=net-im/telepathy-logger-0.2.4[introspection] |
98 |
- >=net-libs/telepathy-glib-0.13.12[introspection] |
99 |
- >=net-wireless/gnome-bluetooth-2.90.0[introspection] |
100 |
+ >=net-libs/telepathy-glib-0.15.0[introspection] |
101 |
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection] |
102 |
>=sys-auth/polkit-0.100[introspection] |
103 |
>=x11-wm/mutter-3.0.0[introspection] |
104 |
|
105 |
dev-libs/dbus-glib |
106 |
dev-libs/libxml2:2 |
107 |
x11-libs/pango[introspection] |
108 |
- dev-libs/libcroco:0.6 |
109 |
+ >=dev-libs/libcroco-0.6.2:0.6 |
110 |
|
111 |
gnome-base/gconf:2[introspection] |
112 |
gnome-base/gnome-menus |
113 |
@@ -56,9 +58,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 |
114 |
media-libs/libcanberra |
115 |
media-sound/pulseaudio |
116 |
|
117 |
- x11-libs/startup-notification |
118 |
+ >=x11-libs/startup-notification-0.11 |
119 |
x11-libs/libX11 |
120 |
- x11-libs/libXfixes |
121 |
+ >=x11-libs/libXfixes-5.0 |
122 |
x11-apps/mesa-progs" |
123 |
# Runtime-only deps are probably incomplete and approximate. |
124 |
# Each block: |
125 |
@@ -86,9 +88,9 @@ RDEPEND="${COMMON_DEPEND} |
126 |
>=gnome-extra/nm-applet-0.8.999 |
127 |
>=net-misc/networkmanager-0.8.999[introspection] )" |
128 |
DEPEND="${COMMON_DEPEND} |
129 |
- sys-devel/gettext |
130 |
+ >=sys-devel/gettext-0.17 |
131 |
>=dev-util/pkgconfig-0.22 |
132 |
- >=dev-util/intltool-0.26 |
133 |
+ >=dev-util/intltool-0.40 |
134 |
gnome-base/gnome-common |
135 |
!!<dev-lang/spidermonkey-2" |
136 |
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
137 |
@@ -103,13 +105,6 @@ pkg_setup() { |
138 |
--disable-jhbuild-wrapper-script" |
139 |
} |
140 |
|
141 |
-src_prepare() { |
142 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=647893 |
143 |
- # can trigger the crash even with accountsservice-0.6.12 |
144 |
- epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch" |
145 |
- gnome2_src_prepare |
146 |
-} |
147 |
- |
148 |
src_install() { |
149 |
gnome2_src_install |
150 |
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool |
151 |
|
152 |
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
153 |
index 3df02e5..0ad9a8e 100644 |
154 |
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
155 |
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
156 |
@@ -3,11 +3,12 @@ |
157 |
# $Header: $ |
158 |
|
159 |
EAPI="3" |
160 |
+GNOME_TARBALL_SUFFIX="xz" |
161 |
GCONF_DEBUG="no" |
162 |
GNOME2_LA_PUNT="yes" |
163 |
PYTHON_DEPEND="2:2.5" |
164 |
|
165 |
-inherit eutils gnome2 python |
166 |
+inherit gnome2 python |
167 |
if [[ ${PV} = 9999 ]]; then |
168 |
inherit gnome2-live |
169 |
fi |
170 |
@@ -28,27 +29,29 @@ fi |
171 |
# FIXME: Automagic gnome-bluetooth[introspection] support. |
172 |
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6 |
173 |
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 |
174 |
+# libXfixes-5.0 needed for pointer barriers |
175 |
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 |
176 |
>=dev-libs/gjs-0.7.11 |
177 |
>=dev-libs/gobject-introspection-0.10.1 |
178 |
x11-libs/gdk-pixbuf:2[introspection] |
179 |
>=x11-libs/gtk+-3.0.0:3[introspection] |
180 |
- >=media-libs/clutter-1.5.15:1.0[introspection] |
181 |
+ >=media-libs/clutter-1.7.5:1.0[introspection] |
182 |
>=gnome-base/gnome-desktop-2.91.2:3 |
183 |
>=gnome-base/gsettings-desktop-schemas-2.91.91 |
184 |
- >=gnome-extra/evolution-data-server-2.32.0 |
185 |
+ >=gnome-extra/evolution-data-server-2.91.6 |
186 |
>=media-libs/gstreamer-0.10.16:0.10 |
187 |
>=media-libs/gst-plugins-base-0.10.16:0.10 |
188 |
>=net-im/telepathy-logger-0.2.4[introspection] |
189 |
- >=net-libs/telepathy-glib-0.13.12[introspection] |
190 |
- >=net-wireless/gnome-bluetooth-2.90.0[introspection] |
191 |
+ net-libs/libsoup:2.4[introspection] |
192 |
+ >=net-libs/telepathy-glib-0.15.3[introspection] |
193 |
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection] |
194 |
>=sys-auth/polkit-0.100[introspection] |
195 |
>=x11-wm/mutter-3.0.0[introspection] |
196 |
|
197 |
dev-libs/dbus-glib |
198 |
dev-libs/libxml2:2 |
199 |
x11-libs/pango[introspection] |
200 |
- dev-libs/libcroco:0.6 |
201 |
+ >=dev-libs/libcroco-0.6.2:0.6 |
202 |
|
203 |
gnome-base/gconf:2[introspection] |
204 |
gnome-base/gnome-menus |
205 |
@@ -56,9 +59,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2 |
206 |
media-libs/libcanberra |
207 |
media-sound/pulseaudio |
208 |
|
209 |
- x11-libs/startup-notification |
210 |
+ >=x11-libs/startup-notification-0.11 |
211 |
x11-libs/libX11 |
212 |
- x11-libs/libXfixes |
213 |
+ >=x11-libs/libXfixes-5.0 |
214 |
x11-apps/mesa-progs" |
215 |
# Runtime-only deps are probably incomplete and approximate. |
216 |
# Each block: |
217 |
@@ -86,11 +89,11 @@ RDEPEND="${COMMON_DEPEND} |
218 |
>=gnome-extra/nm-applet-0.8.999 |
219 |
>=net-misc/networkmanager-0.8.999[introspection] )" |
220 |
DEPEND="${COMMON_DEPEND} |
221 |
- sys-devel/gettext |
222 |
+ >=sys-devel/gettext-0.17 |
223 |
>=dev-util/pkgconfig-0.22 |
224 |
- >=dev-util/intltool-0.26 |
225 |
+ >=dev-util/intltool-0.40 |
226 |
gnome-base/gnome-common |
227 |
- !dev-lang/spidermonkey" |
228 |
+ !!<dev-lang/spidermonkey-2" |
229 |
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
230 |
# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
231 |
|
232 |
@@ -103,11 +106,6 @@ pkg_setup() { |
233 |
--disable-jhbuild-wrapper-script" |
234 |
} |
235 |
|
236 |
-src_prepare() { |
237 |
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}" |
238 |
- gnome2_src_prepare |
239 |
-} |
240 |
- |
241 |
src_install() { |
242 |
gnome2_src_install |
243 |
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool |