pool/gnome-shell
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 47655 from home:vuntz:branches:GNOME:Factory

Browse Source 
ok

OBS-URL: https://build.opensuse.org/request/show/47655
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=29
This commit is contained in:
Vincent Untz 2010-09-09 22:16:08 +00:00 committed by Git OBS Bridge
parent 89f779dc20
commit 77fa01b90c
4 changed files with 91 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome-shell-fix-recent-gtk3.patch Normal file
View File

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

23
gnome-shell-libmozjs.patch
View File

@ -1,23 +0,0 @@
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

61
gnome-shell.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
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
@ -5,31 +28,27 @@ Thu Jul 15 08:46:45 CEST 2010 - dimstar@opensuse.org
+ 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
+ Update the jhbuild to build the GTK+ 3.0 stack
+ 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#621014: Allow notification action buttons to be icons
- bgo#621845: [gnome-shell.modules] Fix gtk+ dep, add librsvg
- bgo#623353: can't compile shell after glib added as module in
jhbuild
- bgo#623494: [TelepathyClient] Missing presence notifications
- bgo#623640: Work around g-ir-scanner problem with
Gdk.Rectangle
- bgo#623687: startup notification animation shouldn't bounce
- bgo#623889: wrong gtk used by mutter gir scanner while
building Shell gir leads to failure of build
- Replace gtk2-devel BuildRequires with pkgconfig(gtk+-3.0)
- Add gconf2_gsettings_* macros to post, postun and preamble.
- 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
+ UI changes and additions:
- Expand notification icons on hover to show title
- Display an animation on the app menu title for startup
notification
@ -45,21 +64,21 @@ Sat Jun 26 18:23:09 CEST 2010 - dimstar@opensuse.org
effects
- Use status icons from the icon theme
- Misc tweaks
+ Switch from GConf to GSettings [Milan]
+ 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
+ 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
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()
@ -78,7 +97,7 @@ Sat Jun 26 18:23:09 CEST 2010 - dimstar@opensuse.org
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}
- Use %{?_smp_mflags} for parallel build.
-------------------------------------------------------------------
Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
@ -94,7 +113,7 @@ Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
- 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
+ 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
@ -104,7 +123,7 @@ Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
http://shell-perf.gnome.org
+ Add an initial application menu in the top panel; currently
just has a Quit option.
+ User interface enhancements
+ 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
@ -128,7 +147,7 @@ Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
+ 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
+ Shell Toolkit:
- Add methods to add/remove individual names from style class
- Add hover tracking to StWidget
- Refactor drawing from StWidget to StThemeNode
@ -138,7 +157,7 @@ Thu May 27 13:21:38 CEST 2010 - dimstar@opensuse.org
- Add a StContainer base class with common container
functionality
- Add a StGroup container to mix fixed positioning with CSS
+ Looking Glass
+ Looking Glass:
- Add window list
- Replace properties tab with a properties popup
+ GTK+ 3 compat: Build properly against GTK+ with -DGSEAL_ENABLE

53
gnome-shell.spec
View File

@ -28,29 +28,30 @@ Source: %{name}-%{version}.tar.bz2
# Note: this also explains the Requires on gnome-session below.
Source1: gnome-shell-session
Source2: gnome3.desktop
# PATCH-FIX-OPENSUSE gnome-shell-libmozjs.patch vuntz@novell.com -- LD_LIBRARY_PATH neeeds to be set on 11.1
Patch99: gnome-shell-libmozjs.patch
BuildRequires: clutter-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: gconf2-devel
# 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
BuildRequires: gir-repository
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-menus-devel
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: intltool
BuildRequires: libgjs-devel
BuildRequires: librsvg-devel
BuildRequires: mutter-devel
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(gnome-desktop-3.0)
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
Requires: %{name}-lang = %{version}
BuildRequires: pkgconfig(libgnome-menu)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(mutter-plugins)
BuildRequires: pkgconfig(xfixes)
Requires: gnome-session
# mutter-devel doesn't automatically bring mutter
Requires: mutter
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%glib2_gsettings_schema_requires
@ -63,19 +64,13 @@ documents, and organizing open windows in GNOME.
%lang_package
%prep
%setup -q
%if %suse_version <= 1110
%patch99 -p1
%endif
%patch0 -p1
%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 \
--libexecdir=%{_libexecdir}/%{name} \
--disable-static \
--libexecdir=%{_libexecdir}/%{name} \
--disable-schemas-install \
--enable-compile-warnings=no
%__make %{?_smp_mflags}
@ -99,16 +94,16 @@ rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%post
%glib2_gsettings_schema_post
%postun
%glib2_gsettings_schema_postun
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc COPYING