From 65a1caf20699b37cb7abf24565e7022fea9f794b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 8 Dec 2024 05:19:58 +0000
Subject: [PATCH] gnome-calls: 47.beta -> 47.0

---
 hosts/common/programs/calls.nix            | 43 +++++++++-------------
 pkgs/by-name/nixpkgs-bootstrap/patches.nix |  7 ++++
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/hosts/common/programs/calls.nix b/hosts/common/programs/calls.nix
index 01709f2d8..5dce73c63 100644
--- a/hosts/common/programs/calls.nix
+++ b/hosts/common/programs/calls.nix
@@ -42,16 +42,12 @@ in
     };
 
     packageUnwrapped = pkgs.rmDbusServicesInPlace ((pkgs.calls.override {
-      # 46.3 -> 47.xx upgraded gtk3 -> gtk4; nixpkgs package is outdated, so substitute gtk3 deps with gtk4 deps
       evolution-data-server = pkgs.evolution-data-server-gtk4.override {
         # drop webkitgtk_6_0 dependency.
         # it's normally cached, but if modifying low-level deps (e.g. pipewire) it's nice to not have to rebuild it,
         # especially since `calls` is part of `moby-min`.
         withGtk4 = false;
       };
-      gtk3 = pkgs.gtk4;
-      libpeas = pkgs.libpeas2;
-      wrapGAppsHook3 = pkgs.wrapGAppsHook4;
       sofia_sip = pkgs.sofia_sip.overrideAttrs (upstream: {
         # use linphone's sofia_sip.
         # Freeswitch sofia_sip has a bug where a failed DNS query will never return to the caller.
@@ -66,24 +62,29 @@ in
         };
       });
     }).overrideAttrs (upstream: {
-      # XXX(2024-08-08): v46.3 has a bug where if it has no network connection on launch, it forever stays disconnected & never retries
-      version = "47_beta.0-unstable-2024-08-08";
-      src = lib.warnIf (lib.versionOlder "47.0" upstream.version) "gnome-calls outdated; remove src override? (keep UI patches though!)" pkgs.fetchFromGitLab {
-        domain = "gitlab.gnome.org";
-        owner = "GNOME";
-        repo = "calls";
-        fetchSubmodules = true;
-        # rev = "main";
-        rev = "ff213579a52222e7c95e585843d97b5b817b2a8b";
-        hash = "sha256-0QYC8FJpfg/X2lIjBDooba2idUfpJNQhcpv8Z5I/B4k=";
-      };
+      # src = lib.warnIf (lib.versionOlder "47.0" upstream.version) "gnome-calls outdated; remove src override? (keep UI patches though!)" pkgs.fetchFromGitLab {
+      #   domain = "gitlab.gnome.org";
+      #   owner = "GNOME";
+      #   repo = "calls";
+      #   fetchSubmodules = true;
+      #   # rev = "main";
+      #   # rev = "ff213579a52222e7c95e585843d97b5b817b2a8b";
+      #   # hash = "sha256-0QYC8FJpfg/X2lIjBDooba2idUfpJNQhcpv8Z5I/B4k=";
+      #   rev = "75c4072c4e2ba8619c8067703fb65fe622af8b42";
+      #   hash = "sha256-99B1GS2IXt3per8XnbBRCTChlcwT3zWnhwgG1ift0QQ=";
+      # };
 
       patches = (upstream.patches or []) ++ [
         (pkgs.fetchpatch {
           # usability improvement... ties the UI visibility to the connection state, so if the UI is gone, then i can't receive calls (and will hopefully notice that more easily!)
-          url = "https://git.uninsane.org/colin/gnome-calls/commit/a19166d85927e59662fae189a780eed18bf876ce.patch";
+          # TODO: see about a more maintainable solution:
+          # 1. create gobject-introspection bindings, then a python wrapper which binds the MainWindow and CallWindow notify::visible signals?
+          # 2. move this functionality into a gnome calls `plugin`?
+          # 3. upstream this; use the Nautilus approach of controlling behavior here with an env var?
+          # also TODO: write a nix test for this functionality so that it doesn't break during an upgrade!
+          url = "https://git.uninsane.org/colin/gnome-calls/commit/88dbe108a8cf82f9c0766c310218902a8a2a7cd5.patch";
           name = "exit on close (i.e. never daemonize)";
-          hash = "sha256-NoVQV2TlkCcsBt0uwSyK82hBKySUW4pADrJVfLFvWgU=";
+          hash = "sha256-QggVM28X9A2f9SbHMMM38M4zKhjYZrTvsZoitxyczdo=";
         })
         (pkgs.fetchpatch {
           # solves the issue where flakey DNS (especially at boot) could take down call connectivity indefinitely.
@@ -93,14 +94,6 @@ in
           hash = "sha256-agPM3XKXiP5Rxrl26DNA+pnhEPTBEBQBxZe3CoptgII=";
         })
       ];
-
-      nativeBuildInputs = upstream.nativeBuildInputs ++ [
-        pkgs.dbus  #< for dbus-run-session (should be test only, but it's not)
-      ];
-
-      buildInputs = upstream.buildInputs ++ [
-        pkgs.libadwaita
-      ];
     }));
 
     sandbox.net = "vpn.wg-home";  #< XXX(2024/07/05): my cell carrier seems to block RTP, so tunnel it.
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 1243a0015..5eccfc439 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -65,6 +65,13 @@ in
   #   hash = "sha256-Gki/GZOyFcWQRfChouIEZMmg2GDdAtsUSyAbSbTqANc=";
   # })
 
+  (fetchpatch' {
+    # TODO: send upstream (branch: pr-calls-47)
+    name = "calls: 46.3 -> 47.0";
+    saneCommit = "17349a94e6e7d196ae6301603d791f69f14a8a4c";
+    hash = "sha256-qL9fqzOtmwOaDUK/lBKTQNs2mjdY1xFALgUxMZVcFGM=";
+  })
+
   (fetchpatch' {
     name = "apacheHttpdPackages.mod_dnssd: fix cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/362066";