updated to version 41.1 and changed the information of the patch files

5 files changed, 28 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f998bc946b6..0d9683b178f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = gnome-calendar-linuxmint
 	pkgdesc = Simple and beautiful calendar application designed to perfectly fit the GNOME desktop. With Linux Mint patches
-	pkgver = 40.1
+	pkgver = 41.1
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Calendar
 	arch = x86_64
 	groups = gnome
 	license = GPL
 	makedepends = appstream-glib
-	makedepends = libhandy0
 	makedepends = git
 	makedepends = meson
-	makedepends = python
 	depends = cinnamon
 	depends = cinnamon-control-center
 	depends = evolution-data-server
-	depends = geoclue2
+	depends = geoclue
 	depends = gnome-online-accounts
 	depends = gsettings-desktop-schemas
 	depends = libdazzle
@@ -24,14 +22,11 @@ pkgbase = gnome-calendar-linuxmint
 	optdepends = evolution: ICS file import
 	provides = gnome-calendar
 	conflicts = gnome-calendar
-	source = git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=c3211a888d9315ffaa427bbc4c00c12d5dcc1774
-	source = add_cinnamon_settings_online_support.patch
-	source = replace_link_cinnamon_settings_online_support.patch
-	source = set_window_icon_name.patch
+	source = git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=59ad10ba3aaed69c96c5e7f710b3f2c6b35131ae
+	source = linuxmint_gcal_window.patch
+	source = linuxmint_gcal_new_calendar_page.patch
 	sha256sums = SKIP
-	sha256sums = c05b6d35b89c9b121d544f86a788f021bf06a705d8c507c8a9eecc596d1320ba
-	sha256sums = ee49aad54bee8c50e5cdbbe68cd6f58287cd1cb368dd0f9f3a996a99418489c4
-	sha256sums = 1788c8cb1fbf8bd5cf81d700d9f5f7eb1e5eea265e35930dc70df147f79ebc9a
+	sha256sums = 8ee8805a0d185b9458016c7855f789f849982c68f9c42407504d3144696d825c
+	sha256sums = c935e126d9201c37f4b33460ae834c6c4a18c71fd06c2d768480b559a8a92e5f
 
 pkgname = gnome-calendar-linuxmint
-
diff --git a/PKGBUILD b/PKGBUILD
index 6aac368345f7..4e42aad1cc34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gnome-calendar-linuxmint
 _pkgname=gnome-calendar
-pkgver=40.1
+pkgver=41.1
 pkgrel=1
 pkgdesc='Simple and beautiful calendar application designed to perfectly fit the GNOME desktop. With Linux Mint patches'
 arch=(x86_64)
@@ -12,7 +12,7 @@ depends=(
     cinnamon
     cinnamon-control-center
     evolution-data-server
-    geoclue2
+    geoclue
     gnome-online-accounts
     gsettings-desktop-schemas
     libdazzle
@@ -25,25 +25,21 @@ optdepends=(
 )
 makedepends=(
     appstream-glib
-    libhandy0
     git
     meson
-    python
 )
 provides=(${_pkgname})
 conflicts=(${_pkgname})
 groups=(gnome)
-_commit=c3211a888d9315ffaa427bbc4c00c12d5dcc1774  # tags/40.1^0
+_commit=59ad10ba3aaed69c96c5e7f710b3f2c6b35131ae  # tags/41.1^0
 source=(
     "git+https://gitlab.gnome.org/GNOME/gnome-calendar.git#commit=$_commit"
-    "add_cinnamon_settings_online_support.patch"
-    "replace_link_cinnamon_settings_online_support.patch"
-    "set_window_icon_name.patch"
+    "linuxmint_gcal_window.patch"
+    "linuxmint_gcal_new_calendar_page.patch"
 )
 sha256sums=('SKIP'
-            'c05b6d35b89c9b121d544f86a788f021bf06a705d8c507c8a9eecc596d1320ba'
-            'ee49aad54bee8c50e5cdbbe68cd6f58287cd1cb368dd0f9f3a996a99418489c4'
-            '1788c8cb1fbf8bd5cf81d700d9f5f7eb1e5eea265e35930dc70df147f79ebc9a')
+            '8ee8805a0d185b9458016c7855f789f849982c68f9c42407504d3144696d825c'
+            'c935e126d9201c37f4b33460ae834c6c4a18c71fd06c2d768480b559a8a92e5f')
 
 pkgver() {
   cd $_pkgname
@@ -53,14 +49,12 @@ pkgver() {
 prepare() {
   cd $_pkgname
 
-  # Fix: Set window icon name
-  patch -Np0 -i ../set_window_icon_name.patch
-
   # Replace GNOME Control Center internal call with Cinnamon Settings (cinnamon-settings online-accounts)
-  patch -Np0 -i ../add_cinnamon_settings_online_support.patch
+  # Set window icon name
+  patch -Np0 -i ../linuxmint_gcal_window.patch
 
   # Replace GNOME Web Description link label with cinnamon-settings online-accounts
-  patch -Np0 -i ../replace_link_cinnamon_settings_online_support.patch
+  patch -Np0 -i ../linuxmint_gcal_new_calendar_page.patch
 }
 
 build() {
diff --git a/replace_link_cinnamon_settings_online_support.patch b/linuxmint_gcal_new_calendar_page.patch
index 2d2d8ff87d27..d7985e7aeff3 100644
--- a/replace_link_cinnamon_settings_online_support.patch
+++ b/linuxmint_gcal_new_calendar_page.patch
@@ -1,6 +1,6 @@
 --- src/gui/calendar-management/gcal-new-calendar-page.c
 +++ src/gui/calendar-management/gcal-new-calendar-page.c
-@@ -471,7 +471,7 @@
+@@ -493,7 +493,7 @@
  {
    GDBusConnection *connection = g_application_get_dbus_connection (g_application_get_default ());
  
@@ -10,4 +10,3 @@
  
  
 
-
diff --git a/add_cinnamon_settings_online_support.patch b/linuxmint_gcal_window.patch
index c859a3b010fb..50526ae0e7ab 100644
--- a/add_cinnamon_settings_online_support.patch
+++ b/linuxmint_gcal_window.patch
@@ -1,6 +1,6 @@
 --- src/gui/gcal-window.c
 +++ src/gui/gcal-window.c
-@@ -395,7 +395,7 @@
+@@ -486,7 +486,7 @@
  {
    GApplication *application = g_application_get_default ();
  
@@ -9,5 +9,13 @@
  }
  
  static void
-
+@@ -1221,6 +1221,8 @@
+   gcal_window_add_accelerator (app, "win.change-view(2)",    "<Ctrl>3");
+   gcal_window_add_accelerator (app, "app.quit", "<Ctrl>q");
+   gcal_window_add_accelerator (app, "win.new-event", "<Ctrl>n");
++
++  gtk_window_set_icon_name (self, "org.gnome.Calendar");
+ }
+ 
+ /**
 
diff --git a/set_window_icon_name.patch b/set_window_icon_name.patch
deleted file mode 100644
index 03e2b4b99dea..000000000000
--- a/set_window_icon_name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/gcal-window.c
-+++ src/gui/gcal-window.c
-@@ -1131,6 +1131,8 @@
-   gcal_window_add_accelerator (app, "win.change-view(3)",    "<Ctrl>3");
-   gcal_window_add_accelerator (app, "app.quit", "<Ctrl>q");
-   gcal_window_add_accelerator (app, "win.new-event", "<Ctrl>n");
-+
-+  gtk_window_set_icon_name (self, "org.gnome.Calendar");
- }
- 
- /**