Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=3917967d1d3c750a5ed650f8eeca552cb4b3cc61

commit 3917967d1d3c750a5ed650f8eeca552cb4b3cc61
Author: Baste <[email protected]>
Date:   Tue Mar 20 11:12:55 2012 +0100

cheese-3.3.92-2-x86_64
* add cheese-countdown.diff
* add vala makedepends

diff --git a/source/gnome/cheese/FrugalBuild b/source/gnome/cheese/FrugalBuild
index 2bfe272..92faece 100644
--- a/source/gnome/cheese/FrugalBuild
+++ b/source/gnome/cheese/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=cheese
pkgver=3.3.92
-pkgrel=1
+pkgrel=2
pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures 
and videos from a webcam."
url="http://www.gnome.org/projects/cheese";
depends=('librsvg>=2.26.0-2' 'gst-plugins-good>=0.10.16-3' 
'gst-plugins-base>=0.10.36' 'gst-plugins-base-pango' \
@@ -11,7 +11,7 @@ depends=('librsvg>=2.26.0-2' 'gst-plugins-good>=0.10.16-3' 
'gst-plugins-base>=0.
'gst-plugins-good-video4linux2' 'db>=4.7.25-2' 'gnome-desktop>=3.2.1' \
'gst-plugins-bad-mpeg2enc' 'gst-plugins-base-ogg' 'gst-plugins-base-theora' 
'gst-plugins-base-vorbis' 'gst-plugins-good-gconf' \
'libgudev' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk>=1.0.2-3' 'mx' 
'gst-plugins-bad-vp8enc')
-makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 
'gconf>=2.28.0' 'krb5' 'gobject-introspection' 'itstool')
+makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 
'gconf>=2.28.0' 'krb5' 'gobject-introspection' 'itstool' 'vala')
rodepends=('cheese-devel')
groups=('gnome')
archs=('i686' 'x86_64')
@@ -31,7 +31,9 @@ _F_gnome_iconcache="y"
_F_gnome_desktop="y"
_F_gnome_glib="y"
Finclude gnome gnome-scriptlet
-sha1sums=('b0148c632619f68888413aa6d9e6ef924fbe6d71')
+source=($source cheese-countdown.diff)
+sha1sums=('b0148c632619f68888413aa6d9e6ef924fbe6d71' \
+          'bd4c88ee20f91fbc16d86ae597b66517ab3c0462')

build() {
Fbuild
diff --git a/source/gnome/cheese/cheese-countdown.diff 
b/source/gnome/cheese/cheese-countdown.diff
new file mode 100644
index 0000000..b60c1ad
--- /dev/null
+++ b/source/gnome/cheese/cheese-countdown.diff
@@ -0,0 +1,37 @@
+From 461fb6c873d1b2f67149d8e59546bb754cde09c4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[email protected]>
+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
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to