From 197eb21c5c8705a85e6b867111e63afe3d344c5e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 5 Jul 2011 17:09:37 +0100 Subject: [PATCH] 3.1.3 --- .gitignore | 1 + Import-Shell-as-needed-by-recent-commit.patch | 24 ---------- ...le_contents_utf8_sync-over-GLib.file.patch | 48 ------------------- gnome-shell-3.0.2-st-icon-colors-atomic.patch | 30 ------------ gnome-shell-3.0.2-st-shadow-atomic.patch | 30 ------------ gnome-shell.spec | 17 +++---- sources | 2 +- 7 files changed, 8 insertions(+), 144 deletions(-) delete mode 100644 Import-Shell-as-needed-by-recent-commit.patch delete mode 100644 Use-Shell.get_file_contents_utf8_sync-over-GLib.file.patch delete mode 100644 gnome-shell-3.0.2-st-icon-colors-atomic.patch delete mode 100644 gnome-shell-3.0.2-st-shadow-atomic.patch diff --git a/.gitignore b/.gitignore index b5a1f54..9a7a510 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ gnome-shell-2.31.5.tar.bz2 /gnome-shell-3.0.0.2.tar.bz2 /gnome-shell-3.0.1.tar.bz2 /gnome-shell-3.0.2.tar.bz2 +/gnome-shell-3.1.3.tar.bz2 diff --git a/Import-Shell-as-needed-by-recent-commit.patch b/Import-Shell-as-needed-by-recent-commit.patch deleted file mode 100644 index b71dbb3..0000000 --- a/Import-Shell-as-needed-by-recent-commit.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 82aea3e8d6fc2a16759fd6f232c7358989a5f607 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Fri, 20 May 2011 11:14:54 +0200 -Subject: [PATCH] Import Shell as needed by recent commit - ---- - js/ui/windowManager.js | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js -index 52a00da..a3e2918 100644 ---- a/js/ui/windowManager.js -+++ b/js/ui/windowManager.js -@@ -6,6 +6,7 @@ const Gio = imports.gi.Gio; - const Lang = imports.lang; - const Meta = imports.gi.Meta; - const St = imports.gi.St; -+const Shell = imports.gi.Shell; - - const AltTab = imports.ui.altTab; - const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup; --- -1.7.5.1 - diff --git a/Use-Shell.get_file_contents_utf8_sync-over-GLib.file.patch b/Use-Shell.get_file_contents_utf8_sync-over-GLib.file.patch deleted file mode 100644 index f701dac..0000000 --- a/Use-Shell.get_file_contents_utf8_sync-over-GLib.file.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bfd344cdece5de6230ff611e3e1c66d90913dc47 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 11 May 2011 14:19:24 -0400 -Subject: [PATCH] Use Shell.get_file_contents_utf8_sync over - GLib.file_get_contents - -We need to fix the latter to return a byte array, which gjs doesn't -deal with well right now. - -https://bugzilla.gnome.org/show_bug.cgi?id=649981 ---- - js/ui/placeDisplay.js | 5 +---- - js/ui/windowManager.js | 3 +-- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js -index 59ca4a6..9354247 100644 ---- a/js/ui/placeDisplay.js -+++ b/js/ui/placeDisplay.js -@@ -268,10 +268,7 @@ PlacesManager.prototype = { - if (!GLib.file_test(this._bookmarksPath, GLib.FileTest.EXISTS)) - return; - -- let [success, bookmarksContent, len] = GLib.file_get_contents(this._bookmarksPath); -- -- if (!success) -- return; -+ let bookmarksContent = Shell.get_file_contents_utf8_sync(this._bookmarksPath); - - let bookmarks = bookmarksContent.split('\n'); - -diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js -index b113a1a..52a00da 100644 ---- a/js/ui/windowManager.js -+++ b/js/ui/windowManager.js -@@ -22,8 +22,7 @@ function getDimShader() { - if (dimShader === null) - return null; - if (!dimShader) { -- let [success, source, length] = GLib.file_get_contents(global.datadir + -- '/shaders/dim-window.glsl'); -+ let source = Shell.get_file_contents_utf8_sync(global.datadir + '/shaders/dim-window.glsl'); - try { - let shader = new Clutter.Shader(); - shader.set_fragment_source(source, -1); --- -1.7.5.1 - diff --git a/gnome-shell-3.0.2-st-icon-colors-atomic.patch b/gnome-shell-3.0.2-st-icon-colors-atomic.patch deleted file mode 100644 index 96eb6fd..0000000 --- a/gnome-shell-3.0.2-st-icon-colors-atomic.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 22ef63cc44dca76c625e529951b5a10e397a1950 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 02 Jun 2011 20:22:28 +0000 -Subject: st-icon-colors: Use non-deprecated GAtomic API - ---- -diff --git a/src/st/st-icon-colors.c b/src/st/st-icon-colors.c -index 0655246..21bec6e 100644 ---- a/src/st/st-icon-colors.c -+++ b/src/st/st-icon-colors.c -@@ -53,7 +53,7 @@ st_icon_colors_ref (StIconColors *colors) - g_return_val_if_fail (colors != NULL, NULL); - g_return_val_if_fail (colors->ref_count > 0, colors); - -- g_atomic_int_add ((volatile int *)&colors->ref_count, 1); -+ g_atomic_int_inc ((volatile int *)&colors->ref_count); - return colors; - } - -@@ -71,7 +71,7 @@ st_icon_colors_unref (StIconColors *colors) - g_return_if_fail (colors != NULL); - g_return_if_fail (colors->ref_count > 0); - -- if (g_atomic_int_exchange_and_add ((volatile int *)&colors->ref_count, -1) - 1 == 0) -+ if (g_atomic_int_dec_and_test ((volatile int *)&colors->ref_count)) - g_slice_free (StIconColors, colors); - } - --- -cgit v0.9 diff --git a/gnome-shell-3.0.2-st-shadow-atomic.patch b/gnome-shell-3.0.2-st-shadow-atomic.patch deleted file mode 100644 index 6b98214..0000000 --- a/gnome-shell-3.0.2-st-shadow-atomic.patch +++ /dev/null @@ -1,30 +0,0 @@ -From af51e8df7b9ce8a00e533e6b3c61d92580ff6e3e Mon Sep 17 00:00:00 2001 -From: Florian Müllner -Date: Thu, 02 Jun 2011 21:05:16 +0000 -Subject: st-shadow: Use non-deprecated GAtomic API - ---- -diff --git a/src/st/st-shadow.c b/src/st/st-shadow.c -index 335e496..9c3784a 100644 ---- a/src/st/st-shadow.c -+++ b/src/st/st-shadow.c -@@ -82,7 +82,7 @@ st_shadow_ref (StShadow *shadow) - g_return_val_if_fail (shadow != NULL, NULL); - g_return_val_if_fail (shadow->ref_count > 0, shadow); - -- g_atomic_int_add (&shadow->ref_count, 1); -+ g_atomic_int_inc (&shadow->ref_count); - return shadow; - } - -@@ -100,7 +100,7 @@ st_shadow_unref (StShadow *shadow) - g_return_if_fail (shadow != NULL); - g_return_if_fail (shadow->ref_count > 0); - -- if (g_atomic_int_exchange_and_add (&shadow->ref_count, -1) - 1 == 0) -+ if (g_atomic_int_dec_and_test (&shadow->ref_count)) - g_slice_free (StShadow, shadow); - } - --- -cgit v0.9 diff --git a/gnome-shell.spec b/gnome-shell.spec index b6326db..631cb73 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,20 +1,16 @@ Name: gnome-shell -Version: 3.0.2 -Release: 4%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops License: GPLv2+ URL: http://live.gnome.org/GnomeShell #VCS: git:git://git.gnome.org/gnome-shell -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.0/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.1/%{name}-%{version}.tar.bz2 Patch0: gnome-shell-avoid-redhat-menus.patch # from upstream -Patch1: gnome-shell-3.0.2-st-shadow-atomic.patch -Patch2: gnome-shell-3.0.2-st-icon-colors-atomic.patch -Patch3: Use-Shell.get_file_contents_utf8_sync-over-GLib.file.patch -Patch4: Import-Shell-as-needed-by-recent-commit.patch %define clutter_version 1.4.0 %define gobject_introspection_version 0.10.1 @@ -85,10 +81,6 @@ easy to use experience. %prep %setup -q %patch0 -p1 -b .avoid-redhat-menus -%patch1 -p1 -b .st-shadow-atomic -%patch2 -p1 -b .st-icon-colors-atomic -%patch3 -p1 -b .use-get-file-contents -%patch4 -p1 -b .add-shell-import %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -153,6 +145,9 @@ gconftool-2 --makefile-install-rule \ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: %changelog +* Tue Jul 5 2011 Peter Robinson - 3.1.3-1 +- Upstream 3.1.3 dev release + * Mon Jun 27 2011 Adam Williamson - 3.0.2-4 - add fixes from f15 branch (gjs dep and rpath) diff --git a/sources b/sources index b5310d5..be4b932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea5194dc27301ca7ee00a97f5f3ab625 gnome-shell-3.0.2.tar.bz2 +be29a47fc40e90055b194f290044f50c gnome-shell-3.1.3.tar.bz2