Accepting request 481261 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/481261
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-weather?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2017-03-20 10:47:22 +00:00 committed by Git OBS Bridge
parent f06f83cb92
commit 0fa9b8cba8
5 changed files with 15 additions and 43 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b
size 5360264

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574
size 5358924

View File

@ -1,34 +0,0 @@
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

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Mar 20 09:13:00 UTC 2017 - zaitor@opensuse.org
- Update to version 3.24.0:
+ Updates for the new version of gjs (bgo#778641).
+ Improvements to the build system for GNOME Builder.
+ Updated translations.
- Drop gnome-weather-work-with-new-gjs.patch: Fixed upstream.
-------------------------------------------------------------------
Mon Feb 27 17:31:42 UTC 2017 - zaitor@opensuse.org

View File

@ -18,15 +18,13 @@
Name: gnome-weather
%define _name org.gnome.Weather
Version: 3.20.2
Version: 3.24.0
Release: 0
Summary: Weather App for GNOME
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
Source: http://download.gnome.org/sources/gnome-weather/3.24/%{name}-%{version}.tar.xz
BuildRequires: gjs
BuildRequires: intltool >= 0.26
BuildRequires: update-desktop-files
@ -65,7 +63,6 @@ search results from GNOME Weather.
%lang_package
%prep
%setup -q
%patch0 -p1
%build
%configure
@ -90,7 +87,7 @@ make %{?_smp_mflags}
%defattr(-,root,root)
%{_bindir}/%{name}
%dir %{_datadir}/appdata
%{_datadir}/appdata/org.gnome.Weather.Application.appdata.xml
%{_datadir}/appdata/org.gnome.Weather.appdata.xml
%{_datadir}/applications/org.gnome.Weather.Application.desktop
%{_datadir}/%{_name}/
%{_datadir}/dbus-1/services/org.gnome.Weather.Application.service