[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/11: gnu: guile-cairo: Add "guile3.0-cairo" variant.
From: |
guix-commits |
Subject: |
07/11: gnu: guile-cairo: Add "guile3.0-cairo" variant. |
Date: |
Thu, 23 Jan 2020 05:28:09 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit e4dbe0cd2e5645f3ae86b004c05fe20b06cb47fe
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Jan 23 11:10:14 2020 +0100
gnu: guile-cairo: Add "guile3.0-cairo" variant.
* gnu/packages/gtk.scm (guile-cairo)[source](snippet): Add #include
<string.h> everywhere #include <libguile.h> appears.
(guile3.0-cairo): New variable.
---
gnu/packages/gtk.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a3e1982..6f7344c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <address@hidden>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Eric Bavier <address@hidden>
;;; Copyright © 2015 Federico Beffa <address@hidden>
@@ -833,6 +833,12 @@ application suites.")
(string-append name "dir = " prefix
"/guile/site/@GUILE_EFFECTIVE_VERSION@"
suffix)))
+
+ ;; Guile 2.x <libguile.h> used to pull in <string.h> and
+ ;; other headers but this is no longer the case in 3.0.
+ (substitute* (find-files "." "\\.[ch]$")
+ (("^ *# *include.*libguile\\.h.*$")
+ "#include <libguile.h>\n#include <string.h>\n"))
#t)))))
(build-system gnu-build-system)
(inputs
@@ -855,6 +861,22 @@ graphics library with all of the benefits of Scheme:
memory management,
exceptions, macros, and a dynamic programming environment.")
(license license:lgpl3+)))
+(define-public guile3.0-cairo
+ (package
+ (inherit guile-cairo)
+ (name "guile3.0-cairo")
+ (arguments
+ (substitute-keyword-arguments (package-arguments guile-cairo)
+ ((#:configure-flags flags ''())
+ ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build
+ ;; because of them.
+ `(cons "--disable-Werror" ,flags))))
+ (inputs
+ `(("guile" ,guile-3.0)
+ ("guile-lib" ,guile3.0-lib)
+ ,@(fold alist-delete (package-inputs guile-cairo)
+ '("guile" "guile-lib"))))))
+
(define-public guile-rsvg
;; Use a recent snapshot that supports Guile 2.2 and beyond.
(let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
- branch master updated (52d9cad -> 2c9fd76), guix-commits, 2020/01/23
- 02/11: tests: Fix typo in comment., guix-commits, 2020/01/23
- 01/11: installer: Make "TRANSLATORS" comment visible., guix-commits, 2020/01/23
- 05/11: gnu: mcron: Add "guile3.0-mcron" variant., guix-commits, 2020/01/23
- 03/11: gnu: guile-next: Disable JIT on armhf-linux., guix-commits, 2020/01/23
- 06/11: gnu: guile-lib: Add "guile3.0-lib" variant., guix-commits, 2020/01/23
- 04/11: gnu: haunt: Add "guile3.0-haunt" variant., guix-commits, 2020/01/23
- 08/11: gnu: guile-rsvg: Add "guile3.0-rsvg" variant., guix-commits, 2020/01/23
- 11/11: gnu: guile-present: Add "guile3.0-present"., guix-commits, 2020/01/23
- 10/11: gnu: guile-present: Pass the right module directories in scripts., guix-commits, 2020/01/23
- 07/11: gnu: guile-cairo: Add "guile3.0-cairo" variant.,
guix-commits <=
- 09/11: gnu: guile-present: Install .go files in /site-ccache., guix-commits, 2020/01/23