Accepting request 47760 from GNOME:Factory

checked in (request 47760)

OBS-URL: https://build.opensuse.org/request/show/47760
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=30
This commit is contained in:
OBS User autobuild 2010-09-13 12:11:13 +00:00 committed by Git OBS Bridge
parent 77fa01b90c
commit 5808197a7c
6 changed files with 61 additions and 265 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b
size 669050

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0193c51d0f934f26193f7522adbbb09e01da6eab977580f6f255bbeecb3a6d0
size 720054

View File

@ -1,27 +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);

View File

@ -0,0 +1,23 @@
Index: gnome-shell-0.0.1/src/gnome-shell.in
===================================================================
--- gnome-shell-0.0.1.orig/src/gnome-shell.in
+++ gnome-shell-0.0.1/src/gnome-shell.in
@@ -151,6 +151,18 @@ def start_shell():
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
+ else:
+ # code taken from jhbuild
+ uname = os.uname()
+ use_lib64 = (uname[0], uname[4]) in [ ('Linux', 'x86_64'),
+ ('Linux', 'ppc64'),
+ ('Linux', 's390x') ]
+ del uname
+ if use_lib64:
+ mozjs_libdir = '/usr/lib64/xulrunner-1.9'
+ else:
+ mozjs_libdir = '/usr/lib/xulrunner-1.9'
+ env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
if not options.verbose:
# Unless verbose() is specified, only let gjs show errors and

View File

@ -1,197 +1,3 @@
-------------------------------------------------------------------
Thu Sep 9 23:24:35 CEST 2010 - vuntz@opensuse.org
- Add gnome-shell-fix-recent-gtk3.patch to fix build with recent
GTK+ 3.
- Drop gnome-shell-libmozjs.patch: it was needed for 11.1 only, and
the package won't work there anyway. Also remove the workaround
for the 11.1 build.
- Change old-style BuildRequires to pkgconfig() style
BuildRequires:
+ old-style: clutter-devel, dbus-1-glib-devel, gconf2-devel,
gnome-menus-devel, gstreamer-0_10-devel,
gstreamer-0_10-plugins-base-devel, libgjs-devel, mutter-devel,
xorg-x11-devel.
+ new-style: clutter-1.0, dbus-glib-1, gconf-2.0, gio-2.0,
gjs-1.0, gobject-introspection-1.0, gstreamer-0.10,
gstreamer-base-0.10, libgnome-menu,
libstartup-notification-1.0, mutter-plugins, xfixes.
- Change lang Requires to Recommends.
- Do not call autoreconf: it's not needed.
- Pass --disable-schemas-install to configure.
- Remove unneeded librsvg-devel BuildRequires.
-------------------------------------------------------------------
Thu Jul 15 08:46:45 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.5:
+ Build against and depend on GTK+-3.0
+ If a notification ID has a name matching a themed icon, use the
icon for that button when displaying the notification
+ Work around problems with typedef GdkRectangle
cairo_rectangle_int_t
+ Visual tweak: don't bounce the startup notification back and
forth
+ Build fixes
+ Bugs fixed:
- bgo#623494: [TelepathyClient] Missing presence notifications
- Other bugs: bgo#621014, bgo#621845, bgo#623353, bgo#623640,
bgo#623687, bgo#623889
- Replace gtk2-devel BuildRequires with pkgconfig(gtk+-3.0) and
gnome-desktop-devel with pkgconfig(gnome-desktop-3.0).
- Add pkgconfig(libcroco-0.6) BuildRequires.
- Add gconf2_gsettings_* macros to post, postun and preamble. Note
that there are still some gconf schemas, so we don't remove
anything from the gconf schema handling.
-------------------------------------------------------------------
Sat Jun 26 18:23:09 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.4:
+ UI changes and additions:
- Expand notification icons on hover to show title
- Display an animation on the app menu title for startup
notification
- Add a right-click option on the clock to get to the
preference dialog
- Add sections to the application browser in the overview
- Add week-number support to calendar
- Hide application menu in overview
+ Visual improvements:
- Fade in the alt-Tab popups, use consistent fade-in timings
- Use the same code and visuals for all menu popups
- Use newly implemented CSS style transitions to animate hover
effects
- Use status icons from the icon theme
- Misc tweaks
+ Switch from GConf to GSettings:
- Use the dconf backend
- Followup fixes
+ Stop Ubuntu indicators on startup (this causes proper fallback
to the system tray specification)
+ Right-to-left locale fixes
+ Multihead fixes
+ St [Shell Toolkit] improvements:
- Add 'transition-duration' property for animated style changes
- Implement CSS 'outline' property
- Implement CSS 'text-align' property
- Add st_describe_actor() and use it for Actor.toString in JS
- Add st_texture_cache_load_sliced_image
- Add st_set_slow_down_factor() to replace
Tweener.slowDownFactor
+ Replace the frame count in perf stats with an accurate frame
rate
+ Add 'x' format specifier and field width to our String.format()
+ Code cleanups
+ Build fixes
+ Bugs fixed: bgo#597481, bgo#598349, bgo#600276, bgo#602466,
bgo#603532, bgo#610868, bgo#611095, bgo#611269, bgo#612635,
bgo#613286, bgo#613907, bgo#614131, bgo#617281, bgo#617917,
bgo#618055, bgo#618873, bgo#619025, bgo#619083, bgo#619203,
bgo#619236, bgo#619240, bgo#619515, bgo#619516, bgo#619521,
bgo#619541, bgo#619693, bgo#619854, bgo#620125, bgo#620374,
bgo#620377, bgo#620378, bgo#620381, bgo#620404, bgo#620504,
bgo#620525, bgo#620775, bgo#620782, bgo#620783, bgo#620855,
bgo#620899, bgo#620940, bgo#620997, bgo#621083, bgo#621123,
bgo#621140, bgo#621197, bgo#621247, bgo#621382, bgo#621385,
bgo#621582, bgo#621668, bgo#621669, bgo#622050, bgo#622236,
bgo#622243, bgo#622249, bgo#622308, bgo#622395, bgo#622447,
bgo#622458, bgo#622508
- Use %{?_smp_mflags} for parallel build.
-------------------------------------------------------------------
Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.2:
+ Add a magnifier to the shell
+ Make the clock configurable via GConf and add a simple
preferences dialog (gnome-shell-clock-preferences)
+ Message tray:
- Support inline chatting in IM notifications; IM notifications
now use Telepathy, rather than the generic notification
protocol.
- Display urgent notifications first and fully expanded
- Pop out last notification when mousing over summary area
- Don't time out the tray if the user is mousing towards it
+ Shell performance framework:
- Add a performance event log that tracks events (such as frame
paints), and statistics such as malloc'ed memory.
- Javascript "performance scripts" drive the shell and then
extract "metrics" such as the frame rate when zooming to the
overview.
- Recorded performance data can be uploaded to
http://shell-perf.gnome.org
+ Add an initial application menu in the top panel; currently
just has a Quit option.
+ User interface enhancements:
- Allow using the middle mouse button to open an instance of an
application on a new workspace
- Restyle user status menu to match application menu, rather
than being an out-of-place GTK+ menu
- Add keyboard navigation of menus
- Raise all windows for an application when alt-Tabbing to it
or clicking on it in the app well
- Restore click-and-hold menus for app-well icons
- Fade in windows on map rather than scaling them in
- Remove icon and menu from window titlebar
- In linear view, activate the drop-target workspace
- When dragging on linear workspace view, detect when the user
*didn't* mean to "throw" to the next workspace
- Always hide the info (e.g. undo) bar after a short timeout
- Provide the feedback in the info bar when it is not possible
to create new workspace or remove the current workspace
- Visual tweaks
+ Run dialog:
- Don't add duplicates to the history
- Accept Enter (keypad) key in addition to Return.
+ Remove the sidebar; it's not the direction we want to go for
"gizmos", and the unfinished version was showing up in too many
screenshots.
+ Shell Toolkit:
- Add methods to add/remove individual names from style class
- Add hover tracking to StWidget
- Refactor drawing from StWidget to StThemeNode
- Add support for "spread radius" to shadows
- Shadow all background/border elements, not just the
background image
- Add a StContainer base class with common container
functionality
- Add a StGroup container to mix fixed positioning with CSS
+ Looking Glass:
- Add window list
- Replace properties tab with a properties popup
+ GTK+ 3 compat: Build properly against GTK+ with -DGSEAL_ENABLE
+ Call JS_MaybeGC at idle, hopefully reducing GC pauses
+ Move user files to XDG_DATA_HOME, rather than ~/.gnome2
+ Remove libbig, rewriting remaining code to use ST instead
+ Pick up system settings for font rendering
+ Support application identification by startup notification
properties
+ Many bug fixes for full-screen window handling
+ Improve identification of primary monitor for multihead
+ Prefer eject over unmount for the eject button in places
+ Fix many bugs with using the wrong functions to get event
state, then block the wrong functions once and for all
+ Build fixes
+ Code cleanups
+ Bugs fixed: bgo#610726, bgo#610801, bgo#610872, bgo#610892,
bgo#611609, bgo#611610, bgo#611612, bgo#611613, bgo#611660,
bgo#611754, bgo#612072, bgo#612200, bgo#612635, bgo#612651,
bgo#612833, bgo#612967, bgo#613101, bgo#613164, bgo#613195,
bgo#613367, bgo#613405, bgo#613428, bgo#613456, bgo#613536,
bgo#613731, bgo#613749, bgo#613804, bgo#613832, bgo#613944,
bgo#613964, bgo#614047, bgo#614144, bgo#614293, bgo#614362,
bgo#614516, bgo#614660, bgo#614702, bgo#614725, bgo#614755,
bgo#614905, bgo#614972, bgo#614974, bgo#614975, bgo#614978,
bgo#615004, bgo#615590, bgo#615592, bgo#615621, bgo#616051,
bgo#616574, bgo#616706, bgo#616951, bgo#617555, bgo#617785,
bgo#617959, bgo#618062, bgo#618104, bgo#618189, bgo#618258,
bgo#618295, bgo#618371, bgo#618378, bgo#618438, bgo#618460,
bgo#618482, bgo#618793, bgo#618915, bgo#618918, bgo#619008,
bgo#619044, bgo#619113, bgo#619144, bgo#619276, bgo#619580,
bgo#619623
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 23 21:43:54 CET 2010 - vuntz@opensuse.org Tue Mar 23 21:43:54 CET 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-shell (Version 2.31.5) # spec file for package gnome-shell (Version 2.29.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -15,46 +15,43 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: gnome-shell Name: gnome-shell
Version: 2.31.5 BuildRequires: clutter-devel
Release: 1 BuildRequires: dbus-1-glib-devel
BuildRequires: gconf2-devel
BuildRequires: gir-repository
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-menus-devel
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libgjs-devel
BuildRequires: librsvg-devel
BuildRequires: mutter-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
License: GPLv2+ License: GPLv2+
Summary: GNOME Shell
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.29.1
Release: 1
Summary: GNOME Shell
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
# To integrate a preview mode in GDM. # To integrate a preview mode in GDM.
# Note: this also explains the Requires on gnome-session below. # Note: this also explains the Requires on gnome-session below.
Source1: gnome-shell-session Source1: gnome-shell-session
Source2: gnome3.desktop Source2: gnome3.desktop
# PATCH-FIX-UPSTREAM gnome-shell-fix-recent-gtk3.patch vuntz@opensuse.org -- Fix build with recent GTK+ 3, taken from git # PATCH-FIX-OPENSUSE gnome-shell-libmozjs.patch vuntz@novell.com -- LD_LIBRARY_PATH neeeds to be set on 11.1
Patch0: gnome-shell-fix-recent-gtk3.patch Patch99: gnome-shell-libmozjs.patch
BuildRequires: gir-repository Requires: %{name}-lang = %{version}
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gjs-1.0)
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gstreamer-0.10)
BuildRequires: pkgconfig(gstreamer-base-0.10)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcroco-0.6)
BuildRequires: pkgconfig(libgnome-menu)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(mutter-plugins)
BuildRequires: pkgconfig(xfixes)
Requires: gnome-session Requires: gnome-session
# mutter-devel doesn't automatically bring mutter # mutter-devel doesn't automatically bring mutter
Requires: mutter Requires: mutter
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq %gconf_schemas_prereq
%glib2_gsettings_schema_requires
%description %description
The GNOME Shell redefines user interactions with the GNOME desktop. In The GNOME Shell redefines user interactions with the GNOME desktop. In
@ -64,19 +61,25 @@ documents, and organizing open windows in GNOME.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1 %if %suse_version <= 1110
%patch99 -p1
%endif
%build %build
autoreconf -fi
%if %suse_version <= 1110
# ugly workaround for a build failure on 11.1. The same workaround seems to be needed on Ubuntu.
export LD_LIBRARY_PATH=%{_libdir}/xulrunner-1.9
%endif
%configure \ %configure \
--disable-static \
--libexecdir=%{_libexecdir}/%{name} \ --libexecdir=%{_libexecdir}/%{name} \
--disable-schemas-install \ --disable-static \
--enable-compile-warnings=no --enable-compile-warnings=no
%__make %{?_smp_mflags} %__make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
%find_lang %{name} %find_lang %{name}
%suse_update_desktop_file %{name} %suse_update_desktop_file %{name}
%find_gconf_schemas %find_gconf_schemas
@ -85,12 +88,11 @@ install -m755 %{S:1} %{buildroot}%{_libexecdir}/%{name}/
install -d -m755 %{buildroot}%{_datadir}/xsessions install -d -m755 %{buildroot}%{_datadir}/xsessions
install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/ install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome3.desktop %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 install -d -m755 %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart
cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/ cp %{buildroot}%{_datadir}/applications/gnome-shell.desktop %{buildroot}%{_datadir}/gnome-shell/xdg-override/autostart/
%clean %clean
rm -rf %{buildroot} rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre %pre -f %{name}.schemas_pre
@ -98,12 +100,6 @@ rm -rf %{buildroot}
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
%post
%glib2_gsettings_schema_post
%postun
%glib2_gsettings_schema_postun
%files -f %{name}.schemas_list %files -f %{name}.schemas_list
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING %doc COPYING
@ -114,10 +110,8 @@ rm -rf %{buildroot}
%endif %endif
%{_libdir}/mutter/plugins/*.so %{_libdir}/mutter/plugins/*.so
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
%{_datadir}/gnome-shell/ %{_datadir}/gnome-shell/
%{_datadir}/xsessions/*.desktop %{_datadir}/xsessions/*.desktop
%{_sysconfdir}/xdg/menus/gs-applications.menu
%doc %{_mandir}/man?/*.* %doc %{_mandir}/man?/*.*
%files lang -f %{name}.lang %files lang -f %{name}.lang