diff --git a/gnome-shell-2.91.2.tar.bz2 b/gnome-shell-2.91.2.tar.bz2 deleted file mode 100644 index 9e56027..0000000 --- a/gnome-shell-2.91.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7a32b55a99193b552ac4e9cb574d76659874abbf9777cd7f74a5685e082ec0f -size 809309 diff --git a/gnome-shell-2.91.5.tar.bz2 b/gnome-shell-2.91.5.tar.bz2 new file mode 100644 index 0000000..994a296 --- /dev/null +++ b/gnome-shell-2.91.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c10dec4c2e0ddf236646a18c3a8481e2ea29dce67c145c56375cba6f7be09e3 +size 844825 diff --git a/gnome-shell-CVE-2010-4000.patch b/gnome-shell-CVE-2010-4000.patch deleted file mode 100644 index d0ac268..0000000 --- a/gnome-shell-CVE-2010-4000.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 7beb7e0f65c6f66daebd307c492381249ddd41be -Author: Vincent Untz -Date: Wed Jan 5 10:32:44 2011 +0100 - - gnome-shell.in: Really never add empty elements to LD_LIBRARY_PATH - - This complements the fix from c6eb2761, to make sure that we don't use - the pre-existing $LD_LIBRARY_PATH if it's set but empty. - - Both commits fix CVE-2010-4000. - - https://bugzilla.gnome.org/show_bug.cgi?id=638728 - -diff --git a/src/gnome-shell.in b/src/gnome-shell.in -index 2abd7d5..e422adb 100755 ---- a/src/gnome-shell.in -+++ b/src/gnome-shell.in -@@ -152,7 +152,7 @@ def start_dconf_await_service(): - # dconf is linked without libtool, so unlike other GNOME modules, - # won't have an embedded rpath for its library directory. - env = dict(os.environ) -- if 'LD_LIBRARY_PATH' in env: -+ if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']: - ld_library_path = '@libdir@:' + env['LD_LIBRARY_PATH'] - else: - ld_library_path = '@libdir@' -@@ -246,7 +246,7 @@ def start_shell(perf_output=None): - if pkgconfig.returncode == 0: - mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir) - if os.path.exists(mozjs_libdir + '/libmozjs.so'): -- if 'LD_LIBRARY_PATH' in env: -+ if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']: - ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir - else: - ld_library_path = mozjs_libdir diff --git a/gnome-shell-fix-include.patch b/gnome-shell-fix-include.patch deleted file mode 100644 index fe98fcc..0000000 --- a/gnome-shell-fix-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit ad624d546f154685cefdb477df2d5eeda36f7b0c -Author: Florian Müllner -Date: Thu Nov 11 01:38:17 2010 +0100 - - st-texture-cache: Fix include - - The file gnome-desktop-thumbnail.h was moved from libgnomeui to - libgnome-desktop. - - https://bugzilla.gnome.org/show_bug.cgi?id=634555 - -diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c -index a40590e..0d8aac2 100644 ---- a/src/st/st-texture-cache.c -+++ b/src/st/st-texture-cache.c -@@ -5,7 +5,7 @@ - #include "st-texture-cache.h" - #include - #define GNOME_DESKTOP_USE_UNSTABLE_API --#include -+#include - #include - #include - diff --git a/gnome-shell-gtk3-2.91.6.patch b/gnome-shell-gtk3-2.91.6.patch deleted file mode 100644 index 7ca7643..0000000 --- a/gnome-shell-gtk3-2.91.6.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 7ce65e421b0123d3a86fa26aca5f991c5987f45e -Author: Jason D. Clinton -Date: Thu Dec 2 16:07:34 2010 -0600 - - Fix compilation against latest GTK+-3 changes - - GDK_WINDOW_XWINDOW has been removed. All calls should use - gdk_x11_window_get_xid() instead. - -diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c -index a3b9153..01a5a4d 100644 ---- a/src/shell-embedded-window.c -+++ b/src/shell-embedded-window.c -@@ -106,7 +106,7 @@ shell_embedded_window_realize (GtkWidget *widget) - * modifying the GDK hierarchy. - */ - XReparentWindow (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget)), -- GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)), -+ gdk_x11_window_get_xid (gtk_widget_get_window (widget)), - window->priv->stage_xwindow, - window->priv->position.x, window->priv->position.y); - } -diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c -index c138418..a7c7bbe 100644 ---- a/src/shell-gtk-embed.c -+++ b/src/shell-gtk-embed.c -@@ -39,7 +39,7 @@ shell_gtk_embed_on_window_realize (GtkWidget *widget, - * screen. - */ - clutter_x11_texture_pixmap_set_window (CLUTTER_X11_TEXTURE_PIXMAP (embed), -- GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)), -+ gdk_x11_window_get_xid (gtk_widget_get_window (widget)), - FALSE); - } - -diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c -index e5cc2a6..37db2e0 100644 ---- a/src/tray/na-tray-child.c -+++ b/src/tray/na-tray-child.c -@@ -420,7 +420,7 @@ na_tray_child_force_redraw (NaTrayChild *child) - gtk_widget_get_allocation (widget, &allocation); - - xev.xexpose.type = Expose; -- xev.xexpose.window = GDK_WINDOW_XWINDOW (plug_window); -+ xev.xexpose.window = gdk_x11_window_get_xid (plug_window); - xev.xexpose.x = 0; - xev.xexpose.y = 0; - xev.xexpose.width = allocation.width; -diff --git a/src/tray/na-tray-manager.c b/src/tray/na-tray-manager.c -index bccda63..64300bc 100644 ---- a/src/tray/na-tray-manager.c -+++ b/src/tray/na-tray-manager.c -@@ -601,7 +601,7 @@ na_tray_manager_set_orientation_property (NaTrayManager *manager) - SYSTEM_TRAY_ORIENTATION_VERT; - - XChangeProperty (GDK_DISPLAY_XDISPLAY (display), -- GDK_WINDOW_XWINDOW (window), -+ gdk_x11_window_get_xid (window), - orientation_atom, - XA_CARDINAL, 32, - PropModeReplace, -@@ -646,7 +646,7 @@ na_tray_manager_set_visual_property (NaTrayManager *manager) - data[0] = XVisualIDFromVisual (xvisual); - - XChangeProperty (GDK_DISPLAY_XDISPLAY (display), -- GDK_WINDOW_XWINDOW (window), -+ gdk_x11_window_get_xid (window), - visual_atom, - XA_VISUALID, 32, - PropModeReplace, -@@ -724,7 +724,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager, - xev.data.l[0] = timestamp; - xev.data.l[1] = gdk_x11_atom_to_xatom_for_display (display, - manager->selection_atom); -- xev.data.l[2] = GDK_WINDOW_XWINDOW (window); -+ xev.data.l[2] = gdk_x11_window_get_xid (window); - xev.data.l[3] = 0; /* manager specific data */ - xev.data.l[4] = 0; /* manager specific data */ - diff --git a/gnome-shell-old-gsd.patch b/gnome-shell-old-gsd.patch new file mode 100644 index 0000000..a248d20 --- /dev/null +++ b/gnome-shell-old-gsd.patch @@ -0,0 +1,15 @@ +Index: gnome-shell-2.91.5/js/ui/status/accessibility.js +=================================================================== +--- gnome-shell-2.91.5.orig/js/ui/status/accessibility.js ++++ gnome-shell-2.91.5/js/ui/status/accessibility.js +@@ -82,8 +82,8 @@ ATIndicator.prototype = { + let magnifier = this._buildItem(_("Zoom"), MAGNIFIER_SCHEMA, 'show-magnifier'); + this.menu.addMenuItem(magnifier); + +- let textZoom = this._buildFontItem(); +- this.menu.addMenuItem(textZoom); ++ // let textZoom = this._buildFontItem(); ++ // this.menu.addMenuItem(textZoom); + + let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup'); + this.menu.addMenuItem(screenReader); diff --git a/gnome-shell.changes b/gnome-shell.changes index 2324883..1671765 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,142 @@ +------------------------------------------------------------------- +Fri Jan 14 15:25:47 CET 2011 - vuntz@opensuse.org + +- Update to version 2.91.5: + + When dragging from an application, allow switching to a + different application by entering the Activities Overview and + then hovering over the target application + + Prioritize chat messages when displaying notifications + + Don't time out critical notifications + + Bluetooth indicator fixes: + - Hide the indicator if no devices present, and fix keynav + for hidden indicators + - Move the "Send To" item to the bottom + - Misc bug fixes + + Shell Toolkit: + - Add st_box_layout_insert_before + + Add another secret run dialog command ('rt') to reload just the + CSS + + Fix a bug that was causing the hot corner to not work after + unlocking the screen saver. + + Make Alt-F1 leave the overview as well as enter it + + Further fixes to LD_LIBRARY_PATH setting + + Pick up clock settings from system preferences + + Build fixes, work with GTK+-2.99 + + Code cleanups + + Visual and behavior tweaks + + Misc bug fixes + + Bugs fixed: bgo#601731, bgo#604336, bgo#630934, bgo#630942, + bgo#632151, bgo#633200, bgo#635695, bgo#636371, bgo#636971, + bgo#637104, bgo#637681, bgo#637690, bgo#637803, bgo#637810, + bgo#637829, bgo#637830, bgo#638158, bgo#638306, bgo#638315, + bgo#638453, bgo#638728, bgo#638815, bgo#638990, bgo#639213. + + Updated translations. +- Drop gnome-shell-CVE-2010-4000.patch: fixed upstream. +- Add Url tag. +- Define a BUILD_AGAINST_GNOME3 macro, to help for the build: some + things need to be changed when we don't build against a real + GNOME 3 desktop, but only as a preview. +- Add gnome-shell-old-gsd.patch that we apply when we build + gnome-shell as a preview only: this disables the "Large text" + item in the accessibility status menu, that requires + gnome-settings-daemon 3. +- Add gnome-settings-daemon Requires when we build against GNOME 3. +- Add gsettings-desktop-schemas Requires. + +------------------------------------------------------------------- +Fri Jan 7 20:46:09 CET 2011 - vuntz@opensuse.org + +- Update to version 2.91.4: + + Add Bluetooth system status indicator + + Implement inline expandable submenus + + Add category filters to application browser + + Add resident and transient notifications to message tray: + - transient: temporary message that doesn't migrate to summary + - area resident: stays around as long as application is running + + Implement keynav to the panel and message tray with + Control-Alt-Tab + + Implement different border widths for different sides in + Shell Toolkit CSS handling + + Rework magnifier code to avoid overhead when not magnifying + + Improve algorithm for proportional tracking in magnifier + + Update for GTK+ 3 changes + + Fix workspaces switching and menus for RTL + + Use symbolic icons for system notifications + + Don't animate windows on other workspaces when going to the + overview + + Don't do slide-out animation when scrubbing between menus + + Fix blinking when updating status icons + + Tweaks and fixes for visual bugs + + String translation marking fixes + + Code cleanups + + Build fixes + + Miscellaneous bug fixes + + Bugs fixed: bgo#595379, bgo#618312, bgo#618885, bgo#622451, + bgo#623706, bgo#624900, bgo#624935, bgo#626132, bgo#629950, + bgo#629984, bgo#631004, bgo#633412, bgo#633476, bgo#633553, + bgo#633582, bgo#633719, bgo#634550, bgo#634560, bgo#634691, + bgo#634755, bgo#634814, bgo#635393, bgo#635647, bgo#635728, + bgo#635880, bgo#635991, bgo#636137, bgo#636151, bgo#636155, + bgo#636317, bgo#636330, bgo#636489, bgo#636975, bgo#636982, + bgo#636983, bgo#637353, bgo#637477, bgo#637559. + + Updated translations. +- Changes from version 2.91.3: + + New layout for overview + - The complex dash is replaced with a narrower line of icons, + giving more space for the windows + - A set of "tabs" is added at the top of the overview for + selecting between Windows/Applications (and eventually files) + - Grid vs. linear workspace view distinction is gone + - Desktop background stays fixed rather than zooming + - Enhanced feedback is added while dragging and dropping + favorites + + Native power and battery status icon and drop-down + + Optimization: + - Report paint volumes to take advantage of partial stage + repaints in Clutter 1.5 + - Skip drawing transparent backgrounds and borders + - Use new smart background drawing functionality in Mutter + - Don't clear the stage since we paint over all of it + - Use a more efficient way of tracking actor under the drag + icon during DND + + Make links in message tray messages clickable + + Add timestamps to expanded chat + + StIcon + - Import MxIcon + - Make colorize symbolic icons and follow icon theme changes + - Add ability to load GIcon + - Add drop shadow support + + Use StLabel for StTooltip to support full CSS styling + + Visual and UI tweaks + - invisible status is removed from the user menu as raising + various problematical IM interactions + - Restart option is removed from the user menu as less + generally useful and not worth the clutter + - Make the volume dropdown much simpler + + Use the raw WM_CLASS value rather than the window title for + applications that aren't properly associated with a desktop + file + + Fix interaction of accessibility menu with GSettings keys + + Fix annoying misbehavior with window snapback during DND in the + linear workspace view + + Correct copyright and license notices for St + + When creating an extension, print where we created it + + Fix memory management crashers + + Build fixes + + Misc bug fixes + + Bugs fixed: bgo#610219, bgo#613448, bgo#622450, bgo#622451, + bgo#624361, bgo#624584, bgo#630752, bgo#630932, bgo#632824, + bgo#633036, bgo#633595, bgo#633657, bgo#633853, bgo#633865, + bgo#633866, bgo#634225, bgo#634329, bgo#634451, bgo#634550, + bgo#634552, bgo#634555, bgo#634693, bgo#634736, bgo#634752, + bgo#634767, bgo#634769, bgo#634781, bgo#634836, bgo#634865, + bgo#634948, bgo#635141, bgo#635199, bgo#635264, bgo#635272, + bgo#635278, bgo#635288, bgo#635367, bgo#635471, bgo#635608, + bgo#635712. + + Updated translations. +- Drop gnome-shell-fix-include.patch, + gnome-shell-gtk3-2.91.6.patch: both are fixed upstream. + ------------------------------------------------------------------- Wed Jan 5 11:01:48 CET 2011 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 5f16127..b61108c 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-shell +# spec file for package gnome-shell (Version 2.91.5) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,25 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define BUILD_AGAINST_GNOME3 0 Name: gnome-shell -Version: 2.91.2 -Release: 2 +Version: 2.91.5 +Release: 1 +# FIXME: whenever we have GNOME3 as default desktop, remove BUILD_AGAINST_GNOME3 stuff, and gnome-shell-old-gsd.patch License: GPLv2+ Summary: GNOME Shell Group: System/GUI/GNOME +Url: http://live.gnome.org/GnomeShell Source: %{name}-%{version}.tar.bz2 # To integrate a preview mode in GDM. # Note: this also explains the Requires on gnome-session below. Source1: gnome-shell-session Source2: gnome3.desktop -# PATCH-FIX-UPSTREAM gnome-shell-fix-include.patch vuntz@opensuse.org -- Taken from git, to fix the build after an include moved in gnome-desktop -Patch0: gnome-shell-fix-include.patch -# PATCH-FIX-UPSTREAM gnome-shell-gtk3-2.91.6.patch vuntz@opensuse.org -- Fix build with recent gtk3, taken from git -Patch1: gnome-shell-gtk3-2.91.6.patch -# PATCH-FIX-UPSTREAM gnome-shell-CVE-2010-4000.patch bnc#642827 bgo#638728 CVE-2010-4000 vuntz@opensuse.org -- Really safely set LD_LIBRARY_PATH -Patch2: gnome-shell-CVE-2010-4000.patch +# PATCH-FIX-OPENSUSE gnome-shell-old-gsd.patch vuntz@opensuse.org -- Remove "Large text" option since it's based on a gsettings schema coming from a newer gnome-settings-daemon than what we have +Patch0: gnome-shell-old-gsd.patch BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: pkgconfig(clutter-1.0) @@ -54,6 +52,11 @@ BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(mutter-plugins) BuildRequires: pkgconfig(xfixes) Requires: gnome-session +%if %BUILD_AGAINST_GNOME3 +# For a GSettings schema +Requires: gnome-settings-daemon +%endif +Requires: gsettings-desktop-schemas # mutter-devel doesn't automatically bring mutter Requires: mutter Recommends: %{name}-lang @@ -69,9 +72,9 @@ documents, and organizing open windows in GNOME. %lang_package %prep %setup -q +%if ! %BUILD_AGAINST_GNOME3 %patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%endif %build %configure \ @@ -92,7 +95,6 @@ install -m755 %{S:1} %{buildroot}%{_libexecdir}/%{name}/ install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/ %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome3.desktop -%suse_update_desktop_file gnome-shell-clock-preferences install -d -m755 %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/ @@ -114,19 +116,19 @@ rm -rf %{buildroot} %files -f %{name}.schemas_list %defattr(-,root,root) %doc COPYING -%{_bindir}/* -%{_libexecdir}/gnome-shell +%{_bindir}/gnome-shell +%{_libexecdir}/gnome-shell/ %if "%{_libdir}" != "%{_libexecdir}" -%{_libdir}/gnome-shell +%{_libdir}/gnome-shell/ %endif -%{_libdir}/mutter/plugins/*.so -%{_datadir}/applications/*.desktop +%{_libdir}/mutter/plugins/libgnome-shell.so +%{_datadir}/applications/gnome-shell.desktop %{_datadir}/glib-2.0/schemas/org.gnome.accessibility.magnifier.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml %{_datadir}/gnome-shell/ -%{_datadir}/xsessions/*.desktop +%{_datadir}/xsessions/gnome3.desktop %{_sysconfdir}/xdg/menus/gs-applications.menu -%doc %{_mandir}/man?/*.* +%doc %{_mandir}/man?/gnome-shell.* %files lang -f %{name}.lang