[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/75: build: glib-or-gtk-build-system: Add gtk 4.0 support.
From: |
guix-commits |
Subject: |
16/75: build: glib-or-gtk-build-system: Add gtk 4.0 support. |
Date: |
Mon, 27 Sep 2021 07:17:15 -0400 (EDT) |
mothacehe pushed a commit to branch wip-gnome40
in repository guix.
commit 2d22108bd3ba9bed611e0e870a268dcea76bc667
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
- 03/75: gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2., (continued)
- 03/75: gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2., guix-commits, 2021/09/27
- 07/75: gnu: gnome-shell-extensions: Update to 40.4., guix-commits, 2021/09/27
- 08/75: gnu: gnome-menus: Update to 3.36.0., guix-commits, 2021/09/27
- 11/75: gnu: gnome-disk-utility: Update to 40.2., guix-commits, 2021/09/27
- 06/75: gnu: gnote: Update to 40.2., guix-commits, 2021/09/27
- 09/75: gnu: gnome-user-docs: Update to 40.5., guix-commits, 2021/09/27
- 14/75: gnu: Add libadwaita., guix-commits, 2021/09/27
- 10/75: gnu: gnome-desktop: Update to 40.4., guix-commits, 2021/09/27
- 13/75: gnu: libportal: Update to 0.4., guix-commits, 2021/09/27
- 15/75: gnu: gnome-todo: Update to 40.1., guix-commits, 2021/09/27
- 16/75: build: glib-or-gtk-build-system: Add gtk 4.0 support.,
guix-commits <=
- 22/75: gnu: gedit: Update to 40.1., guix-commits, 2021/09/27
- 17/75: gnu: gnome-system-monitor: Update to 40.1., guix-commits, 2021/09/27
- 18/75: gnu: gnome-calculator: Update to 40.1., guix-commits, 2021/09/27
- 21/75: gnu: tepl: Update to 6.00.0., guix-commits, 2021/09/27
- 24/75: gnu: amtk: Update to 5.3.1., guix-commits, 2021/09/27
- 28/75: gnu: nautilus: Update to 40.2., guix-commits, 2021/09/27
- 26/75: gnu: gnome-boxes: Update to 40.3., guix-commits, 2021/09/27
- 31/75: gnu: orca: Update to 40.0., guix-commits, 2021/09/27
- 33/75: gnu: epiphany: Update to 40.3., guix-commits, 2021/09/27
- 34/75: gnu: file-roller: Update to 3.40.0., guix-commits, 2021/09/27