gnome3.gnome-bluetooth: 3.34.3 → 3.34.5

- clean up
- remove intltool dependency e8ad2adfeb
This commit is contained in:
Jan Tojnar 2021-03-23 07:54:02 +00:00
parent 1a7ac9640a
commit 9ddb819ed8
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 69 additions and 27 deletions

View file

@ -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 = {

View file

@ -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);
}
}

View file

@ -1,28 +1,62 @@
{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection
, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }:
{ lib
, stdenv
, fetchurl
, gnome3
, meson
, ninja
, pkg-config
, gtk3
, gettext
, glib
, udev
, itstool
, libxml2
, wrapGAppsHook
, libnotify
, libcanberra-gtk3
, gobject-introspection
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, python3
, gsettings-desktop-schemas
}:
let
stdenv.mkDerivation rec {
pname = "gnome-bluetooth";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.34.3";
version = "3.34.5";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha";
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c";
};
nativeBuildInputs = [
meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection
gtk-doc docbook_xsl docbook_xml_dtd_43 python3
meson
ninja
gettext
itstool
pkg-config
libxml2
wrapGAppsHook
gobject-introspection
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
python3
];
buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3
gnome3.adwaita-icon-theme gsettings-desktop-schemas
glib
gtk3
udev
libnotify
libcanberra-gtk3
gnome3.adwaita-icon-theme
gsettings-desktop-schemas
];
mesonFlags = [
@ -46,7 +80,7 @@ in stdenv.mkDerivation rec {
homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en";
description = "Application that let you manage Bluetooth in the GNOME destkop";
maintainers = teams.gnome.members;
license = licenses.gpl2;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}