[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
82/124: gnu: gtkmm: Update to 3.24.4.
From: |
guix-commits |
Subject: |
82/124: gnu: gtkmm: Update to 3.24.4. |
Date: |
Tue, 10 Aug 2021 20:21:20 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 5cd761973a5ff5f6458f5e4b80a986123477c2d2
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Fri Mar 26 11:03:36 2021 -0400
gnu: gtkmm: Update to 3.24.4.
* gnu/packages/gtk.scm (gtkmm)[version]: Update to 3.24.4.
[build-system]: Change from gnu to glib-or-gtk.
[outputs]: New output "doc".
[arguments]<#:phases>['start-xvfb]: Remove phase.
['pre-check]: New phase.
['move-doc]: New phase.
[native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and
libxslt.
[synopsis]: Modify.
[description]: Modify.
[license]: Add gpl2+.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
gnu/packages/gtk.scm | 96 +++++++++++++++++++++++++++++++---------------------
1 file changed, 57 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index cca5c16..76c6c52 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1595,49 +1595,67 @@ library.")
(define-public gtkmm
(package
(name "gtkmm")
- (version "3.24.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1hxdnhavjyvbcpxhd5z17l9fj4182028s66lc0s16qqqrldhjwbd"))))
- (build-system gnu-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin") ;for 'glib-compile-resources'
- ("xorg-server" ,xorg-server-for-tests)))
+ (version "3.24.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 +extension GLX &")
+ (setenv "DISPLAY" ":1")
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ #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/doc")
+ (string-append doc "/share/doc"))
+ #t))))))
+ (native-inputs
+ `(("dot" ,graphviz)
+ ("doxygen" ,doxygen)
+ ("m4" ,m4)
+ ("mm-common" ,mm-common)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("xsltproc" ,libxslt)
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
- `(("pangomm" ,pangomm)
+ `(("atkmm" ,atkmm)
("cairomm" ,cairomm)
- ("atkmm" ,atkmm)
+ ("glibmm" ,glibmm)
("gtk+" ,gtk+)
- ("glibmm" ,glibmm)))
- (arguments
- `(#:disallowed-references (,xorg-server-for-tests)
- #:phases (modify-phases %standard-phases
- (add-before 'check 'run-xvfb
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server")))
- ;; Tests such as 'object_move/test' require a running
- ;; X server.
- (system (string-append xorg-server "/bin/Xvfb :1 &"))
- (setenv "DISPLAY" ":1")
- ;; Don't fail because of the missing /etc/machine-id.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))))))
+ ("pangomm" ,pangomm)))
+ (synopsis "C++ Interfaces for GTK+ and GNOME")
+ (description "GTKmm is the official C++ interface for the popular GUI
+library GTK+. Highlights include typesafe callbacks, and a comprehensive set
of
+widgets that are easily extensible via inheritance. You can create user
+interfaces either in code or with the Glade User Interface designer, using
+libglademm. There's extensive documentation, including API reference and a
+tutorial.")
(home-page "https://gtkmm.org/")
- (synopsis
- "C++ interface to the GTK+ graphical user interface library")
- (description
- "gtkmm is the official C++ interface for the popular GUI library GTK+.
-Highlights include typesafe callbacks, and a comprehensive set of widgets that
-are easily extensible via inheritance. You can create user interfaces either
-in code or with the Glade User Interface designer, using libglademm. There's
-extensive documentation, including API reference and a tutorial.")
- (license license:lgpl2.1+)))
-
+ (license
+ (list
+ ;; Library
+ license:lgpl2.1+
+ ;; Tools
+ license:gpl2+))))
(define-public gtkmm-2
(package (inherit gtkmm)
- 69/124: gnu: json-glib: Update synopsis and description., (continued)
- 69/124: gnu: json-glib: Update synopsis and description., guix-commits, 2021/08/10
- 70/124: gnu: wayland: Update to 1.19.0., guix-commits, 2021/08/10
- 71/124: gnu: wayland: Fix and move documentation., guix-commits, 2021/08/10
- 77/124: gnu: gtk+-2: Update to 2.24.33., guix-commits, 2021/08/10
- 78/124: gnu: gtk+: Enable tests., guix-commits, 2021/08/10
- 81/124: gnu: gtk+: Update to 3.24.27., guix-commits, 2021/08/10
- 90/124: gnu: faac: Correct source uri., guix-commits, 2021/08/10
- 84/124: gnu: ibus: Update to 1.5.24., guix-commits, 2021/08/10
- 91/124: gnu: zbar: Update to 0.23.90., guix-commits, 2021/08/10
- 100/124: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/08/10
- 82/124: gnu: gtkmm: Update to 3.24.4.,
guix-commits <=
- 85/124: gnu: ibus: Enable documentation., guix-commits, 2021/08/10
- 95/124: gnu: gst-plugins-good: Update to 1.18.4., guix-commits, 2021/08/10
- 114/124: gnu: gtkmm@2: Override inheritance of certain changes from gtkmm., guix-commits, 2021/08/10
- 117/124: gnu: tracker: Enable some features., guix-commits, 2021/08/10
- 119/124: gnu: tracker: Update to 3.1.1 and make related changes., guix-commits, 2021/08/10
- 88/124: gnu: ibus: Remove trailing #t in phases., guix-commits, 2021/08/10
- 89/124: gnu: iqa: Correct source uri., guix-commits, 2021/08/10
- 87/124: gnu: ibus: Enable tests., guix-commits, 2021/08/10
- 92/124: gnu: gstreamer: Update to 1.18.4., guix-commits, 2021/08/10
- 94/124: gnu: gst-plugins-base: Enable more features., guix-commits, 2021/08/10