[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
86/334: gnu: gtk+: Update package definition.
|
From: |
guix-commits |
|
Subject: |
86/334: gnu: gtk+: Update package definition. |
|
Date: |
Sat, 15 Aug 2020 16:26:28 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit eefeedb8c16afc1a0d249db15e84cbfc9917378d
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Sat Jul 4 06:55:04 2020 -0400
gnu: gtk+: Update package definition.
* gnu/packages/gtk.scm (gtk+): Remove inheritance from gtk+-2.
[version]: Update to 3.24.20.
[source]<sha256>: Modify base32.
[arguments]<#:configure-flags>[--enable-cloudproviders]: New flag.
<#:phases>['pre-configure]: Remove phase.
['pre-check]: New phase.
['disable-failing-tests]: New phase.
[native-inputs]: Add docbook-xml, intltool, sassc and libxslt.
[inputs]: Add graphene, harfbuzz, iso-codes, libcloudproviders and papi.
[propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib,
libx11, libxcomposite, libxext, libxfixes and libxrender.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gtk.scm | 217 +++++++++++++++++++++++++++++++--------------------
1 file changed, 131 insertions(+), 86 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 0c27efa..98c8f80 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -73,18 +73,21 @@
#:use-module (gnu packages graphics)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages iso-codes)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
+ #:use-module (gnu packages profiling)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages cups)
#:use-module (gnu packages version-control)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
@@ -809,92 +812,134 @@ application suites.")
(license license:lgpl2.0+)))
(define-public gtk+
- (package (inherit gtk+-2)
- (name "gtk+")
- (version "3.24.20")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))
- (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
-
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
- (propagated-inputs
- `(("at-spi2-atk" ,at-spi2-atk)
- ("atk" ,atk)
- ("gdk-pixbuf" ,gdk-pixbuf+svg)
- ("libepoxy" ,libepoxy)
- ("libxcursor" ,libxcursor)
- ("libxi" ,libxi)
- ("libxinerama" ,libxinerama)
- ("libxkbcommon" ,libxkbcommon)
- ("libxdamage" ,libxdamage)
- ("libxrandr" ,libxrandr)
- ("mesa" ,mesa)
- ("pango" ,pango)
- ("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols)))
- (inputs
- `(("libxml2" ,libxml2)
- ;; XXX: colord depends on mozjs (through polkit), which fails on
- ;; on non-intel systems now.
- ;;("colord" ,colord)
- ("cups" ,cups) ;for printing support
- ;; XXX: rest depends on p11-kit, which fails on mips64el now.
- ;;("rest" ,rest)
- ("json-glib" ,json-glib)))
- (native-inputs
- `(("perl" ,perl)
- ("glib" ,glib "bin")
- ("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("gobject-introspection" ,gobject-introspection)
- ("python-wrapper" ,python-wrapper)
- ;; By using a special xorg-server for GTK+'s tests, we reduce the impact
- ;; of updating xorg-server directly on the master branch.
- ("xorg-server" ,xorg-server-for-tests)))
- (arguments
- `(#:disallowed-references (,xorg-server-for-tests)
- ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
- ;; to "doc".
- #:configure-flags (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html")
- ;; The header file <gdk/gdkwayland.h> is required
- ;; by gnome-control-center
- "--enable-wayland-backend"
- ;; This is necessary to build both backends.
- "--enable-x11-backend"
- ;; This enables the HTML5 websocket backend.
- "--enable-broadway-backend")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'pre-configure
- (lambda _
- ;; Disable most tests, failing in the chroot with the message:
- ;; D-Bus library appears to be incorrectly set up; failed to read
- ;; machine uuid: Failed to open "/etc/machine-id": No such file or
- ;; directory.
- ;; See the manual page for dbus-uuidgen to correct this issue.
- (substitute* "testsuite/Makefile.in"
- (("SUBDIRS = gdk gtk a11y css reftests")
- "SUBDIRS = gdk"))
- #t))
- (add-after 'install 'move-desktop-files
- ;; Move desktop files into 'bin' to avoid cycle references.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (bin (assoc-ref outputs "bin")))
- (mkdir-p (string-append bin "/share"))
- (rename-file (string-append out "/share/applications")
- (string-append bin "/share/applications"))
- #t))))))
- (native-search-paths
- (list (search-path-specification
- (variable "GUIX_GTK3_PATH")
- (files '("lib/gtk-3.0")))))))
+ (package
+ (name "gtk+")
+ (version "3.24.20")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))
+ (patches
+ (search-patches
+ "gtk3-respect-GUIX_GTK3_PATH.patch"
+ "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
+ (build-system gnu-build-system)
+ (outputs '("out" "bin" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--enable-x11-backend"
+ "--enable-broadway-backend"
+ "--enable-wayland-backend"
+ "--enable-cloudproviders"
+ (string-append "--with-html-dir=" (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #: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")
+ ;; Tests write to $HOME.
+ (setenv "HOME" (getcwd))
+ ;; Tests look for $XDG_RUNTIME_DIR.
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ #t))
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "testsuite/gtk/Makefile.in"
+ (("builderparser cellarea check-icon-names check-cursor-names")
+ "builderparser cellarea check-cursor-names")
+ (("notify no-gtk-init object objects-finalize papersize rbtree")
+ "no-gtk-init papersize rbtree")
+ (("stylecontext templates textbuffer textiter treemodel
treepath")
+ "stylecontext textbuffer textiter treemodel treepath"))
+ (substitute* "testsuite/a11y/Makefile.in"
+ (("accessibility-dump tree-performance text children derive")
+ "tree-performance text children derive"))
+ (substitute* "testsuite/reftests/Makefile.in"
+ (("TEST_PROGS = gtk-reftest")
+ "TEST_PROGS = "))
+ #t))
+ ;; Move desktop files into 'bin' to avoid cycle references.
+ (add-after 'install 'move-desktop-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (assoc-ref outputs "bin")))
+ (mkdir-p (string-append bin "/share"))
+ (rename-file
+ (string-append out "/share/applications")
+ (string-append bin "/share/applications"))
+ #t))))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("gettext" ,gettext-minimal)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("intltool" ,intltool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python-wrapper" ,python-wrapper)
+ ("sassc" ,sassc)
+ ("xorg-server" ,xorg-server-for-tests)
+ ("xsltproc" ,libxslt)))
+ (inputs
+ `(("colord" ,colord)
+ ("cups" ,cups)
+ ("graphene" ,graphene)
+ ("harfbuzz" ,harfbuzz)
+ ("iso-codes" ,iso-codes)
+ ("json-glib" ,json-glib)
+ ("libcloudproviders" ,libcloudproviders)
+ ("libxml2" ,libxml2)
+ ("papi" ,papi)
+ ("rest" ,rest)))
+ (propagated-inputs
+ `(("atk" ,atk)
+ ("at-spi2-atk" ,at-spi2-atk)
+ ("cairo" ,cairo)
+ ("fribidi" ,fribidi)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
+ ("glib" ,glib)
+ ("libepoxy" ,libepoxy)
+ ("libx11" ,libx11)
+ ("libxcomposite" ,libxcomposite)
+ ("libxcursor" ,libxcursor)
+ ("libxdamage" ,libxdamage)
+ ("libxext" ,libxext)
+ ("libxfixes" ,libxfixes)
+ ("libxi" ,libxi)
+ ("libxinerama" ,libxinerama)
+ ("libxkbcommon" ,libxkbcommon)
+ ("libxrandr" ,libxrandr)
+ ("libxrender" ,libxrender)
+ ("mesa" ,mesa)
+ ("pango" ,pango)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)))
+ (native-search-paths
+ (list
+ (search-path-specification
+ (variable "GUIX_GTK3_PATH")
+ (files '("lib/gtk-3.0")))))
+ (search-paths native-search-paths)
+ (synopsis "Cross-platform toolkit for creating graphical user interfaces")
+ (description "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for
creating
+graphical user interfaces. Offering a complete set of widgets, GTK+ is
+suitable for projects ranging from small one-off tools to complete
+application suites.")
+ (home-page "https://www.gtk.org/";)
+ (license license:lgpl2.0+)))
;;;
;;; Guile bindings.
- 40/334: gnu: glib: Update package definition., (continued)
- 40/334: gnu: glib: Update package definition., guix-commits, 2020/08/15
- 56/334: gnu: Add flux., guix-commits, 2020/08/15
- 58/334: gnu: Add directfb., guix-commits, 2020/08/15
- 37/334: gnu: gsettings-desktop-schemas: Update package definition., guix-commits, 2020/08/15
- 42/334: gnu: glib-networking: Update to 2.64.3., guix-commits, 2020/08/15
- 66/334: gnu: Add libquicktime., guix-commits, 2020/08/15
- 61/334: gnu: Add ffmpeg-2.8., guix-commits, 2020/08/15
- 71/334: gnu: Add lksctp-tools., guix-commits, 2020/08/15
- 75/334: gnu: Add transcode., guix-commits, 2020/08/15
- 83/334: gnu: Add rust-imgref., guix-commits, 2020/08/15
- 86/334: gnu: gtk+: Update package definition.,
guix-commits <=
- 88/334: gnu: gtk+: Propagate libcloudproviders., guix-commits, 2020/08/15
- 87/334: gnu: gtk-doc: Update package definition., guix-commits, 2020/08/15
- 89/334: gnu: gtksourceview: Update package definition., guix-commits, 2020/08/15
- 92/334: gnu: fuse: Update package definition., guix-commits, 2020/08/15
- 95/334: gnu: Add openni2., guix-commits, 2020/08/15
- 101/334: gnu: json-glib: Update package definition., guix-commits, 2020/08/15
- 102/334: gnu: libcanberra: Update package definition., guix-commits, 2020/08/15
- 103/334: gnu: libgee: Update package definition., guix-commits, 2020/08/15
- 105/334: gnu: librsvg@2.40.21: Update package definition., guix-commits, 2020/08/15
- 111/334: gnu: Add rust-serial-test@0.1.0., guix-commits, 2020/08/15