guix-commits
[Top][All Lists]
Advanced

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

25/115: gnu: cairomm: Update to 1.16.0.


From: guix-commits
Subject: 25/115: gnu: cairomm: Update to 1.16.0.
Date: Fri, 7 May 2021 16:56:27 -0400 (EDT)

raghavgururajan pushed a commit to branch wip-gnome
in repository guix.

commit 9a2a31f6e1b3e6366355a9a312435283037af71c
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Thu Mar 25 06:49:16 2021 -0400

    gnu: cairomm: Update to 1.16.0.
    
    * gnu/packages/gtk.scm (cairomm)[version]: Update to 1.16.0.
    [build-system]: Change from gnu to meson.
    [arguments]<#:glib-or-gtk?>: New argument.
    <#:configure-flags>[-Dboost-shared]: New flag.
    <#:make-flags>: Remove argument.
    [native-inputs]: Add boost and mm-common.
    
    Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
 gnu/packages/gtk.scm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e2240c5..a97830d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -59,6 +59,8 @@
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -1258,19 +1260,24 @@ guile-gnome-platform (GNOME developer libraries), and 
guile-gtksourceview.")
 (define-public cairomm
   (package
     (name "cairomm")
-    (version "1.12.2")
+    (version "1.16.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.cairographics.org/releases/";
-                                  name "-" version ".tar.gz"))
+                                  name "-" version ".tar.xz"))
               (sha256
                (base32
-                "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"))))
-    (build-system gnu-build-system)
+                "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"))))
+    (build-system meson-build-system)
     (arguments
-     ;; The examples lack -lcairo.
-     '(#:make-flags '("LDFLAGS=-lcairo")))
-    (native-inputs `(("pkg-config" ,pkg-config)))
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        "-Dboost-shared=true")))
+    (native-inputs
+     `(("boost" ,boost)
+       ("mm-common" ,mm-common)
+       ("pkg-config" ,pkg-config)))
     (propagated-inputs
      `(("libsigc++" ,libsigc++)
        ("freetype" ,freetype)



reply via email to

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