From cf8e9feeec3d8d73e9045a42a39f8bbf4104a909 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mar 19 2012 23:19:36 +0000
Subject: 3.3.92


---

diff --git a/.gitignore b/.gitignore
index d2aa1cc..f0da5de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ cheese-2.31.1.tar.bz2
 /cheese-3.3.4.tar.xz
 /cheese-3.3.5.tar.xz
 /cheese-3.3.90.tar.xz
+/cheese-3.3.92.tar.xz
diff --git a/0001-Avoid-a-code-generation-problem.patch b/0001-Avoid-a-code-generation-problem.patch
new file mode 100644
index 0000000..4c26dca
--- /dev/null
+++ b/0001-Avoid-a-code-generation-problem.patch
@@ -0,0 +1,38 @@
+From 461fb6c873d1b2f67149d8e59546bb754cde09c4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 19 Mar 2012 19:09:37 -0400
+Subject: [PATCH] Avoid a code generation problem
+
+For some reason vala generates bad code with parameters shadowing
+statics when the parameter name is the same as the member variable.
+The concrete effect is
+
+** (cheese:3628): CRITICAL **: cheese_main_window_finish_countdown_callback: assertion `self != NULL' failed
+
+making it impossible to take any photos.
+---
+ src/cheese-countdown.vala |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cheese-countdown.vala b/src/cheese-countdown.vala
+index 81b9059..a04197a 100644
+--- a/src/cheese-countdown.vala
++++ b/src/cheese-countdown.vala
+@@ -80,11 +80,11 @@ internal class Cheese.Countdown : GLib.Object
+   /**
+    * Start the countdown, using the countdown-duration GSetting for the time.
+    *
+-   * @param completed_callback the callback to call upon countdown completion
++   * @param cc the callback to call upon countdown completion
+    */
+-  public void start (CountdownCallback completed_callback)
++  public void start (CountdownCallback cc)
+   {
+-    this.completed_callback = completed_callback;
++    this.completed_callback = cc;
+     this.current_value = settings.get_int("countdown-duration");
+     running = true;
+     countdown_actor.show ();
+-- 
+1.7.9.3
+
diff --git a/cheese.spec b/cheese.spec
index d273f14..0f6fc08 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,7 +1,7 @@
 Name:           cheese
 Epoch:          2
-Version:        3.3.90
-Release:        2%{?dist}
+Version:        3.3.92
+Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
@@ -10,6 +10,9 @@ URL:            http://projects.gnome.org/cheese/
 #VCS: git:git://git.gnome.org/cheese
 Source0:        http://download.gnome.org/sources/cheese/3.3/%{name}-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=671110
+Patch0: 0001-Avoid-a-code-generation-problem.patch
+
 BuildRequires: gtk3-devel >= 3.0.0
 BuildRequires: gstreamer-devel >= 0.10.23
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.12
@@ -66,6 +69,7 @@ for writing applications that require a webcam display widget.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -140,6 +144,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gir-1.0/Cheese-3.0.gir
 
 %changelog
+* Mon Mar 18 2012 Matthias Clasen <mclasen@redhat.com> - 2:3.3.92-1
+- Update to 3.3.92
+- Make photo shooting work again
+
 * Sat Mar 10 2012 Matthias Clasen <mclasen@redhat.com> - 2:3.3.90-2
 - Rebuild against new cogl
 
diff --git a/sources b/sources
index 5de623d..b830344 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44a0c8683223236f7e83e7dc7d53a8c0  cheese-3.3.90.tar.xz
+5416cc213be5592a13df4cb2b9fbce04  cheese-3.3.92.tar.xz