!6 Update to 43.0

From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot 2023-02-15 08:21:38 +00:00 committed by Gitee
commit 15f2ea2c9f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 21 additions and 55 deletions

View File

@ -1,40 +0,0 @@
From a81049403880731f5224503e2484e4b28a51d0c8 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Sat, 21 Nov 2020 20:44:39 +0100
Subject: [PATCH] fix build due to nullability update on gio
fixes #157
---
src/alarm-face.vala | 2 +-
src/window.vala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/alarm-face.vala b/src/alarm-face.vala
index 995143ba..6000739d 100644
--- a/src/alarm-face.vala
+++ b/src/alarm-face.vala
@@ -42,7 +42,7 @@ public class Face : Gtk.Stack, Clocks.Clock {
alarms = new ContentStore ();
settings = new GLib.Settings ("org.gnome.clocks");
- var app = GLib.Application.get_default ();
+ var app = (!) GLib.Application.get_default ();
var action = (GLib.SimpleAction) app.lookup_action ("stop-alarm");
action.activate.connect ((action, param) => {
var a = alarms.find ((a) => {
diff --git a/src/window.vala b/src/window.vala
index 669f177a..fe954b7e 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -182,7 +182,7 @@ public class Window : Hdy.ApplicationWindow {
}
private void on_show_primary_menu_activate (SimpleAction action) {
- var state = action.get_state ().get_boolean ();
+ var state = ((!) action.get_state ()).get_boolean ();
action.set_state (new Variant.boolean (!state));
}
--
GitLab

Binary file not shown.

BIN
gnome-clocks-43.0.tar.xz Normal file

Binary file not shown.

View File

@ -1,34 +1,37 @@
%global geoclue2_version 2.6.0
%global gtk4_version 4.5
%global libadwaita_version 1.0.0
%global libadwaita_version 1.2
Name: gnome-clocks
Version: 42.0
Version: 43.0
Release: 1
Summary: CGNOME 3 clock application
Summary: Clock application designed for GNOME 3
License: GPLv2+
URL: https://wiki.gnome.org/Apps/Clocks
Source0: https://download.gnome.org/sources/gnome-clocks/42/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-clocks/43/%{name}-%{version}.tar.xz
BuildRequires: meson desktop-file-utils gettext itstool libappstream-glib vala >= 0.55
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
BuildRequires: pkgconfig(gnome-desktop-4) >= 3.8 pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-2.0) >= 2.44
BuildRequires: pkgconfig(geocode-glib-1.0) >= 1.0 pkgconfig(gsound) >= 0.98
BuildRequires: pkgconfig(libhandy-1) pkgconfig(gweather4)
BuildRequires: meson
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: itstool
BuildRequires: libappstream-glib
BuildRequires: vala >= 0.55
BuildRequires: pkgconfig(geocode-glib-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gsound)
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
BuildRequires: pkgconfig(gweather4)
BuildRequires: pkgconfig(libgeoclue-2.0) >= %{geoclue2_version}
BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version}
Requires: geoclue2%{?_isa} >= %{geoclue2_version}
Requires: geoclue2-libs%{?_isa} >= %{geoclue2_version}
Requires: gtk4%{?_isa} >= %{gtk4_version}
Requires: libadwaita%{?_isa} >= %{libadwaita_version}
Requires: libgweather >= 4.0.0
%description
GNOME Clocks is a simple application to show the time and date
in multiple locations and set alarms or timers. A stopwatch is
also included.
Clock application designed for GNOME 3
%prep
%autosetup -n %{name}-%{version} -p1
@ -59,6 +62,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d
%{_datadir}/metainfo/org.gnome.clocks.metainfo.xml
%changelog
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.0-1
- Update to 43.0
* Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 42.0-1
- Update to 42.0