[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/44: gnu: clutter: Update to 1.26.4.
From: |
guix-commits |
Subject: |
16/44: gnu: clutter: Update to 1.26.4. |
Date: |
Thu, 25 Jun 2020 08:20:51 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit 3481eb47e9472461614e1ea62b8f373ed19e712d
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Fri May 29 05:33:21 2020 -0400
gnu: clutter: Update to 1.26.4.
* gnu/packages/gnome.scm (clutter): Update to 1.26.4.
[build-system]: Change from gnu-build-system to meson-build-system.
[arguments]<#:glib-or-gtk?>: New argument.
<#:tests?>: Remove argument.
<#:configure-flags>[-Dwayland_compositor]: New flag.
[--with-html-dir]: Remove flag.
<#:phases>['patch-docbook-xml]: New phase.
['patch-docbook-examples]: New phase.
['move-doc]: New phase.
['pre-check]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc, perl, ruby and
xorg-server.
[inputs]: Remove eudev and libxkbcommon.
[propagated-inputs]: Add gdk-pixbuf+svg, eudev, libgudev, libinput,
libx11, libxi, libxkbcommon, pango and wayland. Remove xinput.
[home-page]: Change from http to https.
[license]: Update to lgpl2.1+.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gnome.scm | 108 +++++++++++++++++++++++++++++++++----------------
1 file changed, 74 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c16ecd2..efa6be0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4898,57 +4898,97 @@ without stepping on each others toes.")
(define-public clutter
(package
(name "clutter")
- (version "1.26.2")
+ (version "1.26.4")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
(sha256
- (base32
- "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"))))
+ (base32 "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"))))
;; NOTE: mutter exports a bundled fork of clutter, so when making changes
;; to clutter, corresponding changes may be appropriate in mutter as well.
- (build-system gnu-build-system)
- (outputs '("out"
- "doc")) ;9 MiB of gtk-doc HTML pages
+ (build-system meson-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas.
+ #:configure-flags
+ (list
+ "-Dwayland_compositor=true")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "doc/reference/clutter-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t)))
+ (add-after 'unpack 'patch-cookbook-examples
+ (lambda _
+ (substitute* "doc/cookbook/meson.build"
+ (("subdir\\('examples'\\)")
+ ""))
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t)))
+ (add-before 'check 'pre-check
+ (lambda* (#:key tests? inputs #:allow-other-keys)
+ (if tests?
+ (begin
+ ;; The test suite requires a running X server.
+ (system (format #f "~a/bin/Xvfb :1 +extension GLX &"
+ (assoc-ref inputs "xorg-server")))
+ (setenv "DISPLAY" ":1")
+ #t)
+ (format #t "test suite not run~%"))
+ #t)))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-genmarshal
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("docbook-xsl" ,docbook-xsl)
+ ("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("libxslt" ,libxslt)
+ ("perl" ,perl)
("pkg-config" ,pkg-config)
- ("xsltproc" ,libxslt)))
+ ("ruby" ,ruby)
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
- `(("cogl" ,cogl)
+ `(("atk" ,atk)
+ ("cogl" ,cogl)
("cairo" ,cairo)
- ("atk" ,atk)
+ ("eudev" ,eudev)
+ ("gdk-pixbuf+svg" ,gdk-pixbuf+svg)
+ ("glib" ,glib)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
- ("glib" ,glib)
+ ("libgudev" ,libgudev)
+ ("libinput" ,libinput)
+ ("libx11" ,libx11)
("libxcomposite" ,libxcomposite)
("libxdamage" ,libxdamage)
("libxext" ,libxext)
- ("xinput" ,xinput)))
- (inputs
- `(("libxkbcommon" ,libxkbcommon)
- ("udev" ,eudev)))
- (arguments
- `(#:configure-flags (list "--enable-x11-backend=yes"
-
- ;; This produces share/doc/{clutter,cally}.
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/doc"))
- ;; XXX FIXME: Get test suite working. It would probably fail in the
- ;; same way the cogl tests fail, since clutter is based on cogl.
- #:tests? #f))
- (home-page "http://www.clutter-project.org")
+ ("libxi" ,libxi)
+ ("libxkbcommon" ,libxkbcommon)
+ ("pango" ,pango)
+ ("wayland" ,wayland)))
(synopsis "OpenGL-based interactive canvas library")
- (description
- "Clutter is an OpenGL-based interactive canvas library, designed for
-creating fast, mainly 2D single window applications such as media box UIs,
-presentations, kiosk style applications and so on.")
- (license license:lgpl2.0+)))
+ (description "Clutter is an OpenGL-based interactive canvas library,
+designed for creating fast, mainly 2D single window applications such as media
+box UIs, presentations, kiosk style applications and so on.")
+ (home-page "https://www.clutter-project.org")
+ (license license:lgpl2.1+)))
(define-public clutter-gtk
(package
- 34/44: gnu: gjs: Update to 1.58.8., (continued)
- 34/44: gnu: gjs: Update to 1.58.8., guix-commits, 2020/06/25
- 36/44: gnu: Add mutest., guix-commits, 2020/06/25
- 38/44: gnu: gsettings-desktop-schemas: Update package definition., guix-commits, 2020/06/25
- 37/44: gnu: graphene: Update package definition., guix-commits, 2020/06/25
- 27/44: gnu: fcitx: Update package definition., guix-commits, 2020/06/25
- 29/44: gnu: gcr: Update to 3.36.0., guix-commits, 2020/06/25
- 32/44: gnu: geoclue: Update to 2.5.6., guix-commits, 2020/06/25
- 39/44: gnu: Add esound., guix-commits, 2020/06/25
- 35/44: gnu: glib-networking: Update to 2.62.4., guix-commits, 2020/06/25
- 41/44: gnu: glib: Update package definition., guix-commits, 2020/06/25
- 16/44: gnu: clutter: Update to 1.26.4.,
guix-commits <=
- 20/44: gnu: dconf: Update to 0.36.0., guix-commits, 2020/06/25
- 31/44: gnu: gdk-pixbuf+svg: Update package definition., guix-commits, 2020/06/25
- 33/44: gnu: Add sysprof., guix-commits, 2020/06/25
- 42/44: gnu: glib-with-documentation: Update package definition., guix-commits, 2020/06/25
- 43/44: gnu: glib-networking: Update to 2.64.3., guix-commits, 2020/06/25
- 44/44: gnu: gobject-introspection: Update package definition., guix-commits, 2020/06/25
- 11/44: gnu: at-spi2-core: Update package definition., guix-commits, 2020/06/25
- 15/44: gnu: font-cantarell: Update package definition., guix-commits, 2020/06/25
- 18/44: gnu: clutter-gst: Update package definition., guix-commits, 2020/06/25
- 19/44: gnu: cogl: Update package definition., guix-commits, 2020/06/25