Accepting request 699585 from GNOME:Factory

New stable rel (forwarded request 696787 from iznogood)

OBS-URL: https://build.opensuse.org/request/show/699585
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-weather?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2019-05-03 20:46:32 +00:00 committed by Git OBS Bridge
commit e6f2f95b89
6 changed files with 79 additions and 84 deletions

View File

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

View File

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

View File

@ -1,29 +0,0 @@
From 44ed7a29bbd3a491c8ad3cd49b76870d728dfa60 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 14 Dec 2017 09:32:43 -0800
Subject: Fix clicking on rows in the places popover
With recent gjs, the access to row._info fails after the row has been
removed from the listbox.
---
src/app/world.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/world.js b/src/app/world.js
index 11219f8..d5f4cf2 100644
--- a/src/app/world.js
+++ b/src/app/world.js
@@ -88,9 +88,9 @@ var WorldContentView = new Lang.Class({
});
this._listbox.connect('row-activated', (listbox, row) => {
- this.hide();
- this.model.moveLocationToFront(row._info);
this._window.showInfo(row._info, false);
+ this.model.moveLocationToFront(row._info);
+ this.hide();
});
this.model.connect('current-location-changed', (model, info) => {
--
cgit v0.12

View File

@ -1,26 +0,0 @@
From bbb0508860004f97a86486d1c0711c195c857005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
Date: Sat, 30 Sep 2017 15:41:53 +0200
Subject: gschema: Fix gettext-domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Special thanks to Sébastien Wilmet for help with deciphering Autotools.
---
data/org.gnome.Weather.Application.gschema.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/org.gnome.Weather.Application.gschema.xml b/data/org.gnome.Weather.Application.gschema.xml
index aaf9d79..2bba122 100644
--- a/data/org.gnome.Weather.Application.gschema.xml
+++ b/data/org.gnome.Weather.Application.gschema.xml
@@ -1,4 +1,5 @@
-<schemalist gettext-domain="org.gnome.Weather.Application">
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="org.gnome.Weather">
<schema id="org.gnome.Weather.Application" path="/org/gnome/Weather/Application/">
<key name="locations" type="av">
<default>[]</default>
--
cgit v0.12

View File

@ -1,8 +1,64 @@
-------------------------------------------------------------------
Mon Apr 22 16:30:40 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.2:
+ Bugs fixed: Logged warning about non-standard use of
`array.toString() on a Uint8Array instance`.
+ Updated translations.
-------------------------------------------------------------------
Fri Apr 5 18:43:51 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.1:
+ Bugs fixed: The app is not translated.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 11 20:35:10 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.32.0:
+ Migrate app menu to primary menu.
+ New icon.
+ Show tomorrow's forecasts at the end of the day.
-------------------------------------------------------------------
Tue Mar 5 05:58:34 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 3.31.92:
+ Bugs fixed: 3.31.90 no longer installs a binary in the path.
+ Updated translations.
-------------------------------------------------------------------
Sun Feb 17 07:11:50 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.90:
+ Port from Autotools to Meson.
+ Show tomorrow's forecasts at the end of the day.
+ Unify App ID.
+ Updated translations.
- Add meson BuildRequires and macros following upstreams port to
meson buildsystem.
-------------------------------------------------------------------
Mon Feb 4 15:39:30 UTC 2019 - Bernhard Wiedemann <bwiedemann@suse.com>
- Stop using arch-specific libdir (boo#1109687)
-------------------------------------------------------------------
Fri Jan 4 22:50:12 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.31.3:
+ Migrate app menu to primary menu.
+ New icon.
+ Update GJS dependency.
+ Updated translations.
- Drop upstream fixed patches:
+ gnome-weather-fix-gettext-domain.patch.
+ gnome-weather-fix-clicking-rows-places-popover.patch.
- Drop unneeded gjs BuildRequires, we have the pkgconfig variant
already.
- Drop glib2_gsettings_schema_requires, no longer needed.
-------------------------------------------------------------------
Sat Mar 17 22:12:01 UTC 2018 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-weather
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 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
@ -12,42 +12,36 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _name org.gnome.Weather
Name: gnome-weather
Version: 3.26.0
Version: 3.32.2
Release: 0
Summary: Weather App for GNOME
License: GPL-2.0-or-later
Group: Productivity/Other
URL: https://live.gnome.org/Design/Apps/Weather
Source0: http://download.gnome.org/sources/gnome-weather/3.26/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-weather/3.32/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-weather-fix-gettext-domain.patch zaitor@opensuse.org -- gschema: Fix gettext-domain
Patch0: gnome-weather-fix-gettext-domain.patch
# PATCH-FIX-UPSTREAM gnome-weather-fix-clicking-rows-places-popover.patch bjorn.lie@gmail.com -- Fix clicking on rows in the places popover
Patch1: gnome-weather-fix-clicking-rows-places-popover.patch
BuildRequires: gjs
BuildRequires: intltool >= 0.26
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gdk-3.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gjs-1.0) >= 1.39.91
BuildRequires: pkgconfig(gjs-1.0) >= 1.50.0
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.35.9
BuildRequires: pkgconfig(gtk+-3.0) >= 3.11.4
BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
BuildRequires: pkgconfig(gweather-3.0) >= 3.25.91
BuildRequires: pkgconfig(libgeoclue-2.0) >= 2.3.1
Recommends: %{name}-lang
BuildArch: noarch
%glib2_gsettings_schema_requires
%description
GNOME 3 weather app that does:
@ -72,31 +66,31 @@ search results from GNOME Weather.
%autosetup -p1
%build
%configure --libdir=/unused-in-noarch
%make_build
%meson \
%{nil}
%meson_build
%install
%make_install
%suse_update_desktop_file %{_name}.Application Utility DesktopUtility
%find_lang %{_name}
%meson_install
%suse_update_desktop_file %{_name} Utility DesktopUtility
%find_lang %{_name} %{?no_lang_C} %{name}.lang
%files
%license COPYING
%license COPYING.md
%{_bindir}/%{name}
%dir %{_datadir}/appdata
%{_datadir}/appdata/org.gnome.Weather.appdata.xml
%{_datadir}/applications/org.gnome.Weather.Application.desktop
%{_datadir}/metainfo/org.gnome.Weather.appdata.xml
%{_datadir}/applications/org.gnome.Weather.desktop
%{_datadir}/%{_name}/
%{_datadir}/dbus-1/services/org.gnome.Weather.Application.service
%{_datadir}/dbus-1/services/org.gnome.Weather.service
%{_datadir}/dbus-1/services/org.gnome.Weather.BackgroundService.service
%{_datadir}/glib-2.0/schemas/org.gnome.Weather.Application.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.Weather.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{_name}*
%files -n gnome-shell-search-provider-gnome-weather
%dir %{_datadir}/gnome-shell
%dir %{_datadir}/gnome-shell/search-providers
%{_datadir}/gnome-shell/search-providers/org.gnome.Weather.Application.search-provider.ini
%{_datadir}/gnome-shell/search-providers/org.gnome.Weather.search-provider.ini
%files lang -f %{_name}.lang
%files lang -f %{name}.lang
%changelog