From e8cf60ffb47ea21e90e208ae54a72a4a7140250f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Oct 2021 10:19:20 +0800
Subject: [PATCH] pantheon.wingpanel-indicator-datetime: 2.3.0 -> 2.3.1

---
 .../wingpanel-indicators/datetime/default.nix | 41 +++++++++----------
 .../datetime/fix-incorrect-month.patch        | 26 ++++++++++++
 2 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index ad030277463c..8226ed5b0b3c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , substituteAll
 , pantheon
@@ -24,20 +24,24 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-datetime";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1mdm0fsnmmyw8c0ik2jmfri3kas9zkz1hskzf8wvbd51vnazfpgw";
+    sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg=";
   };
 
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = "pantheon.${pname}";
-    };
-  };
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      elementary_calendar = elementary-calendar;
+    })
+    # Fix incorrect month shown on re-opening indicator if previously changed month
+    # https://github.com/elementary/wingpanel-indicator-datetime/pull/284
+    ./fix-incorrect-month.patch
+  ];
 
   nativeBuildInputs = [
     libxml2
@@ -60,24 +64,17 @@ stdenv.mkDerivation rec {
     libgdata # required by some dependency transitively
   ];
 
-  patches = [
-    (substituteAll {
-      src = ./fix-paths.patch;
-      elementary_calendar = elementary-calendar;
-    })
-    # Upstream code not respecting our localedir
-    # https://github.com/elementary/wingpanel-indicator-datetime/pull/269
-    (fetchpatch {
-      url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/f7befa68a9fd6215297c334a366919d3431cae65.patch";
-      sha256 = "0l997b1pnpjscs886xy28as5yykxamxacvxdv8466zin7zynarfs";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
   '';
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "pantheon.${pname}";
+    };
+  };
+
   meta = with lib; {
     description = "Date & Time Indicator for Wingpanel";
     homepage = "https://github.com/elementary/wingpanel-indicator-datetime";
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch
new file mode 100644
index 000000000000..7e0dc09b16c2
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-incorrect-month.patch
@@ -0,0 +1,26 @@
+From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001
+From: Jeremy Paul Wootten <jeremywootten@gmail.com>
+Date: Sat, 30 Oct 2021 17:44:12 +0100
+Subject: [PATCH] Reset position and relative position after rebuilding
+ carousel
+
+---
+ src/Widgets/calendar/CalendarView.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
+index a41b37a4..f946b91c 100644
+--- a/src/Widgets/calendar/CalendarView.vala
++++ b/src/Widgets/calendar/CalendarView.vala
+@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
+             carousel.add (right_grid);
+             carousel.scroll_to (start_month_grid);
+             label.label = calmodel.month_start.format (_("%OB, %Y"));
++
++            position = 1;
++            rel_postion = 0;
+         }
++
+         carousel.no_show_all = false;
+     }
+