Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ae3d5aed68f23bdf515775e1c11084ec7a399314
commit ae3d5aed68f23bdf515775e1c11084ec7a399314 Author: Baste <[email protected]> Date: Tue Oct 13 12:43:15 2015 +0200 cheese-3.18.1-1-x86_64 - 3.18.0 -> 3.18.1 diff --git a/source/gnome/cheese/FrugalBuild b/source/gnome/cheese/FrugalBuild index 3659abc..6f4a43f 100644 --- a/source/gnome/cheese/FrugalBuild +++ b/source/gnome/cheese/FrugalBuild @@ -2,10 +2,8 @@ # Maintainer: Baste <[email protected]> # Contributor: bouleetbil <[email protected]> -options+=('asneeded') - pkgname=cheese -pkgver=3.18.0 +pkgver=3.18.1 pkgrel=1 pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam." url="http://www.gnome.org/projects/cheese"; @@ -36,8 +34,7 @@ _F_gnome_glib="y" _F_gnome_devel="n" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet -#source=($source cheese-countdown.diff) -sha1sums=('b4b536d0b9037b9a363417d1fe3096ac14200f43') +sha1sums=('a77214dbabb90bbbc754f1c4792468fc92f97f13') build() { diff --git a/source/gnome/cheese/cheese-countdown.diff b/source/gnome/cheese/cheese-countdown.diff deleted file mode 100644 index b60c1ad..0000000 --- a/source/gnome/cheese/cheese-countdown.diff +++ /dev/null @@ -1,37 +0,0 @@ -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
