Commit 25c69738 authored by Jeremy Bicha's avatar Jeremy Bicha

Update upstream source from tag 'upstream/3.32.0'

Update to upstream version '3.32.0'
with Debian dir 9bfbfc317ffd5dd93fecb5150854ec51242d8b87
parents d265bdf9 8b5b6cbf
This diff is collapsed.
3.32.0
======
* Migrate app menu to primary menu
* New icon
* Show tomorrow's forecasts at the end of the day (Michael Catanzaro)
* Translation updates:
- Afrikaans
- Arabic
- Basque
- Catalan
- Chinese (Taiwan)
- Czech
- Danish
- Dutch
- Esperanto
- Estonian
- Finnish
- French
- Friulian
- Gaelic
- Galician
- German
- Greek, Modern (1453-)
- Hungarian
- Indonesian
- Italian
- Japanese
- Kazakh
- Latvian
- Lithuanian
- Nepali
- Polish
- Portuguese (Brazil)
- Romanian
- Russian
- Serbian
- Slovenian
- Spanish
- Swedish
- Tajik
- Turkish
- Vietnamese
3.31.92
=======
* Bugs fixed:
- #19 3.31.90 no longer installs a binary in the path
* Translation updates:
- Basque
- Catalan
- Chinese (Taiwan)
- Czech
- Danish
- Dutch
- Finnish
- French
- Friulian
- Galician
- German
- Greek, Modern (1453-)
- Hungarian
- Indonesian
- Italian
- Kazakh
- Lithuanian
- Polish
- Portuguese (Brazil)
- Romanian
- Russian
- Serbian
- Slovenian
- Spanish
- Swedish
- Tajik
- Turkish
- Vietnamese
3.31.90
=======
* Port from Autotools to Meson (Falk Seidl)
......
......@@ -2,27 +2,27 @@ datadir = join_paths(get_option('datadir'), 'icons')
icondir = join_paths('hicolor', 'scalable', 'apps')
if get_option('profile') == 'development'
install_data (
join_paths(icondir, 'org.gnome.Weather.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.WeatherDevel.svg'
join_paths(icondir, 'org.gnome.Weather.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.WeatherDevel.svg'
)
else
install_data (
join_paths(icondir, 'org.gnome.Weather.svg'),
install_dir: join_paths(datadir, icondir)
join_paths(icondir, 'org.gnome.Weather.svg'),
install_dir: join_paths(datadir, icondir)
)
endif
icondir = join_paths('hicolor', 'symbolic', 'apps')
if get_option('profile') == 'development'
install_data (
join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.WeatherDevel-symbolic.svg'
join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
install_dir: join_paths(datadir, icondir),
rename: 'org.gnome.WeatherDevel-symbolic.svg'
)
else
install_data (
join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
install_dir: join_paths(datadir, icondir)
join_paths(icondir, 'org.gnome.Weather-symbolic.svg'),
install_dir: join_paths(datadir, icondir)
)
endif
......@@ -8,27 +8,27 @@ data_conf.set('DATA_DIR', DATA_DIR)
message('Compiling resources')
gnome.compile_resources(
application_id_stable + '.data',
application_id_stable + '.data.gresource.xml',
gresource_bundle: true,
source_dir: '.',
install_dir: DATA_DIR,
install: true
application_id_stable + '.data',
application_id_stable + '.data.gresource.xml',
gresource_bundle: true,
source_dir: '.',
install_dir: DATA_DIR,
install: true
)
gnome.compile_resources(
application_id_stable + '.BackgroundService.data',
application_id_stable + '.BackgroundService.data.gresource.xml',
gresource_bundle: true,
source_dir: '.',
install_dir: DATA_DIR,
install: true
application_id_stable + '.BackgroundService.data',
application_id_stable + '.BackgroundService.data.gresource.xml',
gresource_bundle: true,
source_dir: '.',
install_dir: DATA_DIR,
install: true
)
# Installing the schema file
install_data(
application_id_stable + '.gschema.xml',
install_dir: 'share/glib-2.0/schemas'
application_id_stable + '.gschema.xml',
install_dir: 'share/glib-2.0/schemas'
)
# Building desktop file
......@@ -55,45 +55,55 @@ desktop = custom_target(
# Validating desktop file
desktop_file_validate = find_program('desktop-file-validate', required:false)
if desktop_file_validate.found()
test (
'Validate desktop file',
desktop_file_validate,
args: join_paths(meson.current_build_dir(), application_id + '.desktop')
)
test (
'Validate desktop file',
desktop_file_validate,
args: join_paths(meson.current_build_dir(), application_id + '.desktop')
)
endif
# Building app data
appdata_conf = configuration_data()
appdata = i18n.merge_file(
'appdata',
input: application_id_stable + '.appdata.xml.in',
output: application_id + '.appdata.xml',
install: true,
install_dir: join_paths(join_paths('share'), 'metainfo'),
po_dir: join_paths(meson.source_root(), 'po')
'appdata',
input: application_id_stable + '.appdata.xml.in',
output: application_id + '.appdata.xml',
install: true,
install_dir: join_paths(join_paths('share'), 'metainfo'),
po_dir: join_paths(meson.source_root(), 'po')
)
# Validating app data
appstream_util = find_program('appstream-util', required: false)
if appstream_util.found()
test(
'validate-appdata', appstream_util,
args: [
'validate-relax', '--nonet', appdata.full_path()
]
)
endif
configure_file(
input: application_id_stable + '.service.in',
output: application_id + '.service',
configuration: data_conf,
install: true,
install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
input: application_id_stable + '.service.in',
output: application_id + '.service',
configuration: data_conf,
install: true,
install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
)
configure_file(
input: application_id_stable + '.BackgroundService.service.in',
output: application_id + '.BackgroundService.service',
configuration: data_conf,
install: true,
install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
input: application_id_stable + '.BackgroundService.service.in',
output: application_id + '.BackgroundService.service',
configuration: data_conf,
install: true,
install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services')
)
# Search Provider
install_data(
application_id_stable + '.search-provider.ini',
install_dir: 'share/gnome-shell/search-providers'
application_id_stable + '.search-provider.ini',
install_dir: 'share/gnome-shell/search-providers'
)
subdir('icons')
......@@ -7,7 +7,6 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+ and CC-BY-3.0 and CC-BY-SA-3.0</project_license>
<kudos>
<kudo>AppMenu</kudo>
<kudo>HiDpiIcon</kudo>
<kudo>HighContrast</kudo>
<kudo>ModernToolkit</kudo>
......@@ -31,17 +30,24 @@
<project_group>GNOME</project_group>
<screenshots>
<screenshot type="default">
<image width="1500" height="1130">https://git.gnome.org/browse/gnome-weather/plain/misc/screenshots/city-view.png</image>
<image height="555" width="704">https://gitlab.gnome.org/GNOME/gnome-weather/raw/master/misc/screenshots/city-view.png</image>
</screenshot>
<screenshot>
<image width="1500" height="1130">https://git.gnome.org/browse/gnome-weather/plain/misc/screenshots/world-popover.png</image>
<image height="555" width="704">https://gitlab.gnome.org/GNOME/gnome-weather/raw/master/misc/screenshots/world-popover.png</image>
</screenshot>
</screenshots>
<launchable type="desktop-id">org.gnome.Weather.desktop</launchable>
<url type="homepage">https://wiki.gnome.org/Apps/Weather</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-weather/issues</url>
<updatecontact>gcampagna_at_src.gnome.org</updatecontact>
<update_contact>christopherdavis_at_gnome.org</update_contact>
<translation type="gettext">org.gnome.Weather</translation>
<provides>
<id>org.gnome.Weather.Application.desktop</id>
</provides>
<developer_name>The GNOME Project</developer_name>
<url type="donation">http://www.gnome.org/friends/</url>
<url type="translate">https://wiki.gnome.org/TranslationProject</url>
</component>
project('gnome-weather', 'c',
version: '3.31.90',
version: '3.32.0',
meson_version: '>= 0.46.0',
license: 'GPL2+'
)
......@@ -20,31 +20,27 @@ dependency('gweather-3.0', version: '>= 3.28')
env = environment()
LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
EXTENSION_DIR = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
DATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), application_id)
BIN_DIR = join_paths(get_option('prefix'), get_option('bindir'))
# Profiles
if get_option('profile') == 'development'
profile = 'Devel'
name_suffix = ' (Development)'
profile = 'Devel'
name_suffix = ' (Development)'
else
profile = ''
name_suffix = ''
profile = ''
name_suffix = ''
endif
conf = configuration_data()
conf.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/gnome-weather')
conf.set('DATA_DIR', DATA_DIR)
conf.set('EXTENSION_DIR', EXTENSION_DIR)
conf.set('LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
conf.set('libexecdir', LIBEXEC_DIR)
if get_option('profile') == 'development'
conf.set('VERSION', ''.join([run_command(['git', 'describe', '--long', '--tags']).stdout(), get_option('profile')]))
conf.set('VERSION', ''.join([run_command(['git', 'describe', '--long', '--tags']).stdout(), get_option('profile')]))
else
conf.set('VERSION', meson.project_version())
conf.set('VERSION', meson.project_version())
endif
conf.set_quoted('PROFILE', profile)
......@@ -59,4 +55,9 @@ subdir('po')
subdir('src')
subdir('tests')
meson.add_install_script('meson_post_install.py')
meson.add_install_script(
'meson_post_install.py',
join_paths(get_option('prefix'), get_option('datadir')),
DATA_DIR,
BIN_DIR,
)
option(
'profile',
type: 'combo',
choices: [
'default',
'development'
],
value: 'default'
'profile',
type: 'combo',
choices: [
'default',
'development'
],
value: 'default'
)
#!/usr/bin/env python3
from os import environ, path
from subprocess import call
import os
import subprocess
import sys
prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
datadir = path.join(prefix, 'share')
destdir = environ.get('DESTDIR', '')
destdir = os.environ.get('DESTDIR', '')
datadir = sys.argv[1]
pkgdatadir = sys.argv[2]
bindir = os.path.join(destdir + os.sep + sys.argv[3])
if not os.path.exists(bindir):
os.makedirs(bindir)
src = os.path.join(pkgdatadir, 'org.gnome.Weather')
dest = os.path.join(bindir, 'gnome-weather')
subprocess.call(['ln', '-s', '-f', src, dest])
if not destdir:
print('Updating icon cache...')
call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])
subprocess.call(['gtk-update-icon-cache', '-qtf', os.path.join(datadir, 'icons', 'hicolor')])
print("Installing new Schemas")
call(['glib-compile-schemas', path.join(datadir, 'glib-2.0/schemas')])
subprocess.call(['glib-compile-schemas', os.path.join(datadir, 'glib-2.0/schemas')])
{
"app-id" : "org.gnome.Weather",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
"command" : "/app/share/org.gnome.Weather/org.gnome.Weather",
"tags" : [
"nightly"
],
"finish-args" : [
"--share=ipc",
"--socket=x11",
"--socket=wayland",
"--share=network",
"--system-talk-name=org.freedesktop.GeoClue2",
"--filesystem=xdg-run/dconf",
"--filesystem=~/.config/dconf:ro",
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" : {
"cflags" : "-O2 -g",
"cxxflags" : "-O2 -g",
"env" : {
}
},
"cleanup" : [
"/include",
"/lib/pkgconfig",
"/share/pkgconfig",
"/share/aclocal",
"/man",
"/share/man",
"/share/gtk-doc",
"/share/vala",
"*.la",
"*.a"
],
"desktop-file-name-prefix": [ "(Development) " ],
"modules": [
{
"name" : "geocode-glib",
"config-opts" : [
"-Denable-installed-tests=false",
"-Denable-gtk-doc=false"
],
"buildsystem" : "meson",
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/geocode-glib.git"
}
]
},
{
"name" : "libgweather",
"config-opts" : [
"-Denable_vala=false",
"-Dgtk_doc=false"
],
"buildsystem" : "meson",
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libgweather.git"
}
]
},
{
"name" : "gnome-desktop",
"buildsystem" : "meson",
"config-opts" : [
"-Ddebug_tools=false",
"-Dudev=disabled",
"-Ddesktop_docs=false"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
}
]
},
{
"name" : "gnome-weather",
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gnome-weather.git"
}
]
}
]
}
{
"app-id" : "org.gnome.Weather",
"runtime" : "org.gnome.Platform",
"runtime-version" : "3.26",
"branch" : "stable",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
"command" : "/app/share/org.gnome.Weather/org.gnome.Weather.Application",
"command" : "gnome-weather",
"tags" : [
"nightly"
],
"finish-args" : [
"--share=ipc",
"--socket=x11",
......@@ -16,12 +18,6 @@
"--talk-name=ca.desrt.dconf",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" : {
"cflags" : "-O2 -g",
"cxxflags" : "-O2 -g",
"env" : {
}
},
"cleanup" : [
"/include",
"/lib/pkgconfig",
......@@ -34,55 +30,58 @@
"*.la",
"*.a"
],
"modules" : [
"desktop-file-name-prefix": [ "(Development) " ],
"modules": [
{
"name" : "geocode-glib",
"config-opts" : [
"--disable-static"
"-Denable-installed-tests=false",
"-Denable-gtk-doc=false"
],
"buildsystem" : "meson",
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/geocode-glib/3.25/geocode-glib-3.25.4.1.tar.xz",
"sha256" : "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/geocode-glib.git"
}
]
},
{
"name" : "libgweather",
"config-opts" : [
"--disable-static",
"--disable-vala"
"-Denable_vala=false",
"-Dgtk_doc=false"
],
"buildsystem" : "meson",
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/libgweather/3.26/libgweather-3.26.1.tar.xz",
"sha256" : "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libgweather.git"
}
]
},
{
"name" : "gnome-desktop",
"buildsystem" : "meson",
"config-opts" : [
"--disable-debug-tools",
"--disable-udev"
"-Ddebug_tools=false",
"-Dudev=disabled",
"-Ddesktop_docs=false"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/gnome-desktop/3.26/gnome-desktop-3.26.0.tar.xz",
"sha256" : "8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
}
]
},
{
"name" : "gnome-weather",
"buildsystem" : "meson",
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz",
"sha256" : "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gnome-weather.git"
}
]
}
......
......@@ -8,9 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-weather master\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"weather&keywords=I18N+L10N&component=general\n"
"POT-Creation-Date: 2017-08-20 15:17+0000\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-weather/issues\n"
"POT-Creation-Date: 2019-01-31 15:58+0000\n"
"PO-Revision-Date: 2014-09-20 22:20+0200\n"
"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
......@@ -20,46 +19,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bits\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../data/app-menu.ui.h:1
msgid "Temperature unit"
msgstr "Unitat de temperatura"
#: ../data/app-menu.ui.h:2
msgid "Celsius"
msgstr "Celsius"
#: ../data/app-menu.ui.h:3
msgid "Fahrenheit"
msgstr "Fahrenheit"
#: ../data/app-menu.ui.h:4
msgid "About"
msgstr "Quant a"
#: ../data/app-menu.ui.h:5
msgid "Quit"
msgstr "Surt"
#: ../data/city.ui.h:1
#: data/city.ui:8
msgid "City view"
msgstr "Visualització de ciutat"
#: ../data/city.ui.h:2
#: data/city.ui:30
msgid "Loading…"
msgstr "S'està carregant…"
#: ../data/org.gnome.Weather.appdata.xml.in.h:1
#: ../data/org.gnome.Weather.Application.desktop.in.h:1 ../src/app/main.js:53
#: ../src/app/window.js:226 ../src/service/main.js:49
#: data/org.gnome.Weather.appdata.xml.in:5
#: data/org.gnome.Weather.desktop.in.in:4 src/app/main.js:53
#: src/app/window.js:231 src/service/main.js:49
msgid "Weather"
msgstr "Meteorologia"
#: ../data/org.gnome.Weather.appdata.xml.in.h:2
#: ../data/org.gnome.Weather.Application.desktop.in.h:2
#: data/org.gnome.Weather.appdata.xml.in:6
#: data/org.gnome.Weather.desktop.in.in:5
msgid "Show weather conditions and forecast"
msgstr "Mostra les condicions actuals i la predicció meteorològica"
#: ../data/org.gnome.Weather.appdata.xml.in.h:3
#: data/org.gnome.Weather.appdata.xml.in:17
msgid ""
"A small application that allows you to monitor the current weather "
"conditions for your city, or anywhere in the world."
......@@ -67,7 +46,7 @@ msgstr ""
"Un programa petit que us permet fer un seguiment de les condicions "
"meteorològiques actuals a la vostra ciutat o a qualsevol lloc del món."
#: ../data/org.gnome.Weather.appdata.xml.in.h:4
#: data/org.gnome.Weather.appdata.xml.in:21
msgid ""
"It provides access to detailed forecasts, up to 7 days, with hourly details "
"for the current and next day, using various internet services."
......@@ -76,7 +55,7 @@ msgstr ""
"hores pel dia actual i l'endemà. Proporcionades per diversos serveis "
"d'Internet."
#: ../data/org.gnome.Weather.appdata.xml.in.h:5
#: data/org.gnome.Weather.appdata.xml.in:25
msgid ""
"It also optionally integrates with the GNOME Shell, allowing you see the "
"current conditions of the most recently searched cities by just typing its "
......@@ -86,20 +65,26 @@ msgstr ""
"les condicions actuals de les últimes ciutats que hàgiu cercat teclejant el "
"seu nom al resum d'activitats."
#: ../data/org.gnome.Weather.Application.desktop.in.h:3
#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#: data/org.gnome.Weather.desktop.in.in:7
msgid "@APP_ID@"
msgstr "@APP_ID@"
#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
#: data/org.gnome.Weather.desktop.in.in:13
msgid "Weather;Forecast;"
msgstr "Meteorologia;Predicció;"
#: ../data/org.gnome.Weather.Application.desktop.in.h:4
#: data/org.gnome.Weather.desktop.in.in:14
msgid "Allows weather information to be displayed for your location."
msgstr ""
"Permet que la informació meteorològica es mostri per la vostra ubicació."
#: ../data/org.gnome.Weather.Application.gschema.xml.h:1
#: data/org.gnome.Weather.gschema.xml:6
msgid "Configured cities to show weather for"
msgstr "Ciutats configurades per a veure'n el temps"
#: ../data/org.gnome.Weather.Application.gschema.xml.h:2
#: data/org.gnome.Weather.gschema.xml:7
msgid ""
"The locations shown in the world view of gnome-weather. Each value is a "
"GVariant returned by gweather_location_serialize()."
......@@ -107,11 +92,11 @@ msgstr ""
"La ubicació mostrada a la vista mundial del gnome-weather. Cada valor és un "
"GVariant retornat per gweather_location_serialize()."
#: ../data/org.gnome.Weather.Application.gschema.xml.h:3
#: data/org.gnome.Weather.gschema.xml:14
msgid "Automatic location"
msgstr "Ubicació automàtica"
#: ../data/org.gnome.Weather.Application.gschema.xml.h:4
#: data/org.gnome.Weather.gschema.xml:15
msgid ""
"The automatic location is the value of automatic-location switch which "
"decides whether to fetch current location or not."
......@@ -119,97 +104,113 @@ msgstr ""
"La ubicació automàtica és el valor del commutador de la ubicació automàtica "
"que decideix si s'ha de recollir la ubicació automàtica."
#: ../data/places-popover.ui.h:1
#: data/places-popover.ui:44
msgid "Automatic Location"
msgstr "Ubicació automàtica"
#: ../data/places-popover.ui.h:2
#: data/places-popover.ui:83
msgid "Locating…"
msgstr "S'està ubicant…"
#: ../data/places-popover.ui.h:3
#: data/places-popover.ui:140
msgid "Search for a city"
msgstr "Cerqueu una ciutat"
#: ../data/places-popover.ui.h:4
#: data/places-popover.ui:172
msgid "Viewed Recently"
msgstr "Consultats recentment"
#: ../data/weather-widget.ui.h:1
#: data/primary-menu.ui:4
msgid "_Temperature Unit"
msgstr "_Unitat de temperatura"
#: data/primary-menu.ui:6
msgid "_Celsius"
msgstr "_Celsius"
#: data/primary-menu.ui:11
msgid "_Fahrenheit"
msgstr "_Fahrenheit"
#: data/primary-menu.ui:19
msgid "_About Weather"
msgstr "_Quant al Meteorologia"