From a18fac9e1a0f010c2756408041a293d600d216a2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 25 Nov 2024 06:32:04 +0000
Subject: [PATCH 1/2] vte: 0.78.1 -> 0.78.2

Changes: https://gitlab.gnome.org/GNOME/vte/-/compare/0.78.1...0.78.2?from_project_id=1893&straight=false
---
 pkgs/by-name/vt/vte/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index 08b67f3b70f3..84f3f9bc54a5 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -33,7 +33,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.78.1";
+  version = "0.78.2";
 
   outputs = [ "out" "dev" ]
     ++ lib.optional (gtkVersion != null) "devdoc";
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "vte";
     rev = finalAttrs.version;
-    hash = "sha256-dVCvf4eTIJlrSzG6xLdKU47N9uAtHDwRrGkWtSmqbEU=";
+    hash = "sha256-ZUECInBRNYkXJtGveLq8SR6YdWqJA0y9UJSxmc8mVNk=";
   };
 
   patches = [

From 1f72b75ff5a63c4f5758b58f4c7f441d024fd0e8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 1 Dec 2024 21:17:39 +0800
Subject: [PATCH 2/2] blackbox-terminal: Fix build with GCC 14

Otherwise fails with: error: 'return' with a value, in function returning void [-Wreturn-mismatch]
Tested with gcc14Stdenv.
---
 pkgs/by-name/bl/blackbox-terminal/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix
index 2aa523987623..c1323a89c031 100644
--- a/pkgs/by-name/bl/blackbox-terminal/package.nix
+++ b/pkgs/by-name/bl/blackbox-terminal/package.nix
@@ -44,6 +44,14 @@ stdenv.mkDerivation rec {
       url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch";
       hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A=";
     })
+
+    # Fix build with GCC 14
+    # https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369#note_1986032
+    # https://gitlab.gnome.org/raggesilver/blackbox/-/merge_requests/143
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/2f45717f1c18f710d9b9fbf21830027c8f0794e7.patch";
+      hash = "sha256-VlXttqOTbhD6Rp7ZODgsafOjeY+Lb5sZP277bC9ENXU=";
+    })
   ];
 
   postPatch = ''