gnome.gnome-calendar: 41.2 → 42.beta

https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/41.2...42.beta

pkgs/desktops/gnome/apps/gnome-calendar/default.nix

@@ -1,10 +1,11 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
+, fetchpatch
 , meson
 , ninja
 , pkg-config
-, wrapGAppsHook
-, libdazzle
+, wrapGAppsHook4
 , libgweather
 , geoclue2
 , geocode-glib
@@ -12,29 +13,53 @@
 , gettext
 , libxml2
 , gnome
-, gtk3
+, gtk4
 , evolution-data-server
+, libical
 , libsoup
 , glib
-, gnome-online-accounts
 , gsettings-desktop-schemas
-, libhandy
-, adwaita-icon-theme
+, libadwaita
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "41.2";
+  version = "42.beta";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo=";
+    sha256 = "TTNcGt7tjqLjSuHmt5uVtlFpaHsmjjlsek4l9+rZdlE=";
   };
 
   patches = [
-    # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84
-    # A refactor has caused the PR patch to drift enough to need rebasing
-    ./gtk_image_reset_crash.patch
+    # Fix postinstall referring to gtk-update-icon-cache
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/b7e84c432664f76f10680c04781ab5c3cafdd247.patch";
+      sha256 = "ahJwspsnU6uT0mc1W+aWPWgp/9+lVF8H+dAK/IV7qgM=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    libxml2
+    wrapGAppsHook4
+    python3
+  ];
+
+  buildInputs = [
+    gtk4
+    evolution-data-server # waiting for GTK4 port
+    libical
+    libsoup
+    glib
+    libgweather
+    geoclue2
+    geocode-glib
+    gsettings-desktop-schemas
+    libadwaita
   ];
 
   passthru = {
@@ -44,41 +69,11 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gettext
-    libxml2
-    wrapGAppsHook
-    python3
-  ];
-
-  buildInputs = [
-    gtk3
-    evolution-data-server
-    libsoup
-    glib
-    gnome-online-accounts
-    libdazzle
-    libgweather
-    geoclue2
-    geocode-glib
-    gsettings-desktop-schemas
-    adwaita-icon-theme
-    libhandy
-  ];
-
-  postPatch = ''
-    chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
-    patchShebangs build-aux/meson/meson_post_install.py
-  '';
-
   meta = with lib; {
     homepage = "https://wiki.gnome.org/Apps/Calendar";
     description = "Simple and beautiful calendar application for GNOME";
     maintainers = teams.gnome.members;
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
 }

pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch

@@ -1,17 +0,0 @@
-diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c
-index ac32a8f9..532425c1 100644
---- a/src/gui/views/gcal-year-view.c
-+++ b/src/gui/views/gcal-year-view.c
-@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self)
-   if (!updated)
-     {
-       gtk_label_set_text (self->temp_label, "");
--      gtk_image_clear (self->weather_icon);
-+      /* FIXME: This should never be NULL, but it somehow is.
-+       * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299
-+       */
-+      if (self->weather_icon != NULL)
-+        gtk_image_clear (self->weather_icon);
-     }
- }
-