guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

16/80: build: glib-or-gtk-build-system: Add gtk 4.0 support.


From: guix-commits
Subject: 16/80: build: glib-or-gtk-build-system: Add gtk 4.0 support.
Date: Tue, 28 Sep 2021 07:21:23 -0400 (EDT)

mothacehe pushed a commit to branch wip-gnome40
in repository guix.

commit a6c197f7578bd83abf136fb5ccbeadee3f8379db
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Sep 24 15:26:05 2021 +0000

    build: glib-or-gtk-build-system: Add gtk 4.0 support.
    
    * guix/build/glib-or-gtk-build-system.scm (gtk-module-directories): Add gtk
    4.0 support.
---
 guix/build/glib-or-gtk-build-system.scm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/guix/build/glib-or-gtk-build-system.scm 
b/guix/build/glib-or-gtk-build-system.scm
index 8d3c368..9f4cc09 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -51,12 +51,24 @@
   "Check for the existence of \"libdir/gtk-v.0\" in INPUTS.  Return a list
 with all found directories."
   (let* ((version
-          (if (string-match "gtk\\+-3"
-                            (or (assoc-ref inputs "gtk+")
-                                (assoc-ref inputs "source")
-                                "gtk+-3")) ; we default to version 3
-              "3.0"
-              "2.0"))
+          (cond
+           ((string-match "gtk-4"
+                          (or (assoc-ref inputs "gtk")
+                              (assoc-ref inputs "source")
+                              ""))
+            "4.0")
+           ((string-match "gtk\\+-3"
+                          (or (assoc-ref inputs "gtk+")
+                              (assoc-ref inputs "source")
+                              ""))
+            "3.0")
+           ((string-match "gtk\\+-2"
+                           (or (assoc-ref inputs "gtk+")
+                               (assoc-ref inputs "source")
+                               ""))
+            "2.0")
+           (else
+            "4.0"))) ; We default to version 4.0.
          (gtk-module
           (lambda (input prev)
             (let* ((in (match input



reply via email to

[Prev in Thread] Current Thread [Next in Thread]