pantheon.wingpanel-indicator-datetime: switch to merged patch

2 files changed, 7 insertions, 43 deletions

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index c884dd2d247d3..b00fdb95d3e0c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , substituteAll
 , pkg-config
@@ -38,9 +39,12 @@ stdenv.mkDerivation rec {
       elementary_calendar = elementary-calendar;
     })
 
-    # Workaround for showing date numbers (TODO: should try to fix upstream)
-    # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047
-    ./partly-revert-pr-150.patch
+    # GridDay: Do not connect to the notify signal for the property
+    # https://github.com/elementary/wingpanel-indicator-datetime/pull/305
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/845ac1345124571fe995ab7138d5dfe4d29847e9.patch";
+      sha256 = "sha256-/wd/FnhjC0c0Y8mCZg8XNoPOYAAmfK+g1F6L6TMEkdM=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch
deleted file mode 100644
index 766c1dda29f7d..0000000000000
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/calendar/Grid.vala
-index e440306..21a631a 100644
---- a/src/Widgets/calendar/Grid.vala
-+++ b/src/Widgets/calendar/Grid.vala
-@@ -229,7 +229,7 @@ namespace DateTime.Widgets {
-                 day.sensitive_container (false);
-             }
- 
--            day.date = new_date;
-+            day.update_date (new_date);
- 
-             return day;
-         }
-diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala
-index 8602875..7bd6140 100644
---- a/src/Widgets/calendar/GridDay.vala
-+++ b/src/Widgets/calendar/GridDay.vala
-@@ -79,10 +79,6 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox {
-         button_press_event.connect (on_button_press);
-         key_press_event.connect (on_key_press);
- 
--        notify["date"].connect (() => {
--            label.label = date.get_day_of_month ().to_string ();
--        });
--
-         component_dots = new Gee.HashMap<string, Gtk.Widget> ();
-     }
- 
-@@ -124,6 +120,11 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox {
-         }
-     }
- 
-+    public void update_date (GLib.DateTime date) {
-+        this.date = date;
-+        label.label = date.get_day_of_month ().to_string ();
-+    }
-+
-     public void set_selected (bool selected) {
-         if (selected) {
-             set_state_flags (Gtk.StateFlags.SELECTED, true);