Accepting request 49903 from home:vuntz:branches:GNOME:Factory
Thanks OBS-URL: https://build.opensuse.org/request/show/49903 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=35
This commit is contained in:
Git OBS Bridge
parent
3f7cc9dc8f
commit
96a2b291c9
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f0193c51d0f934f26193f7522adbbb09e01da6eab977580f6f255bbeecb3a6d0
|
||||
size 720054
|
||||
3
gnome-shell-2.91.0.tar.bz2
Normal file
3
gnome-shell-2.91.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02e8e6fa055acb34af0d783e1cc1d9128c0d91a651228d9a1c23e03db5320ea2
|
||||
size 763593
|
||||
@ -1,147 +0,0 @@
|
||||
From 3fb7cce80fa18315d81619fa511a057b1c3b6131 Mon Sep 17 00:00:00 2001
|
||||
From: Adel Gadllah <adel.gadllah@gmail.com>
|
||||
Date: Fri, 16 Jul 2010 20:24:22 +0000
|
||||
Subject: Drop custom ClutterActor.contains
|
||||
|
||||
Clutter 1.4 does provides a native implementation
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=624571
|
||||
---
|
||||
diff --git a/js/ui/environment.js b/js/ui/environment.js
|
||||
index 22f8e19..6bab830 100644
|
||||
--- a/js/ui/environment.js
|
||||
+++ b/js/ui/environment.js
|
||||
@@ -82,11 +82,6 @@ function init() {
|
||||
Clutter.Actor.prototype.toString = function() {
|
||||
return St.describe_actor(this);
|
||||
};
|
||||
- Clutter.Actor.prototype.contains = function(child) {
|
||||
- while (child != null && child != this)
|
||||
- child = child.get_parent();
|
||||
- return child != null;
|
||||
- };
|
||||
|
||||
_blockMethod('Clutter.Event.get_state', 'Shell.get_event_state',
|
||||
'gjs\'s handling of Clutter.ModifierType is broken. See bug 597292.');
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
From 766b5b801c1a23d1e8c346f29664f3a68ffe4816 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Müllner <fmuellner@gnome.org>
|
||||
Date: Tue, 10 Aug 2010 08:52:18 +0000
|
||||
Subject: [St] Remove _st_actor_contains()
|
||||
|
||||
The function has been upstreamed as clutter_actor_contains() - with
|
||||
the switch to clutter-1.4 it is now available to the Shell, so it
|
||||
is no longer necessary to keep a copy in-tree.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=626512
|
||||
---
|
||||
diff --git a/src/st/st-clickable.c b/src/st/st-clickable.c
|
||||
index abed5be..38cc41f 100644
|
||||
--- a/src/st/st-clickable.c
|
||||
+++ b/src/st/st-clickable.c
|
||||
@@ -121,7 +121,7 @@ st_clickable_button_press_event (ClutterActor *actor,
|
||||
if (self->priv->held)
|
||||
return TRUE;
|
||||
|
||||
- if (!_st_actor_contains (actor, event->source))
|
||||
+ if (!clutter_actor_contains (actor, event->source))
|
||||
return FALSE;
|
||||
|
||||
self->priv->held = TRUE;
|
||||
@@ -148,7 +148,7 @@ st_clickable_button_release_event (ClutterActor *actor,
|
||||
self->priv->held = FALSE;
|
||||
clutter_ungrab_pointer ();
|
||||
|
||||
- if (!_st_actor_contains (actor, event->source))
|
||||
+ if (!clutter_actor_contains (actor, event->source))
|
||||
return FALSE;
|
||||
|
||||
set_pressed (self, FALSE);
|
||||
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
|
||||
index 7da2886..7c4170c 100644
|
||||
--- a/src/st/st-entry.c
|
||||
+++ b/src/st/st-entry.c
|
||||
@@ -584,7 +584,7 @@ st_entry_enter_event (ClutterActor *actor,
|
||||
{
|
||||
StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
|
||||
|
||||
- if (_st_actor_contains (actor, event->source)
|
||||
+ if (clutter_actor_contains (actor, event->source)
|
||||
&& priv->hint && priv->hint_visible)
|
||||
{
|
||||
st_widget_set_hover (ST_WIDGET (actor), TRUE);
|
||||
@@ -597,7 +597,7 @@ static gboolean
|
||||
st_entry_leave_event (ClutterActor *actor,
|
||||
ClutterCrossingEvent *event)
|
||||
{
|
||||
- if (!_st_actor_contains (actor, event->related))
|
||||
+ if (!clutter_actor_contains (actor, event->related))
|
||||
st_widget_set_hover (ST_WIDGET (actor), FALSE);
|
||||
|
||||
return CLUTTER_ACTOR_CLASS (st_entry_parent_class)->leave_event (actor, event);
|
||||
diff --git a/src/st/st-private.c b/src/st/st-private.c
|
||||
index 248c703..c1614b0 100644
|
||||
--- a/src/st/st-private.c
|
||||
+++ b/src/st/st-private.c
|
||||
@@ -320,12 +320,3 @@ _st_set_text_from_style (ClutterText *text,
|
||||
clutter_text_set_line_alignment (text, (PangoAlignment) align);
|
||||
}
|
||||
}
|
||||
-
|
||||
-gboolean
|
||||
-_st_actor_contains (ClutterActor *actor,
|
||||
- ClutterActor *child)
|
||||
-{
|
||||
- while (child != NULL && child != actor)
|
||||
- child = clutter_actor_get_parent (child);
|
||||
- return child != NULL;
|
||||
-}
|
||||
diff --git a/src/st/st-private.h b/src/st/st-private.h
|
||||
index eecd7fd..8368665 100644
|
||||
--- a/src/st/st-private.h
|
||||
+++ b/src/st/st-private.h
|
||||
@@ -72,7 +72,4 @@ void _st_allocate_fill (StWidget *parent,
|
||||
void _st_set_text_from_style (ClutterText *text,
|
||||
StThemeNode *theme_node);
|
||||
|
||||
-gboolean _st_actor_contains (ClutterActor *actor,
|
||||
- ClutterActor *child);
|
||||
-
|
||||
#endif /* __ST_PRIVATE_H__ */
|
||||
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
|
||||
index eb976ac..d4850a7 100644
|
||||
--- a/src/st/st-widget.c
|
||||
+++ b/src/st/st-widget.c
|
||||
@@ -568,7 +568,7 @@ st_widget_enter (ClutterActor *actor,
|
||||
|
||||
if (priv->track_hover)
|
||||
{
|
||||
- if (_st_actor_contains (actor, event->source))
|
||||
+ if (clutter_actor_contains (actor, event->source))
|
||||
st_widget_set_hover (ST_WIDGET (actor), TRUE);
|
||||
else
|
||||
{
|
||||
@@ -594,7 +594,7 @@ st_widget_leave (ClutterActor *actor,
|
||||
|
||||
if (priv->track_hover)
|
||||
{
|
||||
- if (!_st_actor_contains (actor, event->related))
|
||||
+ if (!clutter_actor_contains (actor, event->related))
|
||||
st_widget_set_hover (ST_WIDGET (actor), FALSE);
|
||||
}
|
||||
|
||||
@@ -1589,7 +1589,10 @@ st_widget_sync_hover (StWidget *widget)
|
||||
pointer = clutter_device_manager_get_core_device (device_manager,
|
||||
CLUTTER_POINTER_DEVICE);
|
||||
pointer_actor = clutter_input_device_get_pointer_actor (pointer);
|
||||
- st_widget_set_hover (widget, _st_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
|
||||
+ if (pointer_actor)
|
||||
+ st_widget_set_hover (widget, clutter_actor_contains (CLUTTER_ACTOR (widget), pointer_actor));
|
||||
+ else
|
||||
+ st_widget_set_hover (widget, FALSE);
|
||||
}
|
||||
|
||||
/**
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
@ -1,112 +0,0 @@
|
||||
commit cac0848316cd3327c37b401cb527eb7a313f71a6
|
||||
Author: Owen W. Taylor <otaylor@fishsoup.net>
|
||||
Date: Thu Aug 12 20:12:00 2010 -0400
|
||||
|
||||
Remove usage of gdk_screen_get_rgb_colormap()
|
||||
|
||||
gdk_screen_get_rgb_colormap() has been removed from GTK+; there's
|
||||
no longer a special visual that is used for drawing true-color
|
||||
images distinct from the system visual. So, we don't need to
|
||||
check for it; if the visual isn't the system visual, we just
|
||||
fall through to the case where we create a new GdkColormap.
|
||||
|
||||
diff --git a/src/tray/na-tray-child.c b/src/tray/na-tray-child.c
|
||||
index 978880c..067c0bf 100644
|
||||
--- a/src/tray/na-tray-child.c
|
||||
+++ b/src/tray/na-tray-child.c
|
||||
@@ -265,9 +265,7 @@ na_tray_child_new (GdkScreen *screen,
|
||||
|
||||
new_colormap = FALSE;
|
||||
|
||||
- if (visual == gdk_screen_get_rgb_visual (screen))
|
||||
- colormap = gdk_screen_get_rgb_colormap (screen);
|
||||
- else if (visual == gdk_screen_get_rgba_visual (screen))
|
||||
+ if (visual == gdk_screen_get_rgba_visual (screen))
|
||||
colormap = gdk_screen_get_rgba_colormap (screen);
|
||||
else if (visual == gdk_screen_get_system_visual (screen))
|
||||
colormap = gdk_screen_get_system_colormap (screen);
|
||||
--
|
||||
From 178c8c50a0ad42fd58496fc70ca17597f8c20754 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Ermilov <zaspire@rambler.ru>
|
||||
Date: Thu, 09 Sep 2010 14:25:30 +0000
|
||||
Subject: Fix build with recent gtk3
|
||||
|
||||
use new keysyms names
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=629128
|
||||
---
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d46260a..f3b1a45 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -61,7 +61,7 @@ CLUTTER_MIN_VERSION=1.2.8
|
||||
GOBJECT_INTROSPECTION_MIN_VERSION=0.6.11
|
||||
GJS_MIN_VERSION=0.7
|
||||
MUTTER_MIN_VERSION=2.31.4
|
||||
-GTK_MIN_VERSION=2.90.4
|
||||
+GTK_MIN_VERSION=2.90.7
|
||||
GIO_MIN_VERSION=2.25.9
|
||||
|
||||
# Collect more than 20 libraries for a prize!
|
||||
diff --git a/src/st/st-im-text.c b/src/st/st-im-text.c
|
||||
index 29fd71e..23657ae 100644
|
||||
--- a/src/st/st-im-text.c
|
||||
+++ b/src/st/st-im-text.c
|
||||
@@ -231,31 +231,31 @@ key_is_modifier (guint16 keyval)
|
||||
|
||||
switch (keyval)
|
||||
{
|
||||
- case GDK_Shift_L:
|
||||
- case GDK_Shift_R:
|
||||
- case GDK_Control_L:
|
||||
- case GDK_Control_R:
|
||||
- case GDK_Caps_Lock:
|
||||
- case GDK_Shift_Lock:
|
||||
- case GDK_Meta_L:
|
||||
- case GDK_Meta_R:
|
||||
- case GDK_Alt_L:
|
||||
- case GDK_Alt_R:
|
||||
- case GDK_Super_L:
|
||||
- case GDK_Super_R:
|
||||
- case GDK_Hyper_L:
|
||||
- case GDK_Hyper_R:
|
||||
- case GDK_ISO_Lock:
|
||||
- case GDK_ISO_Level2_Latch:
|
||||
- case GDK_ISO_Level3_Shift:
|
||||
- case GDK_ISO_Level3_Latch:
|
||||
- case GDK_ISO_Level3_Lock:
|
||||
- case GDK_ISO_Level5_Shift:
|
||||
- case GDK_ISO_Level5_Latch:
|
||||
- case GDK_ISO_Level5_Lock:
|
||||
- case GDK_ISO_Group_Shift:
|
||||
- case GDK_ISO_Group_Latch:
|
||||
- case GDK_ISO_Group_Lock:
|
||||
+ case GDK_KEY_Shift_L:
|
||||
+ case GDK_KEY_Shift_R:
|
||||
+ case GDK_KEY_Control_L:
|
||||
+ case GDK_KEY_Control_R:
|
||||
+ case GDK_KEY_Caps_Lock:
|
||||
+ case GDK_KEY_Shift_Lock:
|
||||
+ case GDK_KEY_Meta_L:
|
||||
+ case GDK_KEY_Meta_R:
|
||||
+ case GDK_KEY_Alt_L:
|
||||
+ case GDK_KEY_Alt_R:
|
||||
+ case GDK_KEY_Super_L:
|
||||
+ case GDK_KEY_Super_R:
|
||||
+ case GDK_KEY_Hyper_L:
|
||||
+ case GDK_KEY_Hyper_R:
|
||||
+ case GDK_KEY_ISO_Lock:
|
||||
+ case GDK_KEY_ISO_Level2_Latch:
|
||||
+ case GDK_KEY_ISO_Level3_Shift:
|
||||
+ case GDK_KEY_ISO_Level3_Latch:
|
||||
+ case GDK_KEY_ISO_Level3_Lock:
|
||||
+ case GDK_KEY_ISO_Level5_Shift:
|
||||
+ case GDK_KEY_ISO_Level5_Latch:
|
||||
+ case GDK_KEY_ISO_Level5_Lock:
|
||||
+ case GDK_KEY_ISO_Group_Shift:
|
||||
+ case GDK_KEY_ISO_Group_Latch:
|
||||
+ case GDK_KEY_ISO_Group_Lock:
|
||||
return TRUE;
|
||||
default:
|
||||
return FALSE;
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
@ -1,32 +0,0 @@
|
||||
From c6eb2761c719af47248badb2187866ffaff6e671 Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Thu, 30 Sep 2010 15:21:58 +0200
|
||||
Subject: [PATCH] gnome-shell.in: Never add empty elements to LD_LIBRARY_PATH
|
||||
|
||||
An empty element means the current directory, and is insecure.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=631004
|
||||
---
|
||||
src/gnome-shell.in | 6 +++++-
|
||||
1 files changed, 5 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
|
||||
index 163ecfc..b523bde 100755
|
||||
--- a/src/gnome-shell.in
|
||||
+++ b/src/gnome-shell.in
|
||||
@@ -246,7 +246,11 @@ 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'):
|
||||
- env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
|
||||
+ if 'LD_LIBRARY_PATH' in env:
|
||||
+ ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir
|
||||
+ else:
|
||||
+ ld_library_path = mozjs_libdir
|
||||
+ env['LD_LIBRARY_PATH'] = ld_library_path
|
||||
|
||||
# Log everything to stderr (make stderr our "log file")
|
||||
env['GJS_DEBUG_OUTPUT'] = 'stderr'
|
||||
--
|
||||
1.7.2.2
|
||||
|
||||
@ -1,3 +1,61 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 5 10:01:50 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.91.0:
|
||||
+ Move application tray icons from the system status area to the
|
||||
message tray
|
||||
+ Turn on the new Mutter feature for attaching modal dialogs to
|
||||
their parents, and add visual effects of sliding in and dimming
|
||||
the parent window
|
||||
+ Turn on the new Mutter feature for side-by-side tiling
|
||||
+ System status area:
|
||||
- Add Universal Access status indicator
|
||||
- Implement an API for in-process system status indicators
|
||||
- Allow dynamically adding and removing menus from
|
||||
PopupMenuManager
|
||||
- Add toggle-switch menu items
|
||||
- Add horizontal sliders for PopupMenus
|
||||
- Add support for sub-menus
|
||||
- Use symbolic icons when available
|
||||
+ Shell Toolkit
|
||||
- Add :first-child, :last-child pseudo-class support
|
||||
- Add basic suport for background-position CSS property
|
||||
- Add text-shadow CSS property and implement for St.Label
|
||||
- Make padding work for St.Scrollbar
|
||||
- Support symbolic icons for St.TextureCache.load_icon_name()
|
||||
+ Message tray
|
||||
- Focus notifications when clicking on them to display
|
||||
notification, or hovering over them to expand them
|
||||
- Make Esc hide the tray when a notification has focus
|
||||
- Make the whole notification clickable
|
||||
- For expanded notifications, line-wrap long titles rather than
|
||||
ellipsizing
|
||||
- Visual improvements
|
||||
- Auto-expand urgent notifications
|
||||
- Bug and behavior fixes
|
||||
+ Change cursor during drag-and-drop of items to reflect state
|
||||
+ Looking Glass
|
||||
- Enable scroll-wheel to pick parent/child actors
|
||||
- Close inspector on escape
|
||||
+ Remove Alt+W/A/S/D hack for navigation in alt-Tab -
|
||||
was just a Xephyr bug workaround
|
||||
+ Fixes for GTK+-3 changes
|
||||
+ Adapt introspection build and annotations for g-ir-scanner
|
||||
changes
|
||||
+ Add Dash.addSearchProvider(provider) so extensions can register
|
||||
search providers
|
||||
+ Port magnifier to GSettings
|
||||
+ Support compiling and running with XulRunner 2.0
|
||||
+ Optimizations for theme transitions
|
||||
+ Switch to building against Clutter 1.4
|
||||
+ Build fixes
|
||||
+ Cleanups
|
||||
+ Misc bug fixes
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-fix-recent-gtk3.patch,
|
||||
gnome-shell-fix-recent-clutter.patch,
|
||||
gnome-shell-secure-LD_LIBRARY_PATH.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 30 15:28:18 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package gnome-shell (Version 2.31.5)
|
||||
# spec file for package gnome-shell (Version 2.91.0)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
|
||||
Name: gnome-shell
|
||||
Version: 2.31.5
|
||||
Release: 2
|
||||
Version: 2.91.0
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Summary: GNOME Shell
|
||||
Group: System/GUI/GNOME
|
||||
@ -28,12 +28,6 @@ Source: %{name}-%{version}.tar.bz2
|
||||
# Note: this also explains the Requires on gnome-session below.
|
||||
Source1: gnome-shell-session
|
||||
Source2: gnome3.desktop
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-fix-recent-gtk3.patch vuntz@opensuse.org -- Fix build with recent GTK+ 3, taken from git
|
||||
Patch0: gnome-shell-fix-recent-gtk3.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-fix-recent-clutter.patch vuntz@opensuse.org -- Do not use API gone in recent clutter, taken from git
|
||||
Patch1: gnome-shell-fix-recent-clutter.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-secure-LD_LIBRARY_PATH.patch bgo#631004 bnc#642827 vuntz@opensuse.org -- Never add empty elements to LD_LIBRARY_PATH
|
||||
Patch2: gnome-shell-secure-LD_LIBRARY_PATH.patch
|
||||
BuildRequires: intltool
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(clutter-1.0)
|
||||
@ -67,9 +61,6 @@ documents, and organizing open windows in GNOME.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -119,6 +110,7 @@ rm -rf %{buildroot}
|
||||
%endif
|
||||
%{_libdir}/mutter/plugins/*.so
|
||||
%{_datadir}/applications/*.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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user