Accepting request 61100 from home:vuntz:branches:GNOME:Factory
Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/61100 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=46
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
5bab479695
commit
ed5fbf5d22
@ -2,7 +2,15 @@ Index: gnome-shell-2.91.6/js/ui/status/accessibility.js
|
||||
===================================================================
|
||||
--- gnome-shell-2.91.6.orig/js/ui/status/accessibility.js
|
||||
+++ gnome-shell-2.91.6/js/ui/status/accessibility.js
|
||||
@@ -83,8 +83,8 @@ ATIndicator.prototype = {
|
||||
@@ -77,39 +77,39 @@ ATIndicator.prototype = {
|
||||
client.add_dir(KEY_META_DIR, GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
|
||||
client.notify_add(KEY_META_DIR, Lang.bind(this, this._keyChanged), null, null);
|
||||
|
||||
- let highContrast = this._buildHCItem();
|
||||
- this.menu.addMenuItem(highContrast);
|
||||
+ // let highContrast = this._buildHCItem();
|
||||
+ // this.menu.addMenuItem(highContrast);
|
||||
|
||||
let magnifier = this._buildItem(_("Zoom"), MAGNIFIER_SCHEMA, 'show-magnifier');
|
||||
this.menu.addMenuItem(magnifier);
|
||||
|
||||
@ -11,8 +19,46 @@ Index: gnome-shell-2.91.6/js/ui/status/accessibility.js
|
||||
+ // let textZoom = this._buildFontItem();
|
||||
+ // this.menu.addMenuItem(textZoom);
|
||||
|
||||
let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
|
||||
this.menu.addMenuItem(screenReader);
|
||||
- let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
|
||||
- this.menu.addMenuItem(screenReader);
|
||||
+ // let screenReader = this._buildItem(_("Screen Reader"), AT_SCREEN_READER_SCHEMA, 'startup');
|
||||
+ // this.menu.addMenuItem(screenReader);
|
||||
|
||||
- let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
|
||||
- this.menu.addMenuItem(screenKeyboard);
|
||||
+ // let screenKeyboard = this._buildItem(_("Screen Keyboard"), AT_SCREEN_KEYBOARD_SCHEMA, 'startup');
|
||||
+ // this.menu.addMenuItem(screenKeyboard);
|
||||
|
||||
let visualBell = this._buildItemGConf(_("Visual Alerts"), client, KEY_VISUAL_BELL);
|
||||
this.menu.addMenuItem(visualBell);
|
||||
|
||||
- let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
|
||||
- this.menu.addMenuItem(stickyKeys);
|
||||
+ // let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA, KEY_STICKY_KEYS_ENABLED);
|
||||
+ // this.menu.addMenuItem(stickyKeys);
|
||||
|
||||
- let slowKeys = this._buildItem(_("Slow Keys"), A11Y_SCHEMA, KEY_SLOW_KEYS_ENABLED);
|
||||
- this.menu.addMenuItem(slowKeys);
|
||||
+ // let slowKeys = this._buildItem(_("Slow Keys"), A11Y_SCHEMA, KEY_SLOW_KEYS_ENABLED);
|
||||
+ // this.menu.addMenuItem(slowKeys);
|
||||
|
||||
- let bounceKeys = this._buildItem(_("Bounce Keys"), A11Y_SCHEMA, KEY_BOUNCE_KEYS_ENABLED);
|
||||
- this.menu.addMenuItem(bounceKeys);
|
||||
+ // let bounceKeys = this._buildItem(_("Bounce Keys"), A11Y_SCHEMA, KEY_BOUNCE_KEYS_ENABLED);
|
||||
+ // this.menu.addMenuItem(bounceKeys);
|
||||
|
||||
- let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
|
||||
- this.menu.addMenuItem(mouseKeys);
|
||||
+ // let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
|
||||
+ // this.menu.addMenuItem(mouseKeys);
|
||||
|
||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||
this.menu.addAction(_("Universal Access Settings"), function() {
|
||||
- Util.spawnDesktop('gnome-universal-access-panel');
|
||||
+ Util.spawnDesktop('at-properties');
|
||||
});
|
||||
},
|
||||
|
||||
Index: gnome-shell-2.91.6/js/ui/panel.js
|
||||
===================================================================
|
||||
--- gnome-shell-2.91.6.orig/js/ui/panel.js
|
||||
@ -35,7 +81,13 @@ Index: gnome-shell-2.91.6/js/ui/statusMenu.js
|
||||
===================================================================
|
||||
--- gnome-shell-2.91.6.orig/js/ui/statusMenu.js
|
||||
+++ gnome-shell-2.91.6/js/ui/statusMenu.js
|
||||
@@ -159,7 +159,7 @@ StatusMenuButton.prototype = {
|
||||
@@ -154,12 +154,12 @@ StatusMenuButton.prototype = {
|
||||
|
||||
_onMyAccountActivate: function() {
|
||||
Main.overview.hide();
|
||||
- Util.spawnDesktop('gnome-user-accounts-panel');
|
||||
+ Util.spawnDesktop('gnome-about-me');
|
||||
},
|
||||
|
||||
_onPreferencesActivate: function() {
|
||||
Main.overview.hide();
|
||||
|
||||
@ -1,13 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 13 16:16:33 CET 2011 - vuntz@opensuse.org
|
||||
|
||||
- Call relevant macros in %post/%postun:
|
||||
+ %desktop_database_post/postun because the package ships at
|
||||
least one desktop file.
|
||||
- Pass %{?no_lang_C} to %find_lang so that english documentation
|
||||
can be packaged with the program, and not in the lang subpackage.
|
||||
- Change python-gnome Requires to python-gconf and python-gobject
|
||||
Requires: that should be enough.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 9 10:12:27 UTC 2011 - fcrozat@novell.com
|
||||
|
||||
- Enforce requirements on dbus-1-python, gjs,
|
||||
- Add explicit Requires on dbus-1-python, gjs,
|
||||
gdk-pixbuf-loader-rsvg, gnome-icon-theme-symbolic.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 7 11:13:30 UTC 2011 - dimstar@opensuse.org
|
||||
|
||||
- Drop gnome-shell-old-gsd.patch, obsoleted by new patch
|
||||
- Drop gnome-shell-old-gsd.patch, obsoleted by new patch.
|
||||
- Add gnome-shell-integrate_114.patch: contains the feature from
|
||||
gnome-shell-old-gsd.patch plus any other modification required to
|
||||
properly integrate on openSUSE 11.4. Current fixes are:
|
||||
@ -16,6 +27,8 @@ Mon Feb 7 11:13:30 UTC 2011 - dimstar@opensuse.org
|
||||
+ launch gnomecc instead of gnome-control-ceter (systemMenu)
|
||||
+ launch gnome-about-me for 'My Accounts' (systemMenu)
|
||||
+ Remove keyboard indicator applet.
|
||||
+ Disable accessibility features that do not function (better not
|
||||
show than not work).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 3 14:18:45 CET 2011 - dimstar@opensuse.org
|
||||
@ -43,7 +56,7 @@ Thu Feb 3 14:18:45 CET 2011 - dimstar@opensuse.org
|
||||
edges for StScrollView
|
||||
+ Work around problems with keyboard input when IBus is in use
|
||||
+ Centralize application launching and display errors in the
|
||||
mesage tray
|
||||
message tray
|
||||
+ Add a generic modal dialog base class used for run dialog and
|
||||
for new system dialogs
|
||||
+ Require shell extensions to declare the versions they are
|
||||
@ -61,7 +74,7 @@ Thu Feb 3 14:18:45 CET 2011 - dimstar@opensuse.org
|
||||
- Make it easier to activate a window by hovering during
|
||||
inter-app drag-and-drop
|
||||
+ Visual tweaks
|
||||
+ bugs fixed: bgo#600771, bgo#601393, bgo#612599, bgo#620391,
|
||||
+ Bugs fixed: bgo#600771, bgo#601393, bgo#612599, bgo#620391,
|
||||
bgo#621659, bgo#623708, bgo#626658, bgo#629557, bgo#632109,
|
||||
bgo#632595, bgo#634226, bgo#635034, bgo#635089, bgo#636650,
|
||||
bgo#636717, bgo#636976, bgo#637187, bgo#638071, bgo#638896,
|
||||
@ -70,7 +83,7 @@ Thu Feb 3 14:18:45 CET 2011 - dimstar@opensuse.org
|
||||
bgo#639979, bgo#640085, bgo#640206, bgo#640415, bgo#640447,
|
||||
bgo#640464, bgo#640493, bgo#640494, bgo#640508, bgo#640560,
|
||||
bgo#640688, bgo#641049, bgo#641067.
|
||||
- BuildRequire pkgconfig(libedataserver-1.2).
|
||||
- Add pkgconfig(libedataserver-1.2) BuildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 14 15:25:47 CET 2011 - vuntz@opensuse.org
|
||||
|
||||
@ -54,6 +54,10 @@ BuildRequires: pkgconfig(libpulse-mainloop-glib)
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||
BuildRequires: pkgconfig(mutter-plugins)
|
||||
BuildRequires: pkgconfig(xfixes)
|
||||
Requires: dbus-1-python
|
||||
Requires: gdk-pixbuf-loader-rsvg
|
||||
Requires: gjs
|
||||
Requires: gnome-icon-theme-symbolic
|
||||
Requires: gnome-session
|
||||
%if 0%BUILD_AGAINST_GNOME3
|
||||
# For a GSettings schema
|
||||
@ -62,11 +66,8 @@ Requires: gnome-settings-daemon
|
||||
Requires: gsettings-desktop-schemas
|
||||
# mutter-devel doesn't automatically bring mutter
|
||||
Requires: mutter
|
||||
Requires: python-gnome
|
||||
Requires: dbus-1-python
|
||||
Requires: gjs
|
||||
Requires: gdk-pixbuf-loader-rsvg
|
||||
Requires: gnome-icon-theme-symbolic
|
||||
Requires: python-gconf
|
||||
Requires: python-gobject
|
||||
Recommends: %{name}-lang
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%gconf_schemas_prereq
|
||||
@ -95,7 +96,7 @@ documents, and organizing open windows in GNOME.
|
||||
%install
|
||||
%makeinstall
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%find_lang %{name}
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%suse_update_desktop_file %{name}
|
||||
%find_gconf_schemas
|
||||
# Preview mode for GNOME 3
|
||||
@ -117,9 +118,11 @@ rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%glib2_gsettings_schema_post
|
||||
%desktop_database_post
|
||||
|
||||
%postun
|
||||
%glib2_gsettings_schema_postun
|
||||
%desktop_database_postun
|
||||
|
||||
%files -f %{name}.schemas_list
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user