diff options
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 69 |
1 files changed, 22 insertions, 47 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5eb03a0186..cec10504c5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -469,7 +469,11 @@ highlighting and other features typical of a source code editor.") ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; assertion failed (error == NULL): Data differ ;; (gdk-pixbuf-error-quark, 0) - ((".*'pixbuf-jpeg'.*") "")) + ((".*'pixbuf-jpeg'.*") "") + ;; Extend the timeout of the test suite. + ;; TODO: Check upstreaming effort: + ;; https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/21 + (("300") "1800")) #t)) (add-before 'configure 'aid-install-script (lambda* (#:key outputs #:allow-other-keys) @@ -774,54 +778,26 @@ application suites.") (define-public guile-cairo (package (name "guile-cairo") - (version "1.4.1") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append - "http://download.gna.org/guile-cairo/guile-cairo-" - version - ".tar.gz")) + (uri (string-append "mirror://savannah/guile-cairo/guile-cairo-" + version ".tar.gz")) (sha256 (base32 - "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x")))) + "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf")) + (modules '((guix build utils))) + (snippet + (begin + '(begin + ;; Install Scheme files in …/guile/site/X.Y. + (substitute* (find-files "." "^Makefile\\.in$") + (("^(.*)dir = (.*)/guile/site(.*)" _ name prefix suffix) + (string-append name "dir = " prefix + "/guile/site/@GUILE_EFFECTIVE_VERSION@" + suffix))) + #t))))) (build-system gnu-build-system) - (arguments - '(#:modules ((guix build utils) - (guix build gnu-build-system) - (ice-9 popen) - (ice-9 rdelim)) - - #:phases (modify-phases %standard-phases - (add-before 'configure 'set-module-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install modules under $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (substitute* "Makefile.in" - (("scmdir = ([[:graph:]]+).*" _ value) - (string-append "scmdir = " value "/" effective "\n"))) - (substitute* "cairo/Makefile.in" - (("moduledir = ([[:graph:]]+).*" _ value) - (string-append "moduledir = " - "$(prefix)/share/guile/site/" - effective "/cairo\n'"))) - #t))) - (add-after 'install 'install-missing-file - (lambda* (#:key outputs #:allow-other-keys) - ;; By default 'vector-types.scm' is not installed, so do - ;; it here. - (let ((out (assoc-ref outputs "out")) - (effective - (read-line - (open-pipe* OPEN_READ "guile" "-c" - "(display (effective-version))")))) - (install-file "cairo/vector-types.scm" - (string-append out "/share/guile/site/" - effective "/cairo")) - #t)))))) (inputs `(("guile-lib" ,guile-lib) ("expat" ,expat) @@ -1579,12 +1555,11 @@ glass artworks done by Venicians glass blowers.") `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("enchant" ,enchant) - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) ("pango" ,pango))) (propagated-inputs - `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it. + `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it (home-page "http://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description |