commit gnome-sound-recorder for openSUSE:Factory

Hello community, here is the log from the commit of package gnome-sound-recorder for openSUSE:Factory checked in at 2015-11-04 15:33:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-sound-recorder (Old) and /work/SRC/openSUSE:Factory/.gnome-sound-recorder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-sound-recorder" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-sound-recorder/gnome-sound-recorder.changes 2015-10-26 12:48:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-sound-recorder.new/gnome-sound-recorder.changes 2015-11-04 15:33:38.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Oct 30 15:30:45 UTC 2015 - zaitor@opensuse.org + +- Add gsd-bgo756993-Check-for-null-clock.patch: Check for a null + clock before getting the time. Crash fix from upstream git + (bgo#756993). + +------------------------------------------------------------------- New: ---- gsd-bgo756993-Check-for-null-clock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-sound-recorder.spec ++++++ --- /var/tmp/diff_new_pack.gNjfBn/_old 2015-11-04 15:33:39.000000000 +0100 +++ /var/tmp/diff_new_pack.gNjfBn/_new 2015-11-04 15:33:39.000000000 +0100 @@ -26,6 +26,8 @@ Url: https://wiki.gnome.org/Design/Apps/SoundRecorder Source0: http://download.gnome.org/sources/gnome-sound-recorder/3.18/%{name}-%{version}.tar.xz Source99: gnome-sound-recorder-rpmlintrc +# PATCH-FIX-UPSTREAM gsd-bgo756993-Check-for-null-clock.patch bgo#756993 zaitor@opensuse.org -- Check for a null clock before getting the time. +Patch0: gsd-bgo756993-Check-for-null-clock.patch BuildRequires: gjs BuildRequires: intltool >= 0.26 BuildRequires: update-desktop-files @@ -47,6 +49,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure ++++++ gsd-bgo756993-Check-for-null-clock.patch ++++++ m 41fba8a6bda05f97eac1b12a1decb3bc9482b059 Mon Sep 17 00:00:00 2001 From: Meg Ford Date: Thu, 29 Oct 2015 19:44:15 -0500 Subject: Bug 756993 Check for a null clock before getting the time. --- src/play.js | 11 ++++++++++- src/record.js | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/play.js b/src/play.js index c4fe641..017042f 100644 --- a/src/play.js +++ b/src/play.js @@ -188,7 +188,16 @@ const Play = new Lang.Class({ MainWindow.view.setLabel(0); } - let absoluteTime = this.clock.get_time(); + let absoluteTime = 0; + + if (this.clock == null) { + this.clock = this.play.get_clock(); + } + try { + absoluteTime = this.clock.get_time(); + } catch(error) { + // no-op + } if (this.baseTime == 0) this.baseTime = absoluteTime; diff --git a/src/record.js b/src/record.js index f58a1be..f455f59 100644 --- a/src/record.js +++ b/src/record.js @@ -247,7 +247,16 @@ const Record = new Lang.Class({ let value = Math.pow(10, val/20); this.peak = value; - this.absoluteTime = this.clock.get_time(); + + if (this.clock == null) { + this.clock = this.pipeline.get_clock(); + } + try { + this.absoluteTime = this.clock.get_time(); + } catch(error) { + this.absoluteTime = 0; + } + if (this.baseTime == 0) this.baseTime = this.absoluteTime; -- cgit v0.11.2