rpms/gnome-shell
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuilt for new gtk3 and gnome-desktop3

Browse Source
This commit is contained in:
Tomas Bzatek 2011-06-17 16:49:28 +02:00
parent 542b428708
commit 337272a2f5
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-shell-3.0.2-st-icon-colors-atomic.patch Normal file
View File

@ -0,0 +1,30 @@
From 22ef63cc44dca76c625e529951b5a10e397a1950 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 02 Jun 2011 20:22:28 +0000
Subject: st-icon-colors: Use non-deprecated GAtomic API
---
diff --git a/src/st/st-icon-colors.c b/src/st/st-icon-colors.c
index 0655246..21bec6e 100644
--- a/src/st/st-icon-colors.c
+++ b/src/st/st-icon-colors.c
@@ -53,7 +53,7 @@ st_icon_colors_ref (StIconColors *colors)
g_return_val_if_fail (colors != NULL, NULL);
g_return_val_if_fail (colors->ref_count > 0, colors);
- g_atomic_int_add ((volatile int *)&colors->ref_count, 1);
+ g_atomic_int_inc ((volatile int *)&colors->ref_count);
return colors;
}
@@ -71,7 +71,7 @@ st_icon_colors_unref (StIconColors *colors)
g_return_if_fail (colors != NULL);
g_return_if_fail (colors->ref_count > 0);
- if (g_atomic_int_exchange_and_add ((volatile int *)&colors->ref_count, -1) - 1 == 0)
+ if (g_atomic_int_dec_and_test ((volatile int *)&colors->ref_count))
g_slice_free (StIconColors, colors);
}
--
cgit v0.9

30
gnome-shell-3.0.2-st-shadow-atomic.patch Normal file
View File

@ -0,0 +1,30 @@
From af51e8df7b9ce8a00e533e6b3c61d92580ff6e3e Mon Sep 17 00:00:00 2001
From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 02 Jun 2011 21:05:16 +0000
Subject: st-shadow: Use non-deprecated GAtomic API
---
diff --git a/src/st/st-shadow.c b/src/st/st-shadow.c
index 335e496..9c3784a 100644
--- a/src/st/st-shadow.c
+++ b/src/st/st-shadow.c
@@ -82,7 +82,7 @@ st_shadow_ref (StShadow *shadow)
g_return_val_if_fail (shadow != NULL, NULL);
g_return_val_if_fail (shadow->ref_count > 0, shadow);
- g_atomic_int_add (&shadow->ref_count, 1);
+ g_atomic_int_inc (&shadow->ref_count);
return shadow;
}
@@ -100,7 +100,7 @@ st_shadow_unref (StShadow *shadow)
g_return_if_fail (shadow != NULL);
g_return_if_fail (shadow->ref_count > 0);
- if (g_atomic_int_exchange_and_add (&shadow->ref_count, -1) - 1 == 0)
+ if (g_atomic_int_dec_and_test (&shadow->ref_count))
g_slice_free (StShadow, shadow);
}
--
cgit v0.9

10
gnome-shell.spec
View File

@ -1,6 +1,6 @@
Name: gnome-shell
Version: 3.0.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Window management and application launching for GNOME
Group: User Interface/Desktops
@ -10,6 +10,9 @@ URL: http://live.gnome.org/GnomeShell
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.0/%{name}-%{version}.tar.bz2
Patch0: gnome-shell-avoid-redhat-menus.patch
# from upstream
Patch1: gnome-shell-3.0.2-st-shadow-atomic.patch
Patch2: gnome-shell-3.0.2-st-icon-colors-atomic.patch
%define clutter_version 1.4.0
%define gobject_introspection_version 0.10.1
@ -80,6 +83,8 @@ easy to use experience.
%prep
%setup -q
%patch0 -p1 -b .avoid-redhat-menus
%patch1 -p1 -b .st-shadow-atomic
%patch2 -p1 -b .st-icon-colors-atomic
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@ -139,6 +144,9 @@ gconftool-2 --makefile-install-rule \
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
%changelog
* Fri Jun 17 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.0.2-2
- Rebuilt for new gtk3 and gnome-desktop3
* Wed May 25 2011 Owen Taylor <otaylor@redhat.com> - 3.0.2-1
- Update to 3.0.2