[bug#73019] [PATCH 1/2] gnu: Add libpqmarble.

[bug#73019] [PATCH 1/2] gnu: Add libpqmarble.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (libpqmarble-2.0.0): New public variable.

Change-Id: I6a74b7d34edd0c293850bc26d6f0043477b995be
---
 gnu/packages/gnome-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a09c0befb0..99e4236ff7 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2022 Sughosha <sughosha@proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1759,3 +1760,39 @@ (define-public tiramisu
 notifications to STDOUT in order to allow the user to process notifications any
 way they prefer.")
     (license license:expat)))
+
+(define-public libpqmarble
+  (package
+    (name "libpqmarble")
+    (version "2.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/raggesilver/marble")
+                    ;; Tag for v2.0.0 is currently missing
+                    ;; Remove this if the commit is assigned proper version tag
+                    (commit "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jx53yadqkcsfk9khkqmapznd8g9xg98wkgkigh964dj6gpp7fx1"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:glib-or-gtk? #t
+           #:tests? #t))
+    ;; Unsure about whether these dependencies should go in simply `inputs`,
+    ;; `native-inputs` or `propagated-inputs`. Requesting inputs from GTK
+    ;; application maintainers.
+    (native-inputs
+      (list
+        gtk
+        `(,gtk+ "bin")               ; gtk-update-icon-cache
+        `(,glib "bin")               ; for glib-compile-schemas, etc.
+        gobject-introspection
+        desktop-file-utils           ; for update-desktop-database
+        pkg-config
+        vala))
+    (home-page "https://wiki.gnome.org/Apps/Recipes")
+    (synopsis "Utility library for GNOME apps")
+    (description "Utility library for GNOME apps.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH 2/2] gnu: Add blackbox-terminal.

[Ashvith Shetty]

* gnu/packages/crates-io.scm (blackbox-terminal-0.14.0): New public variable.

Change-Id: I48ed0aae5fa4f1caed9d030bb4f36a57c80eefd9
---
 gnu/packages/gnome-xyz.scm | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 99e4236ff7..c4b5c18172 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages gnome-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-science)
@@ -1796,3 +1797,50 @@ (define-public libpqmarble
     (synopsis "Utility library for GNOME apps")
     (description "Utility library for GNOME apps.")
     (license license:gpl3)))
+
+(define-public blackbox-terminal
+  (package
+    (name "blackbox-terminal")
+    (version "0.14.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/blackbox")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g7n2z0m7jjbn93zvx3ix7ph4mpncwq80cjjc2prp878cksj3g3r"))))
+    (build-system meson-build-system)
+    (arguments
+     (list #:glib-or-gtk? #t
+           #:tests? #t
+           #:configure-flags #~(list "-Dblackbox_is_flatpak=false")))
+    ;; The application works fine, regardless of where the dependencies
+    ;; were placed in either of native-inputs or inputs, at least when
+    ;; I tried building it locally. Would appreciate a review.
+    (native-inputs
+      (list
+        pkg-config
+        vala
+        python-3.10
+        desktop-file-utils           ; for update-desktop-database
+        `(,glib "bin")               ; for glib-compile-schemas, etc.
+        gettext-minimal))
+    ;; TODO: Add vte with experimental sixel support enabled.
+    ;; librsvg may also be needed as an addition dependency.
+    (inputs
+      (list
+        gtk
+        `(,gtk+ "bin")               ; gtk-update-icon-cache
+        vte-with-gtk-4
+        json-glib
+        libpqmarble
+        libadwaita
+        pcre2
+        libxml2                      ; meson config is probably broken - libxml2 is also required to build
+        libgee))
+    (home-page "https://gitlab.gnome.org/raggesilver/blackbox/")
+    (synopsis "A beautiful GTK 4 terminal")
+    (description "An elegant and customizable terminal for GNOME.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v2 0/3] Add Black Box terminal

[Ashvith Shetty]

This updated patch series also includes VTE for GTK4 with experimental
sixel support. I am still not able to figure out the need for the
dependency `librsvg`, and since there seems to be no issue with
launching the application without providing it as an input, I'll not
be adding it.

Ashvith Shetty (3):
  gnu: Add libpqmarble.
  gnu: Add vte-gtk-4-experimental-sixel.
  gnu: Add blackbox-terminal.

 gnu/packages/gnome-xyz.scm | 94 ++++++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     | 21 +++++++++
 2 files changed, 115 insertions(+)


base-commit: 7fa9df431e9423e2b79c8c520de1d0ef7aed910d
-- 
2.45.2

[bug#73019] [PATCH v2 1/3] gnu: Add libpqmarble.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (libpqmarble-2.0.0): New public variable.

Change-Id: I6a74b7d34edd0c293850bc26d6f0043477b995be
---
 gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a09c0befb0..bd1fdb287d 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2022 Sughosha <sughosha@proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1759,3 +1760,32 @@ (define-public tiramisu
 notifications to STDOUT in order to allow the user to process notifications any
 way they prefer.")
     (license license:expat)))
+
+(define-public libpqmarble
+  (package
+    (name "libpqmarble")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/marble")
+             ;; Tag for v2.0.0 is currently missing, so use commit instead
+             (commit "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jx53yadqkcsfk9khkqmapznd8g9xg98wkgkigh964dj6gpp7fx1"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t))
+    (native-inputs (list gtk
+                         `(,gtk+ "bin") ;gtk-update-icon-cache
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         gobject-introspection
+                         desktop-file-utils ;for update-desktop-database
+                         pkg-config
+                         vala))
+    (home-page "https://wiki.gnome.org/Apps/Recipes")
+    (synopsis "Utility library for GNOME apps")
+    (description "Utility library for GNOME apps.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v2 2/3] gnu: Add vte-gtk-4-experimental-sixel.

[Ashvith Shetty]

* gnu/packages/crates-io.scm (vte-gtk-4-experimental-sixel-0.73.0): New public variable.

Change-Id: I4fabe33fa86d838a92040ac61f1cbd2277c91045
---
 gnu/packages/gnome.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7339000436..99fb8487b9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4666,6 +4666,27 @@ (define-public vte-with-gtk-4
     (propagated-inputs (modify-inputs (package-propagated-inputs vte)
                          (replace "gtk+" gtk)))))
 
+(define-public vte-gtk-4-experimental-sixel
+  (package/inherit vte-with-gtk-4
+    (name "vte-gtk4-experimental-sixel")
+    ;; this is the closest to v0.72.4 on the main branch
+    (version "0.73.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/vte")
+                    (commit "aa7689792918a9d4054e367139d166b146a5bd22")))
+              (sha256 (base32
+                       "0cnccjylj5lbdi2igcd9277zslqrflzdpflngwkcxw4fiyxyv6gk"))))
+    (arguments (substitute-keyword-arguments (package-arguments vte-with-gtk-4)
+                 ((#:configure-flags flags
+                   #~'())
+                  #~(cons* "-Dsixel=true"
+                           #$flags))))
+    (propagated-inputs (modify-inputs (package-propagated-inputs
+                                       vte-with-gtk-4)
+                         (append libsixel)))))
+
 ;; Stable version for gtk2, required by gnurobots and lxterminal as of 2020-07.
 (define-public vte/gtk+-2
   (package (inherit vte)
-- 
2.45.2

[bug#73019] [PATCH v2 3/3] gnu: Add blackbox-terminal.

[Ashvith Shetty]

* gnu/packages/crates-io.scm (blackbox-terminal-0.14.0): New public variable.

Change-Id: I48ed0aae5fa4f1caed9d030bb4f36a57c80eefd9
---
 gnu/packages/gnome-xyz.scm | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index bd1fdb287d..4ed143a1cb 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages gnome-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-science)
@@ -1789,3 +1790,66 @@ (define-public libpqmarble
     (synopsis "Utility library for GNOME apps")
     (description "Utility library for GNOME apps.")
     (license license:gpl3)))
+
+(define-public blackbox-terminal
+  (package
+    (name "blackbox-terminal")
+    (version "0.14.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/blackbox")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g7n2z0m7jjbn93zvx3ix7ph4mpncwq80cjjc2prp878cksj3g3r"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags `("-Dblackbox_is_flatpak=false")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         python-3.10
+                         desktop-file-utils ;for update-desktop-database
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         gettext-minimal))
+    (inputs (list gtk
+                  vte-gtk-4-experimental-sixel
+                  json-glib
+                  libpqmarble
+                  libadwaita
+                  pcre2
+                  ;; libxml2 is also required to build but meson fails to catch it
+                  libxml2
+                  ;; librsvg may also be needed as an addition dependency, but
+                  ;; there seems to be no difference with, or without it
+                  ;; being provided.
+                  libgee))
+    (home-page "https://gitlab.gnome.org/raggesilver/blackbox/")
+    (synopsis "Black Box is an elegant and customizable terminal for GNOME.")
+    (description
+     "An elegant and customizable terminal for GNOME:
+@itemize
+@item Color schemes - (Tilix compatible color scheme support)
+@item Theming - your color scheme can be used to style the whole app
+@item Background transparency
+@item Custom fonts, padding, and cell spacing
+@item Tabs
+@item Support for drag and dropping files
+@item Sixel (experimental)
+@item Customizable keybindings
+@item Toggle-able header bar
+@item Search your backlog with text or regex
+@item Context aware header bar - the header bar changes colors when running commands with sudo and in ssh sessions
+@item Desktop notifications - get notified when a command is finished in the background
+@item Customizable UI
+@end itemize")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v3 0/3] Add Black Box terminal

[Ashvith Shetty]

This patch series is an improvement over the previous ones. Some of the
`inputs` were provided as `native-inputs`, which has been resolved.
`vte-gtk-4-experimental-sixel` was renamed to the smaller
`vte-gtk-4-with-sixel`, and `libsixel` was set as one of it's `inputs`,
instead of `propagated-inputs`.

Ashvith Shetty (3):
  gnu: Add libpqmarble.
  gnu: Add vte-gtk-4-with-sixel.
  gnu: Add blackbox-terminal.

 gnu/packages/gnome-xyz.scm | 101 +++++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     |  21 ++++++++
 2 files changed, 122 insertions(+)


base-commit: 7fa9df431e9423e2b79c8c520de1d0ef7aed910d
-- 
2.45.2

[bug#73019] [PATCH v3 1/3] gnu: Add libpqmarble.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (libpqmarble-2.0.0): New public variable.

Change-Id: I82517ca2cd9841a0a83cea8e5757fa7c495f3612
---
 gnu/packages/gnome-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a09c0befb0..c5abcbb14d 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2022 Sughosha <sughosha@proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1759,3 +1760,38 @@ (define-public tiramisu
 notifications to STDOUT in order to allow the user to process notifications any
 way they prefer.")
     (license license:expat)))
+
+(define-public libpqmarble
+  (package
+    (name "libpqmarble")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/marble")
+             ;; Tag for v2.0.0 is currently missing, so use commit instead
+             (commit "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jx53yadqkcsfk9khkqmapznd8g9xg98wkgkigh964dj6gpp7fx1"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         desktop-file-utils ;for update-desktop-database
+                         gobject-introspection))
+    (inputs (list gtk))
+    (home-page "https://gitlab.gnome.org/raggesilver/marble")
+    (synopsis "Utility library for GNOME apps")
+    (description "Utility library for GNOME apps.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v3 2/3] gnu: Add vte-gtk-4-with-sixel.

[Ashvith Shetty]

* gnu/packages/crates-io.scm (vte-gtk-4-with-sixel-0.73.0-unstable): New public variable.

Change-Id: I58e8d601fbee5e5f83b03b03c7d35b8842fa767f
---
 gnu/packages/gnome.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7339000436..fa63850f0d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -79,6 +79,7 @@
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4666,6 +4667,26 @@ (define-public vte-with-gtk-4
     (propagated-inputs (modify-inputs (package-propagated-inputs vte)
                          (replace "gtk+" gtk)))))
 
+(define-public vte-gtk-4-with-sixel
+  (package/inherit vte-with-gtk-4
+    (name "vte-gtk4-with-sixel")
+    ;; this is the closest to v0.72.4 on the main branch
+    (version "0.73.0-unstable")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/vte")
+                    (commit "aa7689792918a9d4054e367139d166b146a5bd22")))
+              (sha256 (base32
+                       "0cnccjylj5lbdi2igcd9277zslqrflzdpflngwkcxw4fiyxyv6gk"))))
+    (arguments (substitute-keyword-arguments (package-arguments vte-with-gtk-4)
+                 ((#:configure-flags flags
+                   #~'())
+                  #~(cons* "-Dsixel=true"
+                           #$flags))))
+    (inputs (modify-inputs (package-inputs vte-with-gtk-4)
+              (append libsixel)))))
+
 ;; Stable version for gtk2, required by gnurobots and lxterminal as of 2020-07.
 (define-public vte/gtk+-2
   (package (inherit vte)
-- 
2.45.2

[bug#73019] [PATCH v3 3/3] gnu: Add blackbox-terminal.

[Ashvith Shetty]

* gnu/packages/crates-io.scm (blackbox-terminal-0.14.0): New public variable.

Change-Id: I8ea503adb2f2168ca5ac44aea87725b9f854cad5
---
 gnu/packages/gnome-xyz.scm | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index c5abcbb14d..5a2a5bf629 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages gnome-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-science)
@@ -1795,3 +1796,67 @@ (define-public libpqmarble
     (synopsis "Utility library for GNOME apps")
     (description "Utility library for GNOME apps.")
     (license license:gpl3)))
+
+(define-public blackbox-terminal
+  (package
+    (name "blackbox-terminal")
+    (version "0.14.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/blackbox")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g7n2z0m7jjbn93zvx3ix7ph4mpncwq80cjjc2prp878cksj3g3r"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags `("-Dblackbox_is_flatpak=false")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         python-3.10
+                         desktop-file-utils ;for update-desktop-database
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         gettext-minimal))
+    (inputs (list gtk
+                  vte-gtk-4-with-sixel
+                  json-glib
+                  libpqmarble
+                  libadwaita
+                  pcre2
+                  ;; libxml2 and libgee are also required to build
+                  ;; but meson fails to catch it.
+                  libxml2
+                  libgee
+                  ;; The build won't fail without librsvg, but
+                  ;; since it is a dependency, it has been included.
+                  librsvg))
+    (home-page "https://gitlab.gnome.org/raggesilver/blackbox/")
+    (synopsis "Black Box is an elegant and customizable terminal for GNOME.")
+    (description
+     "An elegant and customizable terminal for GNOME:
+@itemize
+@item Color schemes - (Tilix compatible color scheme support)
+@item Theming - your color scheme can be used to style the whole app
+@item Background transparency
+@item Custom fonts, padding, and cell spacing
+@item Tabs
+@item Support for drag and dropping files
+@item Sixel (experimental)
+@item Customizable keybindings
+@item Toggle-able header bar
+@item Search your backlog with text or regex
+@item Context aware header bar - the header bar changes colors when running commands with sudo and in ssh sessions
+@item Desktop notifications - get notified when a command is finished in the background
+@item Customizable UI
+@end itemize")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v4 0/3] Add Black Box terminal

[Ashvith Shetty]

Fixes incorrect commit message.

Ashvith Shetty (3):
  gnu: Add libpqmarble.
  gnu: Add vte-gtk-4-with-sixel.
  gnu: Add blackbox-terminal.

 gnu/packages/gnome-xyz.scm | 101 +++++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     |  21 ++++++++
 2 files changed, 122 insertions(+)


base-commit: 7fa9df431e9423e2b79c8c520de1d0ef7aed910d
-- 
2.45.2

[bug#73019] [PATCH v4 1/3] gnu: Add libpqmarble.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (libpqmarble-2.0.0): New public variable.

Change-Id: Ia88dc113a268c57f317c1c4bcd6254d220636d84
---
 gnu/packages/gnome-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a09c0befb0..c5abcbb14d 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2022 Sughosha <sughosha@proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1759,3 +1760,38 @@ (define-public tiramisu
 notifications to STDOUT in order to allow the user to process notifications any
 way they prefer.")
     (license license:expat)))
+
+(define-public libpqmarble
+  (package
+    (name "libpqmarble")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/marble")
+             ;; Tag for v2.0.0 is currently missing, so use commit instead
+             (commit "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jx53yadqkcsfk9khkqmapznd8g9xg98wkgkigh964dj6gpp7fx1"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         desktop-file-utils ;for update-desktop-database
+                         gobject-introspection))
+    (inputs (list gtk))
+    (home-page "https://gitlab.gnome.org/raggesilver/marble")
+    (synopsis "Utility library for GNOME apps")
+    (description "Utility library for GNOME apps.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v4 2/3] gnu: Add vte-gtk-4-with-sixel.

[Ashvith Shetty]

* gnu/packages/gnome.scm (vte-gtk-4-with-sixel-0.73.0-unstable): New public variable.

Change-Id: Ia48ff2ff33f28d75145a00dbfcf5357228a85265
---
 gnu/packages/gnome.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7339000436..fa63850f0d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -79,6 +79,7 @@
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4666,6 +4667,26 @@ (define-public vte-with-gtk-4
     (propagated-inputs (modify-inputs (package-propagated-inputs vte)
                          (replace "gtk+" gtk)))))
 
+(define-public vte-gtk-4-with-sixel
+  (package/inherit vte-with-gtk-4
+    (name "vte-gtk4-with-sixel")
+    ;; this is the closest to v0.72.4 on the main branch
+    (version "0.73.0-unstable")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/vte")
+                    (commit "aa7689792918a9d4054e367139d166b146a5bd22")))
+              (sha256 (base32
+                       "0cnccjylj5lbdi2igcd9277zslqrflzdpflngwkcxw4fiyxyv6gk"))))
+    (arguments (substitute-keyword-arguments (package-arguments vte-with-gtk-4)
+                 ((#:configure-flags flags
+                   #~'())
+                  #~(cons* "-Dsixel=true"
+                           #$flags))))
+    (inputs (modify-inputs (package-inputs vte-with-gtk-4)
+              (append libsixel)))))
+
 ;; Stable version for gtk2, required by gnurobots and lxterminal as of 2020-07.
 (define-public vte/gtk+-2
   (package (inherit vte)
-- 
2.45.2

[bug#73019] [PATCH v4 3/3] gnu: Add blackbox-terminal.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (blackbox-terminal-0.14.0): New public variable.

Change-Id: I80ccebc05c89a233473c2fd0bfa324d9a426e52d
---
 gnu/packages/gnome-xyz.scm | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index c5abcbb14d..5a2a5bf629 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages gnome-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-science)
@@ -1795,3 +1796,67 @@ (define-public libpqmarble
     (synopsis "Utility library for GNOME apps")
     (description "Utility library for GNOME apps.")
     (license license:gpl3)))
+
+(define-public blackbox-terminal
+  (package
+    (name "blackbox-terminal")
+    (version "0.14.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/blackbox")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g7n2z0m7jjbn93zvx3ix7ph4mpncwq80cjjc2prp878cksj3g3r"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags `("-Dblackbox_is_flatpak=false")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         python-3.10
+                         desktop-file-utils ;for update-desktop-database
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         gettext-minimal))
+    (inputs (list gtk
+                  vte-gtk-4-with-sixel
+                  json-glib
+                  libpqmarble
+                  libadwaita
+                  pcre2
+                  ;; libxml2 and libgee are also required to build
+                  ;; but meson fails to catch it.
+                  libxml2
+                  libgee
+                  ;; The build won't fail without librsvg, but
+                  ;; since it is a dependency, it has been included.
+                  librsvg))
+    (home-page "https://gitlab.gnome.org/raggesilver/blackbox/")
+    (synopsis "Black Box is an elegant and customizable terminal for GNOME.")
+    (description
+     "An elegant and customizable terminal for GNOME:
+@itemize
+@item Color schemes - (Tilix compatible color scheme support)
+@item Theming - your color scheme can be used to style the whole app
+@item Background transparency
+@item Custom fonts, padding, and cell spacing
+@item Tabs
+@item Support for drag and dropping files
+@item Sixel (experimental)
+@item Customizable keybindings
+@item Toggle-able header bar
+@item Search your backlog with text or regex
+@item Context aware header bar - the header bar changes colors when running commands with sudo and in ssh sessions
+@item Desktop notifications - get notified when a command is finished in the background
+@item Customizable UI
+@end itemize")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v5 0/3] Add Black Box terminal

[Ashvith Shetty]

Assigned file-name with the format style version-revision-commit to
`vte-gtk-4-with-sixel`, since the commit is outside the tags.

Ashvith Shetty (3):
  gnu: Add libpqmarble.
  gnu: Add vte-gtk-4-with-sixel.
  gnu: Add blackbox-terminal.

 gnu/packages/gnome-xyz.scm | 101 +++++++++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     |  24 +++++++++
 2 files changed, 125 insertions(+)


base-commit: 994095b085a495a364d3df82121a1a303d044548
-- 
2.45.2

[bug#73019] [PATCH v5 1/3] gnu: Add libpqmarble.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (libpqmarble-2.0.0): New public variable.

Change-Id: I15889e5e17eb533d8486322d6db48eb31ee557fc
---
 gnu/packages/gnome-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index a09c0befb0..c5abcbb14d 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -20,6 +20,7 @@
 ;;; Copyright © 2022 Sughosha <sughosha@proton.me>
 ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2023 Eidvilas Markevičius <markeviciuseidvilas@gmail.com>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1759,3 +1760,38 @@ (define-public tiramisu
 notifications to STDOUT in order to allow the user to process notifications any
 way they prefer.")
     (license license:expat)))
+
+(define-public libpqmarble
+  (package
+    (name "libpqmarble")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/marble")
+             ;; Tag for v2.0.0 is currently missing, so use commit instead
+             (commit "f240b2ec7d5cdacb8fdcc553703420dc5101ffdb")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jx53yadqkcsfk9khkqmapznd8g9xg98wkgkigh964dj6gpp7fx1"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         desktop-file-utils ;for update-desktop-database
+                         gobject-introspection))
+    (inputs (list gtk))
+    (home-page "https://gitlab.gnome.org/raggesilver/marble")
+    (synopsis "Utility library for GNOME apps")
+    (description "Utility library for GNOME apps.")
+    (license license:gpl3)))
-- 
2.45.2

[bug#73019] [PATCH v5 2/3] gnu: Add vte-gtk-4-with-sixel.

[Ashvith Shetty]

* gnu/packages/gnome.scm (vte-gtk-4-with-sixel-0.73.0-0.4530d38): New public variable.

Change-Id: I23cca7a2e77aa303303c532e4a4163fb82d2ce48
---
 gnu/packages/gnome.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7339000436..598549fb94 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -79,6 +79,7 @@
 ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org>
+;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4666,6 +4667,29 @@ (define-public vte-with-gtk-4
     (propagated-inputs (modify-inputs (package-propagated-inputs vte)
                          (replace "gtk+" gtk)))))
 
+(define-public vte-gtk-4-with-sixel
+    (let ((commit "4530d385191562d84f60066e168631fc1f45f3cc")
+          (revision "0"))
+  (package/inherit vte-with-gtk-4
+    (name "vte-gtk4-with-sixel")
+    (version (git-version "0.73.0" revision commit))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.gnome.org/GNOME/vte")
+                    (commit commit)))
+              (file-name (git-file-name name version))
+              (sha256 (base32
+                       "1z3pkpq0zjqzplq6mah68cwmcd1cr1ii2vp4nfppwmmn55mjapq0"))))
+    (arguments (substitute-keyword-arguments (package-arguments vte-with-gtk-4)
+                 ((#:configure-flags flags
+                   #~'())
+                  #~(cons* "-Dsixel=true"
+                           #$flags))))
+    (inputs (modify-inputs (package-inputs vte-with-gtk-4)
+              (append lz4)
+              (append libsixel))))))
+
 ;; Stable version for gtk2, required by gnurobots and lxterminal as of 2020-07.
 (define-public vte/gtk+-2
   (package (inherit vte)
-- 
2.45.2

[bug#73019] [PATCH v5 3/3] gnu: Add blackbox-terminal.

[Ashvith Shetty]

* gnu/packages/gnome-xyz.scm (blackbox-terminal-0.14.0): New public variable.

Change-Id: I3f95a4d9d2ecc5767e04f675d1fcf83649d684df
---
 gnu/packages/gnome-xyz.scm | 65 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index c5abcbb14d..5a2a5bf629 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages gnome-xyz)
   #:use-module (gnu packages ibus)
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-science)
@@ -1795,3 +1796,67 @@ (define-public libpqmarble
     (synopsis "Utility library for GNOME apps")
     (description "Utility library for GNOME apps.")
     (license license:gpl3)))
+
+(define-public blackbox-terminal
+  (package
+    (name "blackbox-terminal")
+    (version "0.14.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.gnome.org/raggesilver/blackbox")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0g7n2z0m7jjbn93zvx3ix7ph4mpncwq80cjjc2prp878cksj3g3r"))))
+    (build-system meson-build-system)
+    (arguments
+     `(#:glib-or-gtk? #t
+       #:configure-flags `("-Dblackbox_is_flatpak=false")
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'fix-gtk4-update-icon-cache
+                    (lambda _
+                      (substitute* "build-aux/meson/postinstall.py"
+                        (("gtk-update-icon-cache")
+                         "gtk4-update-icon-cache")))))))
+    (native-inputs (list pkg-config
+                         vala
+                         python-3.10
+                         desktop-file-utils ;for update-desktop-database
+                         `(,glib "bin") ;for glib-compile-schemas, etc.
+                         `(,gtk "bin") ;gtk4-update-icon-cache
+                         gettext-minimal))
+    (inputs (list gtk
+                  vte-gtk-4-with-sixel
+                  json-glib
+                  libpqmarble
+                  libadwaita
+                  pcre2
+                  ;; libxml2 and libgee are also required to build
+                  ;; but meson fails to catch it.
+                  libxml2
+                  libgee
+                  ;; The build won't fail without librsvg, but
+                  ;; since it is a dependency, it has been included.
+                  librsvg))
+    (home-page "https://gitlab.gnome.org/raggesilver/blackbox/")
+    (synopsis "Black Box is an elegant and customizable terminal for GNOME.")
+    (description
+     "An elegant and customizable terminal for GNOME:
+@itemize
+@item Color schemes - (Tilix compatible color scheme support)
+@item Theming - your color scheme can be used to style the whole app
+@item Background transparency
+@item Custom fonts, padding, and cell spacing
+@item Tabs
+@item Support for drag and dropping files
+@item Sixel (experimental)
+@item Customizable keybindings
+@item Toggle-able header bar
+@item Search your backlog with text or regex
+@item Context aware header bar - the header bar changes colors when running commands with sudo and in ssh sessions
+@item Desktop notifications - get notified when a command is finished in the background
+@item Customizable UI
+@end itemize")
+    (license license:gpl3)))
-- 
2.45.2