From 74574f614736051f84fad655500503868bcacf47 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Dec 2018 15:17:09 +0100 Subject: [PATCH 1/3] update to version 2.1.3 --- .gitignore | 1 + sources | 2 +- wingpanel-indicator-datetime.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd8499a..dd083dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wingpanel-indicator-datetime-2.1.0.tar.gz /wingpanel-indicator-datetime-2.1.1.tar.gz /wingpanel-indicator-datetime-2.1.2.tar.gz +/wingpanel-indicator-datetime-2.1.3.tar.gz diff --git a/sources b/sources index 64ec67c..b2855f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-indicator-datetime-2.1.2.tar.gz) = f2db0f67c4ebfc790f75ab201ed2bdc5fcea9387c323f084f3ada283473ade6afd545191f989e3883eef16054f13d4fbcfc11252c79f1ad7b33c225b38957c9b +SHA512 (wingpanel-indicator-datetime-2.1.3.tar.gz) = ab3100c98485aa7aafaedf7cb80d56eb75963b317d4a1d81d39e11eb28ddb5f61143072d4e86ebdf4557b39e17ce2e285c57113ca004b28d9cdf175b1b540efd diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index a82826a..54620d0 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -4,7 +4,7 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} License: GPLv3+ @@ -56,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 +- Update to version 2.1.3. + * Sat Oct 20 2018 Fabio Valentini - 2.1.2-1 - Update to version 2.1.2. From 0b367b494d52be1e8c4196c05c2fdc8ce8fbfade Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 18 Dec 2018 15:31:11 +0100 Subject: [PATCH 2/3] adapt to gsettings key that's been moved to granite --- ...ove-clock-format-settings-to-granite.patch | 69 +++++++++++++++++++ wingpanel-indicator-datetime.spec | 12 +++- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 00-move-clock-format-settings-to-granite.patch diff --git a/00-move-clock-format-settings-to-granite.patch b/00-move-clock-format-settings-to-granite.patch new file mode 100644 index 0000000..06bfdd5 --- /dev/null +++ b/00-move-clock-format-settings-to-granite.patch @@ -0,0 +1,69 @@ +From f5e0f6b020dc7ee0001ca54a4ab107f794e73ac4 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Sun, 4 Nov 2018 22:15:34 +0100 +Subject: [PATCH] move "clock-format" GSettings key to granite + +--- + ...o.elementary.desktop.wingpanel.datetime.gschema.xml | 10 ---------- + src/Widgets/PanelLabel.vala | 4 +++- + src/Widgets/calendar/Util.vala | 2 +- + 3 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml +index 32e0bdd..6cb8433 100644 +--- a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml ++++ b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml +@@ -1,21 +1,11 @@ + + +- +- +- +- +- + + + false + Show week numbers. + If this is set to true, week numbers will be shown in the calendar. + +- +- "12h" +- Whether the clock displays in 12h or 24h format +- Whether the clock displays in 12h or 24h format +- + + false + If this is set to true, seconds will be shown in the clock +diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala +index 01dd433..58282d9 100644 +--- a/src/Widgets/PanelLabel.vala ++++ b/src/Widgets/PanelLabel.vala +@@ -40,11 +40,13 @@ public class DateTime.Widgets.PanelLabel : Gtk.Grid { + add (time_label); + + var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); + clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); + ++ var format_settings = new GLib.Settings ("io.elementary.granite"); ++ format_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); ++ + notify.connect (() => { + update_labels (); + }); +diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala +index a8183ea..d18181c 100644 +--- a/src/Widgets/calendar/Util.vala ++++ b/src/Widgets/calendar/Util.vala +@@ -214,7 +214,7 @@ namespace Util { + } + + /* If AM/PM exists, assume it is the default time format and check for format override. */ +- var setting = new GLib.Settings ("org.gnome.desktop.interface"); ++ var setting = new GLib.Settings ("io.elementary.granite"); + var clockformat = setting.get_user_value ("clock-format"); + + if (clockformat == null) { diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 54620d0..1d4cada 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,12 +5,16 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# the "clock-format" GSettings key has been moved to granite +# to resolve a circular dependency and to fix third-party apps +Patch0: 00-move-clock-format-settings-to-granite.patch + BuildRequires: gettext BuildRequires: meson BuildRequires: vala >= 0.22.0 @@ -23,6 +27,9 @@ BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(wingpanel-2.0) +# this is the first package of granite that has the required gsettings key +Requires: granite > 5.2.2-1 + Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -56,6 +63,9 @@ A datetime indicator for wingpanel. %changelog +* Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 +- Add patch to move some gsettings to granite itself. + * Wed Dec 12 2018 Fabio Valentini - 2.1.3-1 - Update to version 2.1.3. From e5592cc8f857259af0612c32ea74ea7322012442 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 8 Jul 2019 21:42:54 +0200 Subject: [PATCH 3/3] drop unnecessary granite/datetime patch --- ...ove-clock-format-settings-to-granite.patch | 69 ------------------- wingpanel-indicator-datetime.spec | 12 ++-- 2 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 00-move-clock-format-settings-to-granite.patch diff --git a/00-move-clock-format-settings-to-granite.patch b/00-move-clock-format-settings-to-granite.patch deleted file mode 100644 index 06bfdd5..0000000 --- a/00-move-clock-format-settings-to-granite.patch +++ /dev/null @@ -1,69 +0,0 @@ -From f5e0f6b020dc7ee0001ca54a4ab107f794e73ac4 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Sun, 4 Nov 2018 22:15:34 +0100 -Subject: [PATCH] move "clock-format" GSettings key to granite - ---- - ...o.elementary.desktop.wingpanel.datetime.gschema.xml | 10 ---------- - src/Widgets/PanelLabel.vala | 4 +++- - src/Widgets/calendar/Util.vala | 2 +- - 3 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -index 32e0bdd..6cb8433 100644 ---- a/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -+++ b/data/io.elementary.desktop.wingpanel.datetime.gschema.xml -@@ -1,21 +1,11 @@ - - -- -- -- -- -- - - - false - Show week numbers. - If this is set to true, week numbers will be shown in the calendar. - -- -- "12h" -- Whether the clock displays in 12h or 24h format -- Whether the clock displays in 12h or 24h format -- - - false - If this is set to true, seconds will be shown in the clock -diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala -index 01dd433..58282d9 100644 ---- a/src/Widgets/PanelLabel.vala -+++ b/src/Widgets/PanelLabel.vala -@@ -40,11 +40,13 @@ public class DateTime.Widgets.PanelLabel : Gtk.Grid { - add (time_label); - - var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); -- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); - clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); - -+ var format_settings = new GLib.Settings ("io.elementary.granite"); -+ format_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); -+ - notify.connect (() => { - update_labels (); - }); -diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala -index a8183ea..d18181c 100644 ---- a/src/Widgets/calendar/Util.vala -+++ b/src/Widgets/calendar/Util.vala -@@ -214,7 +214,7 @@ namespace Util { - } - - /* If AM/PM exists, assume it is the default time format and check for format override. */ -- var setting = new GLib.Settings ("org.gnome.desktop.interface"); -+ var setting = new GLib.Settings ("io.elementary.granite"); - var clockformat = setting.get_user_value ("clock-format"); - - if (clockformat == null) { diff --git a/wingpanel-indicator-datetime.spec b/wingpanel-indicator-datetime.spec index 1d4cada..fd266c6 100644 --- a/wingpanel-indicator-datetime.spec +++ b/wingpanel-indicator-datetime.spec @@ -5,16 +5,12 @@ Name: wingpanel-indicator-datetime Summary: Datetime Indicator for wingpanel Version: 2.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# the "clock-format" GSettings key has been moved to granite -# to resolve a circular dependency and to fix third-party apps -Patch0: 00-move-clock-format-settings-to-granite.patch - BuildRequires: gettext BuildRequires: meson BuildRequires: vala >= 0.22.0 @@ -27,9 +23,6 @@ BuildRequires: pkgconfig(libedataserver-1.2) BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(wingpanel-2.0) -# this is the first package of granite that has the required gsettings key -Requires: granite > 5.2.2-1 - Requires: wingpanel%{?_isa} Supplements: wingpanel%{?_isa} @@ -63,6 +56,9 @@ A datetime indicator for wingpanel. %changelog +* Mon Jul 08 2019 Fabio Valentini - 2.1.3-3 +- Drop unnecessary granite/datetime patch. + * Tue Dec 18 2018 Fabio Valentini - 2.1.3-2 - Add patch to move some gsettings to granite itself.