summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2009-09-08 18:08:06 +0000
committerAndreas Proschofsky <suka@gentoo.org>2009-09-08 18:08:06 +0000
commit1af3ebc9480b015764b2d88241dc54d5082fad26 (patch)
tree77127195103ad27b794003c6c88b36d4c2d0484a
parentfix overlay key not working (diff)
downloadsuka-1af3ebc9480b015764b2d88241dc54d5082fad26.tar.gz
suka-1af3ebc9480b015764b2d88241dc54d5082fad26.tar.bz2
suka-1af3ebc9480b015764b2d88241dc54d5082fad26.zip
Fix some bad bugs with 2.27.2
svn path=/; revision=155
-rw-r--r--gnome-base/gnome-shell/Manifest4
-rw-r--r--gnome-base/gnome-shell/files/app-well-glow.pngbin0 -> 3724 bytes
-rw-r--r--gnome-base/gnome-shell/files/upstreamfixes.diff38
-rw-r--r--gnome-base/gnome-shell/gnome-shell-2.27.2-r1.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-2.27.2.ebuild)8
4 files changed, 49 insertions, 1 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 58b61e7..63f6882 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,5 @@
+AUX app-well-glow.png 3724 RMD160 2c74e9a271b0fc45405b2ae0df4ea567f1f66655 SHA1 6970b5d00149c6af5c9db582738dbda13c2183f6 SHA256 6eba439c7f07f8cf177710c096ef1a3d604d2d48765ae20ee6d28b97554f6ec1
+AUX upstreamfixes.diff 1155 RMD160 5ed9581748e51bf8755079aa5daa881600614f9b SHA1 7797a5c25c57c2ea18ab69bdd7061f6808d24056 SHA256 021acd718b1e5a85b188535a3fb6c4a2484fd05cce7c8b94140d9944a493652d
DIST gnome-shell-2.27.2.tar.bz2 469251 RMD160 23121d76f2d0f7033904d1e3b3440f05056be394 SHA1 e0f53b406ca1731af41bcf63736d84d1bc9903b2 SHA256 40e354e6cb91bcd8199521e37f80c4fdf5533332e5f3ee154d053fef761e2fbe
-EBUILD gnome-shell-2.27.2.ebuild 1188 RMD160 ee312d5fcd4a6944b43cbdbb6f722688717af7b6 SHA1 800128a07d802457f316f8185bc16d9e1bcc857d SHA256 d4e2c37653554299a9fe3c8d1ca36007e563ffadc3dd5931c4318bece4de5bf9
+EBUILD gnome-shell-2.27.2-r1.ebuild 1326 RMD160 60c8fbf9b26e67bf4fc0e04389f9b5a722bda485 SHA1 dd3ee673889807674e56c6c4d2e4362837f30e72 SHA256 e660f9cc905071ec4a8bfe05d157146eea738f4fad054c048d5e4d0507caa1fe
EBUILD gnome-shell-9999.ebuild 1355 RMD160 9207e2abecb0bf51a0e7e6fbef8754f18a908a9b SHA1 57411c5930f3801451f955239dbac3b3fdb2a072 SHA256 cc2f570a7bc94a3ec6c6fda2a0d01358daba34f85b76264dc04136eee4f27aed
diff --git a/gnome-base/gnome-shell/files/app-well-glow.png b/gnome-base/gnome-shell/files/app-well-glow.png
new file mode 100644
index 0000000..2a8984f
--- /dev/null
+++ b/gnome-base/gnome-shell/files/app-well-glow.png
Binary files differ
diff --git a/gnome-base/gnome-shell/files/upstreamfixes.diff b/gnome-base/gnome-shell/files/upstreamfixes.diff
new file mode 100644
index 0000000..aee2fb6
--- /dev/null
+++ b/gnome-base/gnome-shell/files/upstreamfixes.diff
@@ -0,0 +1,38 @@
+--- a/src/shell-app-system.c
++++ b/src/shell-app-system.c
+@@ -57,7 +57,7 @@ struct _ShellAppSystemPrivate {
+ };
+
+ static void shell_app_system_finalize (GObject *object);
+-static void on_tree_changed (gpointer user_data);
++static gboolean on_tree_changed (gpointer user_data);
+ static void on_tree_changed_cb (GMenuTree *tree, gpointer user_data);
+ static void reread_menus (ShellAppSystem *self);
+ static void on_favorite_apps_changed (GConfClient *client, guint id, GConfEntry *entry, gpointer user_data);
+@@ -415,13 +415,14 @@ reread_menus (ShellAppSystem *self)
+ cache_by_id (self, self->priv->cached_settings, TRUE);
+ }
+
+-static void
++static gboolean
+ on_tree_changed (gpointer user_data)
+ {
+ ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
+ g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
+ reread_menus (self);
+ self->priv->app_change_timeout_id = 0;
++ return FALSE;
+ }
+
+ static void
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -16,6 +16,7 @@ imagedir = $(pkgdatadir)/images
+
+ dist_image_DATA = \
+ add-workspace.svg \
++ app-well-glow.png \
+ back.svg \
+ close.svg \
+ close-black.svg \
+
diff --git a/gnome-base/gnome-shell/gnome-shell-2.27.2.ebuild b/gnome-base/gnome-shell/gnome-shell-2.27.2-r1.ebuild
index 46677da..5d1e0a3 100644
--- a/gnome-base/gnome-shell/gnome-shell-2.27.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.27.2-r1.ebuild
@@ -40,6 +40,14 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS README"
+src_prepare() {
+
+ cd ${S}
+ epatch "${FILESDIR}/upstreamfixes.diff"
+ cp "${FILESDIR}/app-well-glow.png" "${S}/data" || die
+ eautoreconf
+}
+
pkg_postinst() {
elog " Start with 'gnome-shell --replace' "