rpms/cheese
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix a locking problem

Browse Source
This commit is contained in:
Matthias Clasen 2008-02-15 16:41:23 +00:00
parent b6822d096c
commit 6952970a2c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cheese.spec
View File

@ -1,6 +1,6 @@
Name: cheese Name: cheese
Version: 2.21.91 Version: 2.21.91
Release: 2%{?dist} Release: 3%{?dist}
Summary: A webcam application for snapshots and movies Summary: A webcam application for snapshots and movies
Group: Amusements/Graphics Group: Amusements/Graphics
@ -9,6 +9,8 @@ URL: http://live.gnome.org/Cheese
Source0: http://download.gnome.org/sources/cheese/2.21/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/cheese/2.21/%{name}-%{version}.tar.bz2
Source1: cheese-bugreport.sh Source1: cheese-bugreport.sh
Patch0: libexecdir.patch Patch0: libexecdir.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=516697
Patch1: lockup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.10.0 BuildRequires: gtk2-devel >= 2.10.0
@ -44,6 +46,7 @@ gstreamer-backend.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .libexecdir %patch0 -p1 -b .libexecdir
%patch1 -p1 -b .lockup
cp %{SOURCE1} data cp %{SOURCE1} data
autoreconf autoreconf
@ -111,6 +114,9 @@ fi
%{_libexecdir}/cheese-bugreport.sh %{_libexecdir}/cheese-bugreport.sh
%changelog %changelog
* Fri Feb 15 2008 Matthias Clasen <mclasen@redhat.com> 2.21.91-3
- Fix a locking problem that causes the UI to freeze
* Fri Feb 8 2008 Matthias Clasen <mclasen@redhat.com> 2.21.91-2 * Fri Feb 8 2008 Matthias Clasen <mclasen@redhat.com> 2.21.91-2
- Rebuild for gcc 4.3 - Rebuild for gcc 4.3

13
lockup.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up cheese-2.21.91/src/cheese-window.c.lockup cheese-2.21.91/src/cheese-window.c
--- cheese-2.21.91/src/cheese-window.c.lockup 2008-02-15 11:36:20.000000000 -0500
+++ cheese-2.21.91/src/cheese-window.c 2008-02-15 11:36:58.000000000 -0500
@@ -1129,7 +1129,9 @@ setup_camera (CheeseWindow *cheese_windo
cheese_effect_chooser_get_selection (CHEESE_EFFECT_CHOOSER (cheese_window->effect_chooser)));
cheese_webcam_play (cheese_window->webcam);
+ gdk_threads_enter ();
gtk_notebook_set_current_page (GTK_NOTEBOOK(cheese_window->notebook), 0);
+ gdk_threads_leave ();
ephy_spinner_stop (EPHY_SPINNER (cheese_window->throbber));
}