Accepting request 461130 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/461130
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-weather?expand=0&rev=61

gnome-weather-work-with-new-gjs.patch

@@ -0,0 +1,34 @@
+From 39c65724bef050561fb605f29019bc60669710ec Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Tue, 14 Feb 2017 17:11:54 -0800
+Subject: Avoid double declaration with 'let'
+
+The following is a syntax error in ES6:
+
+    let a = 'something';
+    let a = 'other thing';
+
+Previously GJS would silently accept this, but in GJS 1.48.0 it will be
+a syntax error. This fixes the one instance where it happens.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=778641
+---
+ src/app/window.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/app/window.js b/src/app/window.js
+index aaf27f5..8eb0499 100644
+--- a/src/app/window.js
++++ b/src/app/window.js
+@@ -218,7 +218,7 @@ const MainWindow = new Lang.Class({
+ 
+         let copyright = 'Copyright 2013-2015 The Weather Developers';
+         let attribution = this._cityView.info ? this._cityView.info.get_attribution() : '';
+-        let copyright = copyright + (attribution ? '\n' + attribution : '');
++        copyright += attribution ? '\n' + attribution : '';
+         let aboutDialog = new Gtk.AboutDialog(
+             { artists: artists,
+               authors: [ 'Giovanni Campagna <gcampagna@src.gnome.org>' ],
+-- 
+cgit v0.12
+

gnome-weather.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 27 17:31:42 UTC 2017 - zaitor@opensuse.org
+
+- Add gnome-weather-work-with-new-gjs.patch: No longer crash on
+  launch when using gjs 1.48 or newer (bgo#778641).
+
 -------------------------------------------------------------------
 Tue Aug 16 15:48:09 UTC 2016 - zaitor@opensuse.org
 

gnome-weather.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-weather
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ License:        GPL-2.0+
 Group:          Productivity/Other
 Url:            https://live.gnome.org/Design/Apps/Weather
 Source:         http://download.gnome.org/sources/gnome-weather/3.20/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-weather-work-with-new-gjs.patch bgo#778641 zaitor@opensuse.org -- No longer crash with gjs 1.48
+Patch0:         gnome-weather-work-with-new-gjs.patch
 BuildRequires:  gjs
 BuildRequires:  intltool >= 0.26
 BuildRequires:  update-desktop-files
@@ -63,6 +65,7 @@ search results from GNOME Weather.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure