[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/21: gnu: vte: Update package definition.
From: |
guix-commits |
Subject: |
14/21: gnu: vte: Update package definition. |
Date: |
Mon, 3 Aug 2020 17:55:37 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit c466d0fe7aab6d739bb6a56c8709c50896ac145f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Thu Jul 30 11:24:09 2020 -0400
gnu: vte: Update package definition.
* gnu/packages/gnome.scm (vte) [version]: Update to 0.60.3.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Ddocs]: New flag.
[-Dvapi]: Remove flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc. Remove gperf.
[inputs]: Add fribidi, gnutls, gperf, icu4c, pcre2 and zlib.
[propagated-inputs]: Add glib and pango. Remove gnutls and pcre2.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gnome.scm | 89 +++++++++++++++++++++++++++++++++++---------------
1 file changed, 62 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3638e5a..ec78c5d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -105,6 +105,7 @@
#:use-module (gnu packages file-systems)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages fribidi)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@@ -4725,40 +4726,74 @@ targeting the GNOME stack simple.")
(define-public vte
(package
(name "vte")
- (version "0.60.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/vte/"
- (version-major+minor version) "/"
- "vte-" version ".tar.xz"))
- (sha256
- (base32
- "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"))))
+ (version "0.60.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/vte/"
+ (version-major+minor version) "/"
+ "vte-" version ".tar.xz"))
+ (sha256
+ (base32 "0al2v6fn061v4j1wwvppim1q283y2a6s0iyl29hxhmx3h48nxdzy"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- '("-Dvapi=true"
- "-D_systemd=false")))
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ "-Ddocs=true"
+ "-D_systemd=false")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "doc/reference"
+ (substitute* "vte-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #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))))))
(native-inputs
- `(("pkg-config" ,pkg-config)
+ `(("docbook-xml" ,docbook-xml-4.1.2)
("gettext" ,gettext-minimal)
- ("vala" ,vala)
+ ("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("glib" ,glib "bin") ; for glib-genmarshal, etc.
- ("gperf" ,gperf)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)
("xmllint" ,libxml2)))
+ (inputs
+ `(("fribidi" ,fribidi)
+ ("gnutls" ,gnutls)
+ ("gperf" ,gperf)
+ ("icu-uc" ,icu4c)
+ ("libpcre2" ,pcre2)
+ ("zlib" ,zlib)))
(propagated-inputs
- `(("gtk+" ,gtk+) ; required by vte-2.91.pc
- ("gnutls" ,gnutls) ; ditto
- ("pcre2" ,pcre2))) ; ditto
- (home-page "https://www.gnome.org/")
- (synopsis "Virtual Terminal Emulator")
- (description
- "VTE is a library (libvte) implementing a terminal emulator widget for
-GTK+, and a minimal sample application (vte) using that. Vte is mainly used in
-gnome-terminal, but can also be used to embed a console/terminal in games,
-editors, IDEs, etc.")
- (license license:lgpl2.1+)))
+ `(("glib" ,glib)
+ ("pango" ,pango)
+ ("gtk+" ,gtk+)))
+ (synopsis "Virtual Terminal library")
+ (description "VTE provides a virtual terminal widget for GTK
applications.")
+ (home-page "https://wiki.gnome.org/Apps/Terminal/VTE")
+ (license
+ (list
+ ;; Documentation
+ license:cc-by-sa4.0
+ ;; Library
+ license:lgpl3+
+ ;; Others
+ license:gpl3+))))
(define-public vte-ng
(package
- 04/21: gnu: libappindicator: Propagate gtk+ and libdbusmenu., (continued)
- 04/21: gnu: libappindicator: Propagate gtk+ and libdbusmenu., guix-commits, 2020/08/03
- 07/21: gnu: appstream-glib: Fix tests., guix-commits, 2020/08/03
- 05/21: gnu: Add dnssec-trigger., guix-commits, 2020/08/03
- 06/21: gnu: network-manager: Update package definition., guix-commits, 2020/08/03
- 08/21: gnu: network-manager-applet: Update package definition., guix-commits, 2020/08/03
- 10/21: download: Replace misconfigured Apache mirror., guix-commits, 2020/08/03
- 09/21: gnu: phodav: Update package definition., guix-commits, 2020/08/03
- 11/21: Revert "gnu: java-jakarta-oro: Update hash.", guix-commits, 2020/08/03
- 13/21: gnu: Add libgrss., guix-commits, 2020/08/03
- 15/21: gnu: tepl: Update package definition., guix-commits, 2020/08/03
- 14/21: gnu: vte: Update package definition.,
guix-commits <=
- 16/21: gnu: libquvi-scripts: Update package definition., guix-commits, 2020/08/03
- 12/21: gnu: gtksourceview: Fix glade., guix-commits, 2020/08/03
- 17/21: gnu: libquvi: Update package definition., guix-commits, 2020/08/03
- 18/21: gnu: totem-pl-parser: Update package definition., guix-commits, 2020/08/03
- 19/21: gnu: Add libstemmer., guix-commits, 2020/08/03
- 21/21: gnu: tracker-miners: Update package definition., guix-commits, 2020/08/03
- 20/21: gnu: tracker: Update package definition., guix-commits, 2020/08/03