* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-07-27 5:51 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-07-27 5:51 UTC (permalink / raw
To: gentoo-commits
commit: b3f6ae0f8587391e06b6833371c4b6d8165ea746
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 03:26:39 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 27 03:52:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b3f6ae0f
gnome-base/gnome-shell: 3.0.2 → 3.1.3
Bump to gnome-3.1.x version. Warning: this is very nearly untested. Drop
patch that was applied upstream and update dependencies.
---
.../gnome-shell-3.0.2-user-removed-signals.patch | 33 --------------------
...shell-3.0.2.ebuild => gnome-shell-3.1.3.ebuild} | 27 ++++++---------
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 30 ++++++++---------
3 files changed, 25 insertions(+), 65 deletions(-)
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
deleted file mode 100644
index adae1f0..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 24 May 2011 22:15:10 -0400
-Subject: [PATCH] gdm: ignore user-removed signals for untracked users
-
-If we don't know about a user, we don't care if it goes away,
-and we shouldn't try to remove it from the book keeping.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647893
----
- src/gdmuser/gdm-user-manager.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index e7ca833..561be32 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy,
-
- user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path);
-
-+ if (user == NULL) {
-+ g_debug ("GdmUserManager: ignoring untracked user %s", object_path);
-+ return;
-+ } else {
-+ g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path);
-+ }
-+
- manager->priv->new_users = g_slist_remove (manager->priv->new_users, user);
-
- remove_user (manager, user);
---
-1.7.5.1
\ No newline at end of file
diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
similarity index 86%
rename from gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
index 14feacb..0c898a4 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
@@ -3,11 +3,12 @@
# $Header: $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit eutils gnome2 python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -28,6 +29,7 @@ fi
# FIXME: Automagic gnome-bluetooth[introspection] support.
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
@@ -36,19 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=media-libs/clutter-1.5.15:1.0[introspection]
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
- >=gnome-extra/evolution-data-server-2.32.0
+ >=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.13.12[introspection]
- >=net-wireless/gnome-bluetooth-2.90.0[introspection]
+ >=net-libs/telepathy-glib-0.15.0[introspection]
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
dev-libs/dbus-glib
dev-libs/libxml2:2
x11-libs/pango[introspection]
- dev-libs/libcroco:0.6
+ >=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
gnome-base/gnome-menus
@@ -56,9 +58,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
media-libs/libcanberra
media-sound/pulseaudio
- x11-libs/startup-notification
+ >=x11-libs/startup-notification-0.11
x11-libs/libX11
- x11-libs/libXfixes
+ >=x11-libs/libXfixes-5.0
x11-apps/mesa-progs"
# Runtime-only deps are probably incomplete and approximate.
# Each block:
@@ -86,9 +88,9 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-extra/nm-applet-0.8.999
>=net-misc/networkmanager-0.8.999[introspection] )"
DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
+ >=dev-util/intltool-0.40
gnome-base/gnome-common
!!<dev-lang/spidermonkey-2"
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
@@ -103,13 +105,6 @@ pkg_setup() {
--disable-jhbuild-wrapper-script"
}
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=647893
- # can trigger the crash even with accountsservice-0.6.12
- epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch"
- gnome2_src_prepare
-}
-
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3df02e5..0ad9a8e 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -3,11 +3,12 @@
# $Header: $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit eutils gnome2 python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -28,27 +29,29 @@ fi
# FIXME: Automagic gnome-bluetooth[introspection] support.
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
x11-libs/gdk-pixbuf:2[introspection]
>=x11-libs/gtk+-3.0.0:3[introspection]
- >=media-libs/clutter-1.5.15:1.0[introspection]
+ >=media-libs/clutter-1.7.5:1.0[introspection]
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
- >=gnome-extra/evolution-data-server-2.32.0
+ >=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.13.12[introspection]
- >=net-wireless/gnome-bluetooth-2.90.0[introspection]
+ net-libs/libsoup:2.4[introspection]
+ >=net-libs/telepathy-glib-0.15.3[introspection]
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
dev-libs/dbus-glib
dev-libs/libxml2:2
x11-libs/pango[introspection]
- dev-libs/libcroco:0.6
+ >=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
gnome-base/gnome-menus
@@ -56,9 +59,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
media-libs/libcanberra
media-sound/pulseaudio
- x11-libs/startup-notification
+ >=x11-libs/startup-notification-0.11
x11-libs/libX11
- x11-libs/libXfixes
+ >=x11-libs/libXfixes-5.0
x11-apps/mesa-progs"
# Runtime-only deps are probably incomplete and approximate.
# Each block:
@@ -86,11 +89,11 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-extra/nm-applet-0.8.999
>=net-misc/networkmanager-0.8.999[introspection] )"
DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
+ >=dev-util/intltool-0.40
gnome-base/gnome-common
- !dev-lang/spidermonkey"
+ !!<dev-lang/spidermonkey-2"
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
# https://bugs.gentoo.org/show_bug.cgi?id=360413
@@ -103,11 +106,6 @@ pkg_setup() {
--disable-jhbuild-wrapper-script"
}
-src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}"
- gnome2_src_prepare
-}
-
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-08-30 21:55 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-08-30 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 6716ca4b40d079bd337c4b3ee629ff6c0c856833
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 21:27:04 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 21:53:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6716ca4b
gnome-base/gnome-shell: 3.1.4 → 3.1.90
Version bump with a massive number of changes. Two important ones:
* networkmanager is now obligatory, and gnome-shell now provides its own
equivalent of nm-applet;
* the extension system has been completely overhauled. All assumptions
about packaging shell extensions in Gentoo will need to be revisited.
Also, old shell extensions appear to cause 3.1.90 to crash at login
or shortly thereafter. Disabling them is not enough; they must be
physically removed from the system.
---
.../files/gnome-shell-3.1.90-default-avatar.patch | 24 ++++++
.../files/gnome-shell-3.1.90-folks-crash.patch | 34 +++++++++
.../files/gnome-shell-3.1.90-gdm-batch.patch | 23 ++++++
.../files/gnome-shell-3.1.90-gi-1.29.17.patch | 75 ++++++++++++++++++++
.../gnome-shell-3.1.90-telepathy-status.patch | 43 +++++++++++
...hell-3.1.4.ebuild => gnome-shell-3.1.90.ebuild} | 37 ++++++++--
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 27 +++++--
7 files changed, 249 insertions(+), 14 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
new file mode 100644
index 0000000..f5c3a15
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
@@ -0,0 +1,24 @@
+From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Mon, 29 Aug 2011 21:41:10 +0000
+Subject: userMenu: Don't show the default avatar over a newly selected one
+
+When we replace the default avatar image with a real image, we need
+to remove the default avatar image.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657657
+---
+diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
+index 8d71ce2..33c3315 100644
+--- a/js/ui/userMenu.js
++++ b/js/ui/userMenu.js
+@@ -226,6 +226,7 @@ IMStatusChooserItem.prototype = {
+
+ _setIconFromFile: function(iconFile) {
+ this._iconBin.set_style('background-image: url("' + iconFile + '");');
++ this._iconBin.child = null;
+ },
+
+ _setIconFromName: function(iconName) {
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
new file mode 100644
index 0000000..695e5b9
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
@@ -0,0 +1,34 @@
+From c2c4c26f72b900d0a95c5daca64c46cb7e281f33 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Tue, 30 Aug 2011 09:13:35 +0000
+Subject: Don't crash displaying contacts with no alias
+
+If a folks individual has no alias we crash when passing in NULL
+to strstr(). Fix this by checking for non-null first.
+---
+diff --git a/src/shell-contact-system.c b/src/shell-contact-system.c
+index 971a164..9ac79de 100644
+--- a/src/shell-contact-system.c
++++ b/src/shell-contact-system.c
+@@ -134,11 +134,14 @@ do_match (ShellContactSystem *self,
+ const char *p;
+
+ /* Match on alias */
+- p = strstr (alias, term);
+- if (p == alias)
+- have_alias_prefix = TRUE;
+- else if (p != NULL)
+- have_alias_substring = TRUE;
++ if (alias != NULL)
++ {
++ p = strstr (alias, term);
++ if (p == alias)
++ have_alias_prefix = TRUE;
++ else if (p != NULL)
++ have_alias_substring = TRUE;
++ }
+
+ /* Match on one or more IM addresses */
+ im_addrs_iter = gee_iterable_iterator (GEE_ITERABLE (im_addrs));
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
new file mode 100644
index 0000000..8df0e37
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
@@ -0,0 +1,23 @@
+From 612b9e9faf014f9b9ff8fbf58176769583f69d5f Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 30 Aug 2011 11:52:25 +0000
+Subject: Fix batch import for loginDialog
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
+---
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index 36799e3..3ba8aca 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
+@@ -32,7 +32,7 @@ const Shell = imports.gi.Shell;
+ const St = imports.gi.St;
+ const GdmGreeter = imports.gi.GdmGreeter;
+
+-const Batch = imports.misc.batch;
++const Batch = imports.gdm.batch;
+ const Lightbox = imports.ui.lightbox;
+ const Main = imports.ui.main;
+ const ModalDialog = imports.ui.modalDialog;
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
new file mode 100644
index 0000000..7a0505d
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
@@ -0,0 +1,75 @@
+From 14e8cba2b184b16d0dbd9beb929860a1e1155709 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 30 Aug 2011 16:07:11 +0000
+Subject: Add some (element-type) annotations to appease g-i master
+
+---
+diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
+index 56502e3..168bc79 100644
+--- a/src/gvc/gvc-mixer-card.c
++++ b/src/gvc/gvc-mixer-card.c
+@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
+ return TRUE;
+ }
+
++/**
++ * gvc_mixer_card_get_profiles:
++ *
++ * Return value: (transfer none) (element-type GvcMixerCardProfile):
++ */
+ const GList *
+ gvc_mixer_card_get_profiles (GvcMixerCard *card)
+ {
+@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
+ return -1;
+ }
+
++/**
++ * gvc_mixer_card_set_profiles:
++ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
++ */
+ gboolean
+ gvc_mixer_card_set_profiles (GvcMixerCard *card,
+ GList *profiles)
+diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
+index 78de6b3..f35954a 100644
+--- a/src/gvc/gvc-mixer-stream.c
++++ b/src/gvc/gvc-mixer-stream.c
+@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
+ return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
+ }
+
++/**
++ * gvc_mixer_stream_get_ports:
++ *
++ * Return value: (transfer none) (element-type GvcMixerStreamPort):
++ */
+ const GList *
+ gvc_mixer_stream_get_ports (GvcMixerStream *stream)
+ {
+@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
+ return -1;
+ }
+
++/**
++ * gvc_mixer_stream_set_ports:
++ * @ports: (transfer full) (element-type GvcMixerStreamPort):
++ */
+ gboolean
+ gvc_mixer_stream_set_ports (GvcMixerStream *stream,
+ GList *ports)
+diff --git a/src/shell-app.c b/src/shell-app.c
+index 75444b6..0455f42 100644
+--- a/src/shell-app.c
++++ b/src/shell-app.c
+@@ -1051,7 +1051,7 @@ _gather_pid_callback (GDesktopAppInfo *gapp,
+ /**
+ * shell_app_launch:
+ * @timestamp: Event timestamp, or 0 for current event timestamp
+- * @uris: List of uris to pass to application
++ * @uris: (element-type utf8): List of uris to pass to application
+ * @workspace: Start on this workspace, or -1 for default
+ * @startup_id: (out): Returned startup notification ID, or %NULL if none
+ * @error: A #GError
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
new file mode 100644
index 0000000..4bd3a1c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
@@ -0,0 +1,43 @@
+From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Tue, 30 Aug 2011 12:35:20 +0000
+Subject: don't translate IM status
+
+They are well-known strings defined in the Telepathy spec and so shouldn't be
+translated.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657696
+---
+diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
+index 33c3315..115bcf7 100644
+--- a/js/ui/userMenu.js
++++ b/js/ui/userMenu.js
+@@ -250,19 +250,19 @@ IMStatusChooserItem.prototype = {
+ _statusForPresence: function(presence) {
+ switch(presence) {
+ case Tp.ConnectionPresenceType.AVAILABLE:
+- return _("Available");
++ return 'available';
+ case Tp.ConnectionPresenceType.BUSY:
+- return _("Busy");
++ return 'busy';
+ case Tp.ConnectionPresenceType.OFFLINE:
+- return _("Unavailable");
++ return 'offline';
+ case Tp.ConnectionPresenceType.HIDDEN:
+- return _("Hidden");
++ return 'hidden';
+ case Tp.ConnectionPresenceType.AWAY:
+- return _("Away");
++ return 'away';
+ case Tp.ConnectionPresenceType.EXTENDED_AWAY:
+- return _("Idle");
++ return 'xa';
+ default:
+- return _("Unknown");
++ return 'unknown';
+ }
+ },
+
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
similarity index 74%
rename from gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 76307f7..95594a2 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+nm-applet"
+IUSE=""
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -36,14 +36,17 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
x11-libs/gdk-pixbuf:2[introspection]
>=x11-libs/gtk+-3.0.0:3[introspection]
>=media-libs/clutter-1.7.5:1.0[introspection]
+ >=dev-libs/folks-0.5.2
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
+ gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
net-libs/libsoup:2.4[introspection]
- >=net-libs/telepathy-glib-0.15.3[introspection]
+ >=net-libs/telepathy-glib-0.15.5[introspection]
+ >=net-misc/networkmanager-0.8.999[introspection]
>=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
@@ -54,7 +57,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
- gnome-base/gnome-menus
+ >=gnome-base/gnome-menus-2.29.10:3[introspection]
gnome-base/librsvg
media-libs/libcanberra
media-sound/pulseaudio
@@ -70,7 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
# 3. gnome-session is needed for gnome-session-quit
# 4. Control shell settings
# 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
+# 6. caribou needed for on-screen keyboard
RDEPEND="${COMMON_DEPEND}
>=sys-auth/polkit-0.101[introspection]
@@ -85,9 +88,11 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/accountsservice-0.6.12
- nm-applet? (
- >=gnome-extra/nm-applet-0.8.999
- >=net-misc/networkmanager-0.8.999[introspection] )"
+ >=app-accessibility/caribou-0.3
+
+ !!<=gnome-extra/gnome-shell-extensions-3.1.4"
+# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
+# Disabling the extensions is not enough; they must be physically uninstalled.
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
@@ -104,6 +109,24 @@ pkg_setup() {
--enable-compile-warnings=maximum
--disable-schemas-compile
--disable-jhbuild-wrapper-script"
+
+ ewarn
+ ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
+ ewarn "old shell extensions *installed*, whether systemwide or in a user's"
+ ewarn "home directory."
+ ewarn "Disabling the extensions is not enough. You should uninstall the"
+ ewarn "extensions before upgrading gnome-shell to ${PV}."
+ ewarn
+}
+
+src_prepare() {
+ # Useful patches from upstream git, will be in next release
+ epatch "${FILESDIR}/${P}-default-avatar.patch"
+ epatch "${FILESDIR}/${P}-folks-crash.patch"
+ epatch "${FILESDIR}/${P}-gdm-batch.patch"
+ epatch "${FILESDIR}/${P}-telepathy-status.patch"
+ # gobject-introspection-1.29.17 compat, will be in next release
+ epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
}
src_install() {
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 76307f7..2cdf2d0 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+nm-applet"
+IUSE=""
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -36,14 +36,17 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
x11-libs/gdk-pixbuf:2[introspection]
>=x11-libs/gtk+-3.0.0:3[introspection]
>=media-libs/clutter-1.7.5:1.0[introspection]
+ >=dev-libs/folks-0.5.2
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
+ gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
net-libs/libsoup:2.4[introspection]
- >=net-libs/telepathy-glib-0.15.3[introspection]
+ >=net-libs/telepathy-glib-0.15.5[introspection]
+ >=net-misc/networkmanager-0.8.999[introspection]
>=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
@@ -54,7 +57,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
- gnome-base/gnome-menus
+ >=gnome-base/gnome-menus-2.29.10:3[introspection]
gnome-base/librsvg
media-libs/libcanberra
media-sound/pulseaudio
@@ -70,7 +73,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
# 3. gnome-session is needed for gnome-session-quit
# 4. Control shell settings
# 5. accountsservice is needed for GdmUserManager
-# 6. nm-applet is needed for auth prompting and the wireless connection dialog
+# 6. caribou needed for on-screen keyboard
RDEPEND="${COMMON_DEPEND}
>=sys-auth/polkit-0.101[introspection]
@@ -85,9 +88,11 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/accountsservice-0.6.12
- nm-applet? (
- >=gnome-extra/nm-applet-0.8.999
- >=net-misc/networkmanager-0.8.999[introspection] )"
+ >=app-accessibility/caribou-0.3
+
+ !!<=gnome-extra/gnome-shell-extensions-3.1.4"
+# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
+# Disabling the extensions is not enough; they must be physically uninstalled.
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
@@ -104,6 +109,14 @@ pkg_setup() {
--enable-compile-warnings=maximum
--disable-schemas-compile
--disable-jhbuild-wrapper-script"
+
+ ewarn
+ ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
+ ewarn "old shell extensions *installed*, whether systemwide or in a user's"
+ ewarn "home directory."
+ ewarn "Disabling the extensions is not enough. You should uninstall the"
+ ewarn "extensions before upgrading gnome-shell to ${PV}."
+ ewarn
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-08-31 11:45 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-08-31 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 5d56018a12cccc94b203ae5d82f6398b4fc84165
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Aug 31 08:35:06 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Aug 31 11:44:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5d56018a
gnome-base/gnome-shell: restore 3.1.4
Restore 3.1.4 (with a patch for gobject-introspection-1.29.17 compat)
since 3.1.90 appears to be somewhat unstable. The instability does not
appear to depend on extensions after all, so remove the blocker and
warnings.
---
.../files/gnome-shell-3.1.4-gi-1.29.17.patch | 82 ++++++++++++++++++++
...hell-3.1.90.ebuild => gnome-shell-3.1.4.ebuild} | 35 ++------
gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild | 15 +---
3 files changed, 93 insertions(+), 39 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
new file mode 100644
index 0000000..6aebc44
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.4-gi-1.29.17.patch
@@ -0,0 +1,82 @@
+From 92d0cce50c9baac2a24d840b1db39f2627a02480 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 30 Aug 2011 12:07:11 -0400
+Subject: [PATCH] Add some (element-type) annotations to appease g-i master
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: backport to 3.1.4]
+---
+ src/gvc/gvc-mixer-card.c | 9 +++++++++
+ src/gvc/gvc-mixer-stream.c | 9 +++++++++
+ src/shell-app-system.c | 2 +-
+ 3 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
+index 56502e3..168bc79 100644
+--- a/src/gvc/gvc-mixer-card.c
++++ b/src/gvc/gvc-mixer-card.c
+@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
+ return TRUE;
+ }
+
++/**
++ * gvc_mixer_card_get_profiles:
++ *
++ * Return value: (transfer none) (element-type GvcMixerCardProfile):
++ */
+ const GList *
+ gvc_mixer_card_get_profiles (GvcMixerCard *card)
+ {
+@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
+ return -1;
+ }
+
++/**
++ * gvc_mixer_card_set_profiles:
++ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
++ */
+ gboolean
+ gvc_mixer_card_set_profiles (GvcMixerCard *card,
+ GList *profiles)
+diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
+index 78de6b3..f35954a 100644
+--- a/src/gvc/gvc-mixer-stream.c
++++ b/src/gvc/gvc-mixer-stream.c
+@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
+ return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
+ }
+
++/**
++ * gvc_mixer_stream_get_ports:
++ *
++ * Return value: (transfer none) (element-type GvcMixerStreamPort):
++ */
+ const GList *
+ gvc_mixer_stream_get_ports (GvcMixerStream *stream)
+ {
+@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
+ return -1;
+ }
+
++/**
++ * gvc_mixer_stream_set_ports:
++ * @ports: (transfer full) (element-type GvcMixerStreamPort):
++ */
+ gboolean
+ gvc_mixer_stream_set_ports (GvcMixerStream *stream,
+ GList *ports)
+diff --git a/src/shell-app-system.c b/src/shell-app-system.c
+index b52625a..a578e69 100644
+--- a/src/shell-app-system.c
++++ b/src/shell-app-system.c
+@@ -1399,7 +1399,7 @@ _gather_pid_callback (GDesktopAppInfo *gapp,
+ /**
+ * shell_app_info_launch_full:
+ * @timestamp: Event timestamp, or 0 for current event timestamp
+- * @uris: List of uris to pass to application
++ * @uris: (element-type utf8): List of uris to pass to application
+ * @workspace: Start on this workspace, or -1 for default
+ * @startup_id: (out): Returned startup notification ID, or %NULL if none
+ * @error: A #GError
+--
+1.7.6.1
+
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
similarity index 75%
copy from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
copy to gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
index 95594a2..d0c4ba3 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
+IUSE="+nm-applet"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -36,17 +36,14 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
x11-libs/gdk-pixbuf:2[introspection]
>=x11-libs/gtk+-3.0.0:3[introspection]
>=media-libs/clutter-1.7.5:1.0[introspection]
- >=dev-libs/folks-0.5.2
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
- gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
net-libs/libsoup:2.4[introspection]
- >=net-libs/telepathy-glib-0.15.5[introspection]
- >=net-misc/networkmanager-0.8.999[introspection]
+ >=net-libs/telepathy-glib-0.15.3[introspection]
>=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
@@ -57,7 +54,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
- >=gnome-base/gnome-menus-2.29.10:3[introspection]
+ gnome-base/gnome-menus
gnome-base/librsvg
media-libs/libcanberra
media-sound/pulseaudio
@@ -73,7 +70,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
# 3. gnome-session is needed for gnome-session-quit
# 4. Control shell settings
# 5. accountsservice is needed for GdmUserManager
-# 6. caribou needed for on-screen keyboard
+# 6. nm-applet is needed for auth prompting and the wireless connection dialog
RDEPEND="${COMMON_DEPEND}
>=sys-auth/polkit-0.101[introspection]
@@ -88,11 +85,9 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/accountsservice-0.6.12
- >=app-accessibility/caribou-0.3
-
- !!<=gnome-extra/gnome-shell-extensions-3.1.4"
-# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
-# Disabling the extensions is not enough; they must be physically uninstalled.
+ nm-applet? (
+ >=gnome-extra/nm-applet-0.8.999
+ >=net-misc/networkmanager-0.8.999[introspection] )"
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
@@ -109,23 +104,11 @@ pkg_setup() {
--enable-compile-warnings=maximum
--disable-schemas-compile
--disable-jhbuild-wrapper-script"
-
- ewarn
- ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
- ewarn "old shell extensions *installed*, whether systemwide or in a user's"
- ewarn "home directory."
- ewarn "Disabling the extensions is not enough. You should uninstall the"
- ewarn "extensions before upgrading gnome-shell to ${PV}."
- ewarn
}
src_prepare() {
- # Useful patches from upstream git, will be in next release
- epatch "${FILESDIR}/${P}-default-avatar.patch"
- epatch "${FILESDIR}/${P}-folks-crash.patch"
- epatch "${FILESDIR}/${P}-gdm-batch.patch"
- epatch "${FILESDIR}/${P}-telepathy-status.patch"
- # gobject-introspection-1.29.17 compat, will be in next release
+ gnome2_src_prepare
+ # gobject-introspection-1.29.17 compat, backported to gnome-shell-3.1.4
epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
index 95594a2..258babe 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
@@ -88,11 +88,7 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/accountsservice-0.6.12
- >=app-accessibility/caribou-0.3
-
- !!<=gnome-extra/gnome-shell-extensions-3.1.4"
-# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
-# Disabling the extensions is not enough; they must be physically uninstalled.
+ >=app-accessibility/caribou-0.3"
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
@@ -109,17 +105,10 @@ pkg_setup() {
--enable-compile-warnings=maximum
--disable-schemas-compile
--disable-jhbuild-wrapper-script"
-
- ewarn
- ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
- ewarn "old shell extensions *installed*, whether systemwide or in a user's"
- ewarn "home directory."
- ewarn "Disabling the extensions is not enough. You should uninstall the"
- ewarn "extensions before upgrading gnome-shell to ${PV}."
- ewarn
}
src_prepare() {
+ gnome2_src_prepare
# Useful patches from upstream git, will be in next release
epatch "${FILESDIR}/${P}-default-avatar.patch"
epatch "${FILESDIR}/${P}-folks-crash.patch"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-09-02 5:15 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-02 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 935f17870e4dd3e3c5c8c33f76217b90825b9045
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Sep 2 05:13:40 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Sep 2 05:13:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=935f1787
gnome-base/gnome-shell: 3.1.90 → 3.1.90.1
Version bump. Also, remove the incorrect extension warnings from the
live ebuild.
---
.../files/gnome-shell-3.1.90-default-avatar.patch | 24 ------
.../files/gnome-shell-3.1.90-folks-crash.patch | 34 ---------
.../files/gnome-shell-3.1.90-gdm-batch.patch | 23 ------
.../files/gnome-shell-3.1.90-gi-1.29.17.patch | 75 --------------------
.../gnome-shell-3.1.90-telepathy-status.patch | 43 -----------
.../gnome-shell-3.1.90.1-telepathy-gettext.patch | 40 +++++++++++
...gnome-shell-3.1.90.1-workspaces-lazy-init.patch | 52 ++++++++++++++
...l-3.1.90.ebuild => gnome-shell-3.1.90.1.ebuild} | 8 +--
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 14 +----
9 files changed, 95 insertions(+), 218 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
deleted file mode 100644
index f5c3a15..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Mon, 29 Aug 2011 21:41:10 +0000
-Subject: userMenu: Don't show the default avatar over a newly selected one
-
-When we replace the default avatar image with a real image, we need
-to remove the default avatar image.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657657
----
-diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
-index 8d71ce2..33c3315 100644
---- a/js/ui/userMenu.js
-+++ b/js/ui/userMenu.js
-@@ -226,6 +226,7 @@ IMStatusChooserItem.prototype = {
-
- _setIconFromFile: function(iconFile) {
- this._iconBin.set_style('background-image: url("' + iconFile + '");');
-+ this._iconBin.child = null;
- },
-
- _setIconFromName: function(iconName) {
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
deleted file mode 100644
index 695e5b9..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c2c4c26f72b900d0a95c5daca64c46cb7e281f33 Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Tue, 30 Aug 2011 09:13:35 +0000
-Subject: Don't crash displaying contacts with no alias
-
-If a folks individual has no alias we crash when passing in NULL
-to strstr(). Fix this by checking for non-null first.
----
-diff --git a/src/shell-contact-system.c b/src/shell-contact-system.c
-index 971a164..9ac79de 100644
---- a/src/shell-contact-system.c
-+++ b/src/shell-contact-system.c
-@@ -134,11 +134,14 @@ do_match (ShellContactSystem *self,
- const char *p;
-
- /* Match on alias */
-- p = strstr (alias, term);
-- if (p == alias)
-- have_alias_prefix = TRUE;
-- else if (p != NULL)
-- have_alias_substring = TRUE;
-+ if (alias != NULL)
-+ {
-+ p = strstr (alias, term);
-+ if (p == alias)
-+ have_alias_prefix = TRUE;
-+ else if (p != NULL)
-+ have_alias_substring = TRUE;
-+ }
-
- /* Match on one or more IM addresses */
- im_addrs_iter = gee_iterable_iterator (GEE_ITERABLE (im_addrs));
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
deleted file mode 100644
index 8df0e37..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 612b9e9faf014f9b9ff8fbf58176769583f69d5f Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Tue, 30 Aug 2011 11:52:25 +0000
-Subject: Fix batch import for loginDialog
-
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
----
-diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
-index 36799e3..3ba8aca 100644
---- a/js/gdm/loginDialog.js
-+++ b/js/gdm/loginDialog.js
-@@ -32,7 +32,7 @@ const Shell = imports.gi.Shell;
- const St = imports.gi.St;
- const GdmGreeter = imports.gi.GdmGreeter;
-
--const Batch = imports.misc.batch;
-+const Batch = imports.gdm.batch;
- const Lightbox = imports.ui.lightbox;
- const Main = imports.ui.main;
- const ModalDialog = imports.ui.modalDialog;
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
deleted file mode 100644
index 7a0505d..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 14e8cba2b184b16d0dbd9beb929860a1e1155709 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Tue, 30 Aug 2011 16:07:11 +0000
-Subject: Add some (element-type) annotations to appease g-i master
-
----
-diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c
-index 56502e3..168bc79 100644
---- a/src/gvc/gvc-mixer-card.c
-+++ b/src/gvc/gvc-mixer-card.c
-@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card,
- return TRUE;
- }
-
-+/**
-+ * gvc_mixer_card_get_profiles:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerCardProfile):
-+ */
- const GList *
- gvc_mixer_card_get_profiles (GvcMixerCard *card)
- {
-@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a,
- return -1;
- }
-
-+/**
-+ * gvc_mixer_card_set_profiles:
-+ * @profiles: (transfer full) (element-type GvcMixerCardProfile):
-+ */
- gboolean
- gvc_mixer_card_set_profiles (GvcMixerCard *card,
- GList *profiles)
-diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c
-index 78de6b3..f35954a 100644
---- a/src/gvc/gvc-mixer-stream.c
-+++ b/src/gvc/gvc-mixer-stream.c
-@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *stream,
- return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port);
- }
-
-+/**
-+ * gvc_mixer_stream_get_ports:
-+ *
-+ * Return value: (transfer none) (element-type GvcMixerStreamPort):
-+ */
- const GList *
- gvc_mixer_stream_get_ports (GvcMixerStream *stream)
- {
-@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a,
- return -1;
- }
-
-+/**
-+ * gvc_mixer_stream_set_ports:
-+ * @ports: (transfer full) (element-type GvcMixerStreamPort):
-+ */
- gboolean
- gvc_mixer_stream_set_ports (GvcMixerStream *stream,
- GList *ports)
-diff --git a/src/shell-app.c b/src/shell-app.c
-index 75444b6..0455f42 100644
---- a/src/shell-app.c
-+++ b/src/shell-app.c
-@@ -1051,7 +1051,7 @@ _gather_pid_callback (GDesktopAppInfo *gapp,
- /**
- * shell_app_launch:
- * @timestamp: Event timestamp, or 0 for current event timestamp
-- * @uris: List of uris to pass to application
-+ * @uris: (element-type utf8): List of uris to pass to application
- * @workspace: Start on this workspace, or -1 for default
- * @startup_id: (out): Returned startup notification ID, or %NULL if none
- * @error: A #GError
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
deleted file mode 100644
index 4bd3a1c..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Tue, 30 Aug 2011 12:35:20 +0000
-Subject: don't translate IM status
-
-They are well-known strings defined in the Telepathy spec and so shouldn't be
-translated.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657696
----
-diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
-index 33c3315..115bcf7 100644
---- a/js/ui/userMenu.js
-+++ b/js/ui/userMenu.js
-@@ -250,19 +250,19 @@ IMStatusChooserItem.prototype = {
- _statusForPresence: function(presence) {
- switch(presence) {
- case Tp.ConnectionPresenceType.AVAILABLE:
-- return _("Available");
-+ return 'available';
- case Tp.ConnectionPresenceType.BUSY:
-- return _("Busy");
-+ return 'busy';
- case Tp.ConnectionPresenceType.OFFLINE:
-- return _("Unavailable");
-+ return 'offline';
- case Tp.ConnectionPresenceType.HIDDEN:
-- return _("Hidden");
-+ return 'hidden';
- case Tp.ConnectionPresenceType.AWAY:
-- return _("Away");
-+ return 'away';
- case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-- return _("Idle");
-+ return 'xa';
- default:
-- return _("Unknown");
-+ return 'unknown';
- }
- },
-
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
new file mode 100644
index 0000000..16f0de4
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
@@ -0,0 +1,40 @@
+From 88f2bbba61f4d158c281fc061ddacb887d5224d8 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Tue, 30 Aug 2011 20:16:28 +0000
+Subject: telepathyClient: don't try to translate concatenations of strings
+
+xgettext doesn't recognize it
+
+https://bugzilla.gnome.org/show_bug.cgi?id=657759
+---
+diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
+index 9e0f3ef..1fba939 100644
+--- a/js/ui/telepathyClient.js
++++ b/js/ui/telepathyClient.js
+@@ -1426,8 +1426,7 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
+ = _("This resource is already connected to the server");
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
+- = _("Connection has been replaced by a new connection using the "
+- + "same resource");
++ = _("Connection has been replaced by a new connection using the same resource");
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
+ = _("The account already exists on the server");
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
+@@ -1435,12 +1434,9 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)]
+ = _("Certificate has been revoked");
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
+- = _("Certificate uses an insecure cipher algorithm or is "
+- + "cryptographically weak");
++ = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
+ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
+- = _("The length of the server certificate, or the depth of the "
+- + "server certificate chain, exceed the limits imposed by the "
+- + "cryptography library");
++ = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
+
+ AccountNotification.prototype = {
+ __proto__: MessageTray.Notification.prototype,
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
new file mode 100644
index 0000000..5dc408c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
@@ -0,0 +1,52 @@
+From 3aa904da0aa938c3fee09357bcff3a1de6321308 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Thu, 01 Sep 2011 20:09:46 +0000
+Subject: workspacesView: Only connect to nWorkspacesChanged after we've lazily inited
+
+We lazily init this._workspaces, so we shouldn't try to run any code that uses
+it until after it's been created.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658007
+---
+diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
+index 955aee0..f240682 100644
+--- a/js/ui/workspacesView.js
++++ b/js/ui/workspacesView.js
+@@ -567,8 +567,6 @@ WorkspacesDisplay.prototype = {
+ this._updateAlwaysZoom();
+
+ Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));
+- global.screen.connect('notify::n-workspaces',
+- Lang.bind(this, this._workspacesChanged));
+
+ Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
+ this._alwaysZoomOut = true;
+@@ -581,6 +579,7 @@ WorkspacesDisplay.prototype = {
+
+ this._switchWorkspaceNotifyId = 0;
+
++ this._nWorkspacesChangedId = 0;
+ this._itemDragBeginId = 0;
+ this._itemDragCancelledId = 0;
+ this._itemDragEndId = 0;
+@@ -589,7 +588,7 @@ WorkspacesDisplay.prototype = {
+ this._windowDragEndId = 0;
+ },
+
+- show: function() {
++ show: function() {
+ this._zoomOut = this._alwaysZoomOut;
+ this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
+ this._updateZoom();
+@@ -612,6 +611,9 @@ WorkspacesDisplay.prototype = {
+ global.screen.connect('restacked',
+ Lang.bind(this, this._onRestacked));
+
++ if (this._nWorkspacesChangedId == 0)
++ this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
++ Lang.bind(this, this._workspacesChanged));
+ if (this._itemDragBeginId == 0)
+ this._itemDragBeginId = Main.overview.connect('item-drag-begin',
+ Lang.bind(this, this._dragBegin));
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
similarity index 92%
rename from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
index 258babe..9573aed 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
@@ -110,12 +110,8 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
# Useful patches from upstream git, will be in next release
- epatch "${FILESDIR}/${P}-default-avatar.patch"
- epatch "${FILESDIR}/${P}-folks-crash.patch"
- epatch "${FILESDIR}/${P}-gdm-batch.patch"
- epatch "${FILESDIR}/${P}-telepathy-status.patch"
- # gobject-introspection-1.29.17 compat, will be in next release
- epatch "${FILESDIR}/${P}-gi-1.29.17.patch"
+ epatch "${FILESDIR}/${P}-telepathy-gettext.patch"
+ epatch "${FILESDIR}/${P}-workspaces-lazy-init.patch"
}
src_install() {
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 2cdf2d0..ffa6bc7 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -88,11 +88,7 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/accountsservice-0.6.12
- >=app-accessibility/caribou-0.3
-
- !!<=gnome-extra/gnome-shell-extensions-3.1.4"
-# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell.
-# Disabling the extensions is not enough; they must be physically uninstalled.
+ >=app-accessibility/caribou-0.3"
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
@@ -109,14 +105,6 @@ pkg_setup() {
--enable-compile-warnings=maximum
--disable-schemas-compile
--disable-jhbuild-wrapper-script"
-
- ewarn
- ewarn "${PN} tends to crash at login or shortly thereafter if there are any"
- ewarn "old shell extensions *installed*, whether systemwide or in a user's"
- ewarn "home directory."
- ewarn "Disabling the extensions is not enough. You should uninstall the"
- ewarn "extensions before upgrading gnome-shell to ${PV}."
- ewarn
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-09-07 6:30 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-09-07 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 273582b45205db4eb484b0361ce9e59e71aa8f53
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 7 05:56:23 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 7 05:56:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=273582b4
gnome-base/gnome-shell: 3.1.90.1 → 3.1.91
Version bump, fixes the apps-disappearing-from-Alt-Tab bug. Patches were
applied upstream.
---
.../gnome-shell-3.1.90.1-telepathy-gettext.patch | 40 ---------------
...gnome-shell-3.1.90.1-workspaces-lazy-init.patch | 52 --------------------
...l-3.1.90.1.ebuild => gnome-shell-3.1.91.ebuild} | 7 ---
3 files changed, 0 insertions(+), 99 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
deleted file mode 100644
index 16f0de4..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 88f2bbba61f4d158c281fc061ddacb887d5224d8 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Tue, 30 Aug 2011 20:16:28 +0000
-Subject: telepathyClient: don't try to translate concatenations of strings
-
-xgettext doesn't recognize it
-
-https://bugzilla.gnome.org/show_bug.cgi?id=657759
----
-diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
-index 9e0f3ef..1fba939 100644
---- a/js/ui/telepathyClient.js
-+++ b/js/ui/telepathyClient.js
-@@ -1426,8 +1426,7 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_LOST)]
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNECTED)]
- = _("This resource is already connected to the server");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)]
-- = _("Connection has been replaced by a new connection using the "
-- + "same resource");
-+ = _("Connection has been replaced by a new connection using the same resource");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)]
- = _("The account already exists on the server");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
-@@ -1435,12 +1434,9 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)]
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)]
- = _("Certificate has been revoked");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)]
-- = _("Certificate uses an insecure cipher algorithm or is "
-- + "cryptographically weak");
-+ = _("Certificate uses an insecure cipher algorithm or is cryptographically weak");
- _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)]
-- = _("The length of the server certificate, or the depth of the "
-- + "server certificate chain, exceed the limits imposed by the "
-- + "cryptography library");
-+ = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library");
-
- AccountNotification.prototype = {
- __proto__: MessageTray.Notification.prototype,
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
deleted file mode 100644
index 5dc408c..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3aa904da0aa938c3fee09357bcff3a1de6321308 Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Thu, 01 Sep 2011 20:09:46 +0000
-Subject: workspacesView: Only connect to nWorkspacesChanged after we've lazily inited
-
-We lazily init this._workspaces, so we shouldn't try to run any code that uses
-it until after it's been created.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658007
----
-diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
-index 955aee0..f240682 100644
---- a/js/ui/workspacesView.js
-+++ b/js/ui/workspacesView.js
-@@ -567,8 +567,6 @@ WorkspacesDisplay.prototype = {
- this._updateAlwaysZoom();
-
- Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));
-- global.screen.connect('notify::n-workspaces',
-- Lang.bind(this, this._workspacesChanged));
-
- Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
- this._alwaysZoomOut = true;
-@@ -581,6 +579,7 @@ WorkspacesDisplay.prototype = {
-
- this._switchWorkspaceNotifyId = 0;
-
-+ this._nWorkspacesChangedId = 0;
- this._itemDragBeginId = 0;
- this._itemDragCancelledId = 0;
- this._itemDragEndId = 0;
-@@ -589,7 +588,7 @@ WorkspacesDisplay.prototype = {
- this._windowDragEndId = 0;
- },
-
-- show: function() {
-+ show: function() {
- this._zoomOut = this._alwaysZoomOut;
- this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
- this._updateZoom();
-@@ -612,6 +611,9 @@ WorkspacesDisplay.prototype = {
- global.screen.connect('restacked',
- Lang.bind(this, this._onRestacked));
-
-+ if (this._nWorkspacesChangedId == 0)
-+ this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces',
-+ Lang.bind(this, this._workspacesChanged));
- if (this._itemDragBeginId == 0)
- this._itemDragBeginId = Main.overview.connect('item-drag-begin',
- Lang.bind(this, this._dragBegin));
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
similarity index 94%
rename from gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
index 9573aed..ffa6bc7 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.91.ebuild
@@ -107,13 +107,6 @@ pkg_setup() {
--disable-jhbuild-wrapper-script"
}
-src_prepare() {
- gnome2_src_prepare
- # Useful patches from upstream git, will be in next release
- epatch "${FILESDIR}/${P}-telepathy-gettext.patch"
- epatch "${FILESDIR}/${P}-workspaces-lazy-init.patch"
-}
-
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
@ 2011-10-01 2:10 Alexandre Restovtsev
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Restovtsev @ 2011-10-01 2:10 UTC (permalink / raw
To: gentoo-commits
commit: e74deb455b878a6cdc0d179aa53d36fc8cea9013
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Oct 1 00:29:38 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 1 00:29:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e74deb45
gnome-base/gnome-shell: add various patches
Add upstream patches to fix multimonitor behavior, to make the shell
recorder actually work, and to not cache unequal icons to the same
texture.
---
...gnome-shell-3.2.0-boxpointer-multimonitor.patch | 81 ++++++++++++++++++++
.../gnome-shell-3.2.0-recorder-coglhandle.patch | 41 ++++++++++
...2.0-st-texture-cache-non-serialized-icons.patch | 47 +++++++++++
...ll-3.2.0.ebuild => gnome-shell-3.2.0-r1.ebuild} | 13 +++-
4 files changed, 181 insertions(+), 1 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch
new file mode 100644
index 0000000..4d8497c
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-boxpointer-multimonitor.patch
@@ -0,0 +1,81 @@
+From 7a8a189c483b48de581c490a44d69030ba7a6923 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Thu, 22 Sep 2011 19:52:58 +0000
+Subject: boxpointer: Don't constrain box pointer to primary monitor
+
+A boxPointer should be able to be attached to any actor, not just ones on the
+primary monitor. Assume that the sourceActor doesn't straddle monitors, and
+constrain the boxPointer to the monitor the sourceActor is on.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=659861
+---
+diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
+index 1523ef6..979e2d1 100644
+--- a/js/ui/boxpointer.js
++++ b/js/ui/boxpointer.js
+@@ -329,7 +329,7 @@ BoxPointer.prototype = {
+ // We also want to keep it onscreen, and separated from the
+ // edge by the same distance as the main part of the box is
+ // separated from its sourceActor
+- let primary = Main.layoutManager.primaryMonitor;
++ let monitor = Main.layoutManager.findMonitorForActor(sourceActor);
+ let themeNode = this.actor.get_theme_node();
+ let borderWidth = themeNode.get_length('-arrow-border-width');
+ let arrowBase = themeNode.get_length('-arrow-base');
+@@ -364,8 +364,8 @@ BoxPointer.prototype = {
+ case St.Side.BOTTOM:
+ resX = sourceCenterX - (halfMargin + (natWidth - margin) * alignment);
+
+- resX = Math.max(resX, primary.x + 10);
+- resX = Math.min(resX, primary.x + primary.width - (10 + natWidth));
++ resX = Math.max(resX, monitor.x + 10);
++ resX = Math.min(resX, monitor.x + monitor.width - (10 + natWidth));
+ this.setArrowOrigin(sourceCenterX - resX);
+ break;
+
+@@ -373,8 +373,8 @@ BoxPointer.prototype = {
+ case St.Side.RIGHT:
+ resY = sourceCenterY - (halfMargin + (natHeight - margin) * alignment);
+
+- resY = Math.max(resY, primary.y + 10);
+- resY = Math.min(resY, primary.y + primary.height - (10 + natHeight));
++ resY = Math.max(resY, monitor.y + 10);
++ resY = Math.min(resY, monitor.y + monitor.height - (10 + natHeight));
+
+ this.setArrowOrigin(sourceCenterY - resY);
+ break;
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index d473ae0..f21fcca 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -369,6 +369,10 @@ LayoutManager.prototype = {
+ // Removes @actor from the chrome
+ removeChrome: function(actor) {
+ this._chrome.removeActor(actor);
++ },
++
++ findMonitorForActor: function(actor) {
++ return this._chrome.findMonitorForActor(actor);
+ }
+ };
+ Signals.addSignalMethods(LayoutManager.prototype);
+@@ -700,7 +704,7 @@ Chrome.prototype = {
+ else if (this._inOverview)
+ visible = true;
+ else if (!actorData.visibleInFullscreen &&
+- this._findMonitorForActor(actorData.actor).inFullscreen)
++ this.findMonitorForActor(actorData.actor).inFullscreen)
+ visible = false;
+ else
+ visible = true;
+@@ -762,7 +766,7 @@ Chrome.prototype = {
+
+ // This call guarantees that we return some monitor to simplify usage of it
+ // In practice all tracked actors should be visible on some monitor anyway
+- _findMonitorForActor: function(actor) {
++ findMonitorForActor: function(actor) {
+ let [x, y] = actor.get_transformed_position();
+ let [w, h] = actor.get_transformed_size();
+ let monitor = this._findMonitorForRect(x, y, w, h);
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch
new file mode 100644
index 0000000..c9d3f41
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-recorder-coglhandle.patch
@@ -0,0 +1,41 @@
+From 4e9e91fdce7b887bc2fea99b36b6fad4a5cea2c6 Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner@gnome.org>
+Date: Wed, 21 Sep 2011 22:58:08 +0000
+Subject: recorder: Use CoglHandle instead of CoglHandle*
+
+The latter has always been wrong and should have been fixed a
+while ago, but somehow we overlooked shell-recorder.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=659822
+---
+diff --git a/src/shell-recorder.c b/src/shell-recorder.c
+index 9df14d3..a624389 100644
+--- a/src/shell-recorder.c
++++ b/src/shell-recorder.c
+@@ -54,7 +54,7 @@ struct _ShellRecorder {
+ gboolean have_xfixes;
+ int xfixes_event_base;
+
+- CoglHandle *recording_icon; /* icon shown while playing */
++ CoglHandle recording_icon; /* icon shown while playing */
+
+ cairo_surface_t *cursor_image;
+ int cursor_hot_x;
+@@ -160,13 +160,13 @@ G_DEFINE_TYPE(ShellRecorder, shell_recorder, G_TYPE_OBJECT);
+ * recording. The emblem is drawn *after* we record the frame so doesn't
+ * show up in the frame.
+ */
+-static CoglHandle *
++static CoglHandle
+ create_recording_icon (void)
+ {
+ cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 32, 32);
+ cairo_t *cr;
+ cairo_pattern_t *pat;
+- CoglHandle *texture;
++ CoglHandle texture;
+
+ cr = cairo_create (surface);
+
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch
new file mode 100644
index 0000000..73b51da
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.0-st-texture-cache-non-serialized-icons.patch
@@ -0,0 +1,47 @@
+From e49a595f54b14d681ad01c8da1886ff659080e10 Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner@gnome.org>
+Date: Fri, 30 Sep 2011 17:57:09 +0000
+Subject: st-texture-cache: Don't cache GIcons which cannot be serialized
+
+For GIcons we use g_icon_to_string() in the key, but the function
+will return NULL if the icon cannot be serialized. As a result,
+all non-serializable GIcons of the same size end up with the same
+cache key - an example for this are contacts with avatars, which
+currently all end up with the same image.
+To fix, opt out of caching for GIcons which cannot be serialized.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660585
+---
+diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
+index 24471bc..1e83a0d 100644
+--- a/src/st/st-texture-cache.c
++++ b/src/st/st-texture-cache.c
+@@ -1177,8 +1177,15 @@ load_gicon_with_colors (StTextureCache *cache,
+ char *key;
+ GtkIconTheme *theme;
+ GtkIconInfo *info;
++ StTextureCachePolicy policy;
+
+ gicon_string = g_icon_to_string (icon);
++ /* A return value of NULL indicates that the icon can not be serialized,
++ * so don't have a unique identifier for it as a cache key, and thus can't
++ * be cached. If it is cachable, we hardcode a policy of FOREVER here for
++ * now; we should actually blow this away on icon theme changes probably */
++ policy = gicon_string != NULL ? ST_TEXTURE_CACHE_POLICY_FOREVER
++ : ST_TEXTURE_CACHE_POLICY_NONE;
+ if (colors)
+ {
+ /* This raises some doubts about the practice of using string keys */
+@@ -1210,9 +1217,7 @@ load_gicon_with_colors (StTextureCache *cache,
+ {
+ /* Transfer ownership of key */
+ request->key = key;
+- /* hardcoded here for now; we should actually blow this away on
+- * icon theme changes probably */
+- request->policy = ST_TEXTURE_CACHE_POLICY_FOREVER;
++ request->policy = policy;
+ request->icon = g_object_ref (icon);
+ request->icon_info = info;
+ request->width = request->height = size;
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.0-r1.ebuild
similarity index 90%
rename from gnome-base/gnome-shell/gnome-shell-3.2.0.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.2.0-r1.ebuild
index 3aaed7a..186d8e6 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.2.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.2.0-r1.ebuild
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit gnome2 python
+inherit eutils gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -113,9 +113,20 @@ pkg_setup() {
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
}
+src_prepare() {
+ gnome2_src_prepare
+ # Fix recording; will be in next release
+ epatch "${FILESDIR}/${P}-recorder-coglhandle.patch"
+ # Fix multimonitor behavior; will be in next release
+ epatch "${FILESDIR}/${P}-boxpointer-multimonitor.patch"
+ # Fix different icons being cached identically; will be in next release
+ epatch "${FILESDIR}/${P}-st-texture-cache-non-serialized-icons.patch"
+}
+
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
+
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-01 2:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-01 2:10 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-07 6:30 Alexandre Restovtsev
2011-09-02 5:15 Alexandre Restovtsev
2011-08-31 11:45 Alexandre Restovtsev
2011-08-30 21:55 Alexandre Restovtsev
2011-07-27 5:51 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox