From c6b3b7c474fd75721e8f057b90f71032fc2d7b87fc1efc6f4954cb41468ae9a8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 10 Jun 2011 07:40:17 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/gnome-shell revision 34.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=00411c18fdbb957c0888342ce149bb89 --- gnome-shell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-shell.spec b/gnome-shell.spec index f9ed1b6..a4398ab 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -19,7 +19,7 @@ Name: gnome-shell Version: 3.0.2 -Release: 1 +Release: 2 License: GPLv2+ Summary: GNOME Shell Group: System/GUI/GNOME From 1201bafe591e61bc31faec7a788d8ec636de283daead4eed64e81343fcec4f13 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Jun 2011 13:55:31 +0000 Subject: [PATCH 2/6] Accepting request 74664 from home:vuntz:branches:GNOME:Factory Add patch from git to fix startup crash OBS-URL: https://build.opensuse.org/request/show/74664 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=63 --- gnome-shell-no-file_get_contents.patch | 30 ++++++++++++++++++++++++++ gnome-shell.changes | 6 ++++++ gnome-shell.spec | 3 +++ 3 files changed, 39 insertions(+) create mode 100644 gnome-shell-no-file_get_contents.patch diff --git a/gnome-shell-no-file_get_contents.patch b/gnome-shell-no-file_get_contents.patch new file mode 100644 index 0000000..40fadb4 --- /dev/null +++ b/gnome-shell-no-file_get_contents.patch @@ -0,0 +1,30 @@ +From bfd344cdece5de6230ff611e3e1c66d90913dc47 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 11 May 2011 18:19:24 +0000 +Subject: 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 +--- +(limited to 'js/ui/placeDisplay.js') + +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'); + +-- +cgit v0.9 diff --git a/gnome-shell.changes b/gnome-shell.changes index 8c69036..901e347 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 27 15:47:54 CEST 2011 - vuntz@opensuse.org + +- Add gnome-shell-no-file_get_contents.patch to fix a crash on + startup. This is taken from git. + ------------------------------------------------------------------- Thu Jun 9 12:42:42 CEST 2011 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index a4398ab..2320630 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -25,6 +25,8 @@ Summary: GNOME Shell Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gnome-shell-no-file_get_contents.patch vuntz@opensuse.org -- Taken from git, fix an exception on startup that makes gnome-shell unusable +Patch0: gnome-shell-no-file_get_contents.patch Patch2: default-applications.patch BuildRequires: intltool BuildRequires: translation-update-upstream @@ -77,6 +79,7 @@ documents, and organizing open windows in GNOME. %prep %setup -q translation-update-upstream +%patch0 -p1 %if 0%{?suse_version} >= 1140 %patch2 -p1 %endif From 0444b3e9068ce1c9efac6dd42e197943f2e3f5eb484f3ed6df5a24dc8ab509cd Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 1 Jul 2011 09:56:05 +0000 Subject: [PATCH 3/6] Accepting request 74967 from home:dimstar:branches:GNOME:Factory Update to 3.1.3 - with reference to bgo#653795 OBS-URL: https://build.opensuse.org/request/show/74967 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=64 --- gnome-shell-3.0.2.tar.bz2 | 3 - gnome-shell-3.1.3.tar.bz2 | 3 + gnome-shell-no-file_get_contents.patch | 30 ---------- gnome-shell.changes | 76 ++++++++++++++++++++++++++ gnome-shell.spec | 13 +++-- 5 files changed, 86 insertions(+), 39 deletions(-) delete mode 100644 gnome-shell-3.0.2.tar.bz2 create mode 100644 gnome-shell-3.1.3.tar.bz2 delete mode 100644 gnome-shell-no-file_get_contents.patch diff --git a/gnome-shell-3.0.2.tar.bz2 b/gnome-shell-3.0.2.tar.bz2 deleted file mode 100644 index 400914f..0000000 --- a/gnome-shell-3.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95 -size 1073613 diff --git a/gnome-shell-3.1.3.tar.bz2 b/gnome-shell-3.1.3.tar.bz2 new file mode 100644 index 0000000..afec46c --- /dev/null +++ b/gnome-shell-3.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ba96419fb8ae82423c7254a5afddcf45686f75e2cc809e71cc1f11d644109fe +size 1126629 diff --git a/gnome-shell-no-file_get_contents.patch b/gnome-shell-no-file_get_contents.patch deleted file mode 100644 index 40fadb4..0000000 --- a/gnome-shell-no-file_get_contents.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bfd344cdece5de6230ff611e3e1c66d90913dc47 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 11 May 2011 18:19:24 +0000 -Subject: 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 ---- -(limited to 'js/ui/placeDisplay.js') - -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'); - --- -cgit v0.9 diff --git a/gnome-shell.changes b/gnome-shell.changes index 901e347..e98f478 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Fri Jul 1 09:16:09 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.3: + + bgo#650971: Fix problem with "user theme extension" breaking + the CSS for other extensions + + Telepathy IM framework integration: + - Switch to using telepathy-glib rather than talking to + Telepathy via D-Bus + - Acknowledge messages when the user clicks on them + - Fix problem with telepathy icon blinking for incoming + messages even though the user has been notified of them + + Networking + - keep wirelesss networks in predictable order + - Show unmanaged devices in the menu + - Fix overflow when too many VPN connections + + Bluetooth + - Show "hardware disabled" when disabled by rfkill + - Fix bug updating status of devices + + LookingGlass console: + - Add a "Memory" tab + - Make escape work from any page + - Provide a way to refer to panel items as, e.g., + Main.panel._activities + + User menu + - Fix problem with suspend menu option locking the screen even + when the user disabled that. + - Hide "power off..." option if shutdown is disabled via + PolicyKit + + Track changes to WM_CLASS: fixes problems with LibreOffice + tracking + + Remove app tracking workarounds for Firefox and LibreOffice + + Use upstream gettext autoconfigury rather than glib version + + Show messages in the message tray when an application is + fullscreen + + Don't autohide the workspace pager if there is more than one + workspace + + Don't always slide out the workspace pager at drag begin + + Only offer to remove a favorite app when dragging it's icon + + Allow dropping an icon anywhere on a workspace + + st-scroll-view: Make the fade effect and offset themable + + Obey the user's preference when running an application in a + terminal from the run dialog + + Consistently exit overview when launching external applications + + Adapt to changes in GJS for how GObject APIs are bound + + Fix problems with scrolling in overflow for alt-Tab switcher + + Mark relationships between labels and actors for accessibility + + Add org.gnome.shell.enabled-extensions complementing + disabled-extensions GSetting + + Visual tweaks + + Switch to building against clutter-1.7 with independent Cogl + + Code cleanups + + Memory leak fixes + + Build Fixes + + Bugs fixed: bgo#608667, bgo#620105, bgo#631576, bgo#633620, + bgo#639459, bgo#641570, bgo#642793, bgo#642895, bgo#643513, + bgo#643594, bgo#645031, bgo#645585, bgo#645848, bgo#645990, + bgo#646261, bgo#646580, bgo#646915, bgo#646919, bgo#646946, + bgo#647186, bgo#647303, bgo#647395, bgo#647565, bgo#647807, + bgo#647893, bgo#647907, bgo#648006, bgo#648048, bgo#648305, + bgo#648410, bgo#648422, bgo#648562, bgo#648755, bgo#648758, + bgo#648760, bgo#648894, bgo#649001, bgo#649203, bgo#649315, + bgo#649508, bgo#649517, bgo#649633, bgo#649981, bgo#650317, + bgo#650692, bgo#650869, bgo#650934, bgo#651012, bgo#651015, + bgo#651086, bgo#651088, bgo#651138, bgo#651227, bgo#651569, + bgo#651602, bgo#651606, bgo#651813, bgo#651866, bgo#652038, + bgo#652079, bgo#652313, bgo#652327, bgo#652388, bgo#652597, + bgo#652714, bgo#652715, bgo#652730, bgo#653078, bgo#653095, + bgo#653142, bgo#653199, bgo#653275, bgo#653397, bgo#653511. +- Drop gnome-shell-no-file_get_contents.patch: fixed upstream. +- Add a hack to fix build against Mutter 3.1.3, which changed + Meta-3.0.gir to Meta-3.1.gir. A simple find/replace in + src/Makefile.{am,in} is enough. The build will fail with a new + tarball that will have this fixed, to ensure the hack gets + removed again. Reported as bgo#653795. + ------------------------------------------------------------------- Mon Jun 27 15:47:54 CEST 2011 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 2320630..3826b57 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -18,15 +18,13 @@ Name: gnome-shell -Version: 3.0.2 -Release: 2 +Version: 3.1.3 +Release: 1 License: GPLv2+ Summary: GNOME Shell Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell -Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gnome-shell-no-file_get_contents.patch vuntz@opensuse.org -- Taken from git, fix an exception on startup that makes gnome-shell unusable -Patch0: gnome-shell-no-file_get_contents.patch +Source: http://download.gnome.org/sources/gnome-shell/3.1/%{name}-%{version}.tar.bz2 Patch2: default-applications.patch BuildRequires: intltool BuildRequires: translation-update-upstream @@ -79,12 +77,15 @@ documents, and organizing open windows in GNOME. %prep %setup -q translation-update-upstream -%patch0 -p1 %if 0%{?suse_version} >= 1140 %patch2 -p1 %endif %build +# The gnome-shell 3.1.3 tarball does not build against mutter 3.1.3 tarball by default, as mutter moved from Meta-3.0 to Meta-3.1. See bgo#653795 +# Detect if we need to change that in our Makefiles or if we can remove this hack. Changing Makefile.am and Makefile.in to avoid having to bootstrap. +grep "Meta-3.0" src/Makefile.am +sed -i "s/Meta-3.0/Meta-3.1/" src/Makefile.{am,in} %configure \ --disable-static \ --libexecdir=%{_libexecdir}/%{name} \ From 30ee76dda69ecaa966d9b4ae0f953dc3e9373695d20f7dc8090b2a442327e2c8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 1 Jul 2011 09:58:03 +0000 Subject: [PATCH 4/6] Accepting request 74972 from home:vuntz:branches:GNOME:Factory Tweak .changes; upstream was not optimal ;-) OBS-URL: https://build.opensuse.org/request/show/74972 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=65 --- gnome-shell.changes | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnome-shell.changes b/gnome-shell.changes index e98f478..19b708d 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -2,18 +2,6 @@ Fri Jul 1 09:16:09 CEST 2011 - dimstar@opensuse.org - Update to version 3.1.3: - + bgo#650971: Fix problem with "user theme extension" breaking - the CSS for other extensions - + Telepathy IM framework integration: - - Switch to using telepathy-glib rather than talking to - Telepathy via D-Bus - - Acknowledge messages when the user clicks on them - - Fix problem with telepathy icon blinking for incoming - messages even though the user has been notified of them - + Networking - - keep wirelesss networks in predictable order - - Show unmanaged devices in the menu - - Fix overflow when too many VPN connections + Bluetooth - Show "hardware disabled" when disabled by rfkill - Fix bug updating status of devices @@ -22,11 +10,23 @@ Fri Jul 1 09:16:09 CEST 2011 - dimstar@opensuse.org - Make escape work from any page - Provide a way to refer to panel items as, e.g., Main.panel._activities + + Networking + - keep wirelesss networks in predictable order + - Show unmanaged devices in the menu + - Fix overflow with too many VPN connections + + Telepathy IM framework integration: + - Switch to using telepathy-glib rather than talking to + Telepathy via D-Bus + - Acknowledge messages when the user clicks on them + - Fix problem with telepathy icon blinking for incoming + messages even though the user has been notified of them + User menu - Fix problem with suspend menu option locking the screen even when the user disabled that. - Hide "power off..." option if shutdown is disabled via PolicyKit + + bgo#650971: Fix problem with "user theme extension" breaking + the CSS for other extensions + Track changes to WM_CLASS: fixes problems with LibreOffice tracking + Remove app tracking workarounds for Firefox and LibreOffice From fdda5aa6e0cdf1af922f93b6cefb09fb26524baa886f9abcf612aacb4847ee36 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 2 Jul 2011 10:32:04 +0000 Subject: [PATCH 5/6] Accepting request 75069 from home:vuntz:branches:GNOME:Factory Remove Meta-3.1 hack + add deps that gnome-shell really expects OBS-URL: https://build.opensuse.org/request/show/75069 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=66 --- gnome-shell.changes | 13 +++++++++++++ gnome-shell.spec | 16 +++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/gnome-shell.changes b/gnome-shell.changes index 19b708d..d555314 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jul 2 09:32:38 CEST 2011 - vuntz@opensuse.org + +- Remove hack to use Meta-3.1.gir for the build: mutter 3.1.3.1 + reverted back to Meta-3.0.gir. +- Remove gjs Requires: gnome-shell is now a binary, and uses + libgjs, not the gjs binary. +- Add gnome-bluetooth, gnome-control-center, gnome-power-manager, + gnome-screensaver, NetworkManager-gnome Requires: the bluetooth, + power and network system icons, and the "System settings"/"Lock + screen" menu items need the services provided by those packages + to work. + ------------------------------------------------------------------- Fri Jul 1 09:16:09 CEST 2011 - dimstar@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 3826b57..dec3ffd 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -57,12 +57,22 @@ BuildRequires: pkgconfig(telepathy-logger-0.2) BuildRequires: pkgconfig(xfixes) Requires: dbus-1-python Requires: gdk-pixbuf-loader-rsvg -Requires: gjs Requires: gnome-icon-theme-symbolic Requires: gnome-session # For a GSettings schema Requires: gnome-settings-daemon Requires: gsettings-desktop-schemas +## Finally, dependencies for session services that are needed for system icons and the user menu +# bluetooth system icon +Requires: gnome-bluetooth +# "System settings" menu item +Requires: gnome-control-center +# power system icon +Requires: gnome-power-manager +# "Lock screen" menu item +Requires: gnome-screensaver +# network system icon +Requires: NetworkManager-gnome Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -82,10 +92,6 @@ translation-update-upstream %endif %build -# The gnome-shell 3.1.3 tarball does not build against mutter 3.1.3 tarball by default, as mutter moved from Meta-3.0 to Meta-3.1. See bgo#653795 -# Detect if we need to change that in our Makefiles or if we can remove this hack. Changing Makefile.am and Makefile.in to avoid having to bootstrap. -grep "Meta-3.0" src/Makefile.am -sed -i "s/Meta-3.0/Meta-3.1/" src/Makefile.{am,in} %configure \ --disable-static \ --libexecdir=%{_libexecdir}/%{name} \ From 26c491603640b9000bc9dd1eed4881a5034e910bb6f35a039bef52b877dc023e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 Jul 2011 10:05:28 +0000 Subject: [PATCH 6/6] Accepting request 75635 from home:vuntz:branches:GNOME:Factory Drop default-applications.patch OBS-URL: https://build.opensuse.org/request/show/75635 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=67 --- default-applications.patch | 13 ------------- gnome-shell.changes | 6 ++++++ gnome-shell.spec | 4 ---- 3 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 default-applications.patch diff --git a/default-applications.patch b/default-applications.patch deleted file mode 100644 index 102decc..0000000 --- a/default-applications.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in -=================================================================== ---- gnome-shell-2.91.91.orig/data/org.gnome.shell.gschema.xml.in -+++ gnome-shell-2.91.91/data/org.gnome.shell.gschema.xml.in -@@ -30,7 +30,7 @@ - - - -- [ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ] -+ [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ] - <_summary>List of desktop file IDs for favorite applications - <_description> - The applications corresponding to these identifiers diff --git a/gnome-shell.changes b/gnome-shell.changes index d555314..4beec7d 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 7 11:37:44 CEST 2011 - vuntz@opensuse.org + +- Drop default-applications.patch: the default applications are now + set in gio-branding. Fix bnc#689610. + ------------------------------------------------------------------- Sat Jul 2 09:32:38 CEST 2011 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index dec3ffd..3518210 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -25,7 +25,6 @@ Summary: GNOME Shell Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.1/%{name}-%{version}.tar.bz2 -Patch2: default-applications.patch BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -87,9 +86,6 @@ documents, and organizing open windows in GNOME. %prep %setup -q translation-update-upstream -%if 0%{?suse_version} >= 1140 -%patch2 -p1 -%endif %build %configure \