diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-23 07:54:02 +0000 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:42:54 +0200 |
| commit | 9ddb819ed891df240e0cba014a75e4765f26ce85 (patch) | |
| tree | c7dbc92dc1180d93d8eb96508ac082bdf826f0cf /pkgs/desktops/gnome-3/apps | |
| parent | 1a7ac9640a4a969bec99e26738656a9904c03b1b (diff) | |
| download | nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar.gz nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar.bz2 nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar.lz nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar.xz nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.tar.zst nixpkgs-9ddb819ed891df240e0cba014a75e4765f26ce85.zip | |
gnome3.gnome-bluetooth: 3.34.3 → 3.34.5
- clean up - remove intltool dependency https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/e8ad2adfebd6821b459f1d6ba6a8c6f243fcb482
Diffstat (limited to 'pkgs/desktops/gnome-3/apps')
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch | 17 |
2 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index e0e3d825f45..fae4149a131 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -25,25 +24,17 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.rc"; + version = "40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "02cf7ckjfgb7n4wqc55gis3r8shv4hq0ckrilc52d0p79qsmak6w"; + sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; }; patches = [ - # Port to libhandy-1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; - sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; - }) - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; - sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; - }) + # A refactor has caused the PR patch to drift enough to need rebasing + ./gtk_image_reset_crash.patch ]; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch new file mode 100644 index 00000000000..5065295b57b --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch @@ -0,0 +1,17 @@ +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); + } + } + |