diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-10-13 08:14:27 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-10-13 08:14:27 +0200 |
commit | 7a94322ed7898db6d9b308b76a6bb4a0c6f99c38 (patch) | |
tree | 305dd6e05f626d10b34e38c4fda3d4f61f5e06e7 /pkgs/desktops/pantheon | |
parent | d618530963a0e1d112c2584e2fc1ae9743cf7b08 (diff) | |
parent | 81e445e508f49daabe7fc60f302207eb4555b9d8 (diff) |
Merge #182618: GNOME 42 → 43
Diffstat (limited to 'pkgs/desktops/pantheon')
7 files changed, 148 insertions, 14 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 1984a6ebbe241..9f5613fcd22e4 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -12,10 +13,10 @@ , evolution-data-server , folks , geoclue2 -, geocode-glib +, geocode-glib_2 , granite , gtk3 -, libchamplain +, libchamplain_libsoup3 , libgee , libhandy , libical @@ -32,6 +33,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo="; }; + patches = [ + # build: support evolution-data-server 3.46 + # https://github.com/elementary/calendar/pull/758 + (fetchpatch { + url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; + sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; + }) + + # Workaround for showing date numbers (TODO: should try to fix upstream) + # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 + ./partly-revert-pr-301.patch + ]; + nativeBuildInputs = [ meson ninja @@ -46,10 +60,10 @@ stdenv.mkDerivation rec { evolution-data-server folks geoclue2 - geocode-glib + geocode-glib_2 granite gtk3 - libchamplain + libchamplain_libsoup3 libgee libhandy libical diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch new file mode 100644 index 0000000000000..0de31ee6365d7 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch @@ -0,0 +1,57 @@ +diff --git a/src/Grid/Grid.vala b/src/Grid/Grid.vala +index 61706fc8..9b69fc14 100644 +--- a/src/Grid/Grid.vala ++++ b/src/Grid/Grid.vala +@@ -215,7 +215,7 @@ public class Grid : Gtk.Grid { + + day.in_current_month = new_date.get_month () == month_start.get_month (); + +- day.date = new_date; ++ day.update_date (new_date); + return day; + } + +diff --git a/src/Grid/GridDay.vala b/src/Grid/GridDay.vala +index 3e59cb7b..df04fe6f 100644 +--- a/src/Grid/GridDay.vala ++++ b/src/Grid/GridDay.vala +@@ -35,6 +35,7 @@ public class Maya.View.GridDay : Gtk.EventBox { + public bool draw_left_border = true; + private VAutoHider event_box; + private GLib.HashTable<string, EventButton> event_buttons; ++ Gtk.Label label; + + public bool in_current_month { + set { +@@ -79,7 +80,7 @@ public class Maya.View.GridDay : Gtk.EventBox { + style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + style_context.add_class ("cell"); + +- var label = new Gtk.Label (""); ++ label = new Gtk.Label (""); + label.halign = Gtk.Align.END; + label.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + label.margin = EVENT_MARGIN; +@@ -100,10 +101,6 @@ public class Maya.View.GridDay : Gtk.EventBox { + + Gtk.TargetEntry dnd = {"binary/calendar", 0, 0}; + Gtk.drag_dest_set (this, Gtk.DestDefaults.MOTION, {dnd}, Gdk.DragAction.MOVE); +- +- this.notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); + } + + public override bool drag_drop (Gdk.DragContext context, int x, int y, uint time_) { +@@ -174,6 +171,11 @@ public class Maya.View.GridDay : Gtk.EventBox { + event_buttons.remove_all (); + } + ++ public void update_date (DateTime date) { ++ this.date = date; ++ label.label = date.get_day_of_month ().to_string (); ++ } ++ + public void set_selected (bool selected) { + if (selected) { + set_state_flags (Gtk.StateFlags.SELECTED, true); diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 1dc000f66adfc..879f1f8bd919f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -10,10 +11,8 @@ , gtk3 , libxml2 , libhandy -, webkitgtk +, webkitgtk_4_1 , folks -, libgdata -, sqlite , glib-networking , granite , evolution-data-server @@ -32,6 +31,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4="; }; + patches = [ + # build: fix documentation build + # https://github.com/elementary/mail/pull/795 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch"; + sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY="; + }) + # build: support webkit2gtk-4.1 + # https://github.com/elementary/mail/pull/794 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; + sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + }) + ]; + nativeBuildInputs = [ libxml2 meson @@ -48,11 +62,9 @@ stdenv.mkDerivation rec { glib-networking granite gtk3 - libgdata libgee libhandy - sqlite - webkitgtk + webkitgtk_4_1 ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 7efd7e99da284..cd82dba99bfeb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.tasks"; + broken = true; # https://github.com/elementary/tasks/issues/340 }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index a3d8d049e3b10..7b9fb8bf69896 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -10,9 +11,7 @@ , glib , granite , gtk3 -, libgdata , libhandy -, sqlite , switchboard }: @@ -27,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY="; }; + patches = [ + # build: support evolution-data-server 3.45 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; + sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -39,9 +47,7 @@ stdenv.mkDerivation rec { glib granite gtk3 - libgdata libhandy - sqlite # needed for camel-1.2 switchboard ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 3f7408d9dff3d..c884dd2d247d3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) + + # Workaround for showing date numbers (TODO: should try to fix upstream) + # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047 + ./partly-revert-pr-150.patch ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch new file mode 100644 index 0000000000000..766c1dda29f7d --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch @@ -0,0 +1,40 @@ +diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/calendar/Grid.vala +index e440306..21a631a 100644 +--- a/src/Widgets/calendar/Grid.vala ++++ b/src/Widgets/calendar/Grid.vala +@@ -229,7 +229,7 @@ namespace DateTime.Widgets { + day.sensitive_container (false); + } + +- day.date = new_date; ++ day.update_date (new_date); + + return day; + } +diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala +index 8602875..7bd6140 100644 +--- a/src/Widgets/calendar/GridDay.vala ++++ b/src/Widgets/calendar/GridDay.vala +@@ -79,10 +79,6 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { + button_press_event.connect (on_button_press); + key_press_event.connect (on_key_press); + +- notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); +- + component_dots = new Gee.HashMap<string, Gtk.Widget> (); + } + +@@ -124,6 +120,11 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox { + } + } + ++ public void update_date (GLib.DateTime date) { ++ this.date = date; ++ label.label = date.get_day_of_month ().to_string (); ++ } ++ + public void set_selected (bool selected) { + if (selected) { + set_state_flags (Gtk.StateFlags.SELECTED, true); |