;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016 Patrick Hetu <patrick.hetu@auf.org>
-;;; Copyright © 2016 ng0 <ng0@n0.is>
+;;; Copyright © 2016 Nikita <nikita@n0.is>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
-;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
+ #:use-module (gnu packages documentation)
#:use-module (gnu packages enchant)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#: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 xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
("python" ,python-wrapper)))
(arguments
`(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
- #:configure-flags '("--enable-tee"))) ; needed for GNU Icecat
+ #:configure-flags '("--enable-tee" ;needed for GNU Icecat
+ "--enable-xml" ;for cairo-xml support
+ "--disable-static")))
(synopsis "2D graphics library")
(description
"Cairo is a 2D graphics library with support for multiple output devices.
(define-public harfbuzz
(package
(name "harfbuzz")
- (version "2.5.3")
+ (version "2.6.4")
(source (origin
(method url-fetch)
(uri (string-append "https://www.freedesktop.org/software/"
version ".tar.xz"))
(sha256
(base32
- "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y"))))
+ "04iwq13w6zkdhljmsxrzgg4fyh04qnwfn57rgrl9kmijc7cvh4wl"))))
(build-system gnu-build-system)
(outputs '("out"
"bin")) ; 160K, only hb-view depend on cairo
"See 'COPYING' in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/")))
+(define-public libdatrie
+ (package
+ (name "libdatrie")
+ (version "0.2.12")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://linux.thai.net/pub/ThaiLinux/software/"
+ "libthai/libdatrie-" version ".tar.xz"))
+ (sha256
+ (base32 "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5"))))
+ (build-system gnu-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ (string-append "--with-html-docdir="
+ (assoc-ref %outputs "doc")
+ "/share/doc/datrie/html"))))
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("pkg-config" ,pkg-config)))
+ (synopsis "Double-Array Trie Library")
+ (description "Libdatrie is an implementation of double-array structure for
+representing trie. Trie is a kind of digital search tree.")
+ (home-page "https://linux.thai.net/~thep/datrie/datrie.html")
+ (license license:lgpl2.1+)))
+
+(define-public libthai
+ (package
+ (name "libthai")
+ (version "0.1.28")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://linux.thai.net/pub/thailinux/software/"
+ "libthai/libthai-" version ".tar.xz"))
+ (sha256
+ (base32 "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z"))))
+ (build-system gnu-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ (string-append "--with-html-docdir="
+ (assoc-ref %outputs "doc")
+ "/share/doc/libthai/html"))))
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("datrie" ,libdatrie)))
+ (synopsis "Thai language support library")
+ (description "LibThai is a set of Thai language support routines aimed to
+ease developers’ tasks to incorporate Thai language support in their
+applications.")
+ (home-page "https://linux.thai.net/projects/libthai")
+ (license license:lgpl2.1+)))
+
(define-public pango
(package
(name "pango")
- (version "1.42.4")
+ (version "1.44.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
+ (patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"))))
- (build-system gnu-build-system)
+ "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6"))))
+ (build-system meson-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'disable-cantarell-tests
+ (lambda _
+ (substitute* "tests/meson.build"
+ ;; XXX FIXME: These tests require "font-cantarell", but
+ ;; adding it here would introduce a circular dependency.
+ (("\\[ 'test-harfbuzz'.*") "")
+ (("\\[ 'test-itemize'.*") "")
+ (("\\[ 'test-layout'.*") ""))
+ #t)))))
(propagated-inputs
;; These are all in Requires or Requires.private of the '.pc' files.
`(("cairo" ,cairo)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
- ("harfbuzz" ,harfbuzz)))
- (inputs
- `(("zlib" ,zlib)
+ ("harfbuzz" ,harfbuzz)
;; Some packages, such as Openbox, expect Pango to be built with the
;; optional libxft support.
("libxft" ,libxft)))
+ (inputs
+ `(("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
(license license:lgpl2.0+)
(home-page "https://developer.gnome.org/pango/")))
+(define-public pango-1.42
+ (package
+ (inherit pango)
+ (version "1.42.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/pango/"
+ (version-major+minor version) "/"
+ "pango-" version ".tar.xz"))
+ (sha256
+ (base32
+ "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx"))))
+ (build-system gnu-build-system)
+ (arguments '())))
+
(define-public pangox-compat
(package
(name "pangox-compat")
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)
- ("pango" ,pango)))
+ ("pango" ,pango-1.42)))
(native-inputs
`(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(define-public ganv
(package
(name "ganv")
- (version "1.4.2")
+ (version "1.6.0")
(source (origin
(method url-fetch)
(uri (string-append "https://download.drobilla.net/ganv-"
version ".tar.bz2"))
(sha256
(base32
- "0g7s5mp14qgbfjdql0k1s8464r21g47ssn5dws6jazsnw6njhl0l"))))
+ "0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
(build-system waf-build-system)
(arguments
`(#:phases
(string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib"))
#t)))
- #:python ,python-2 ;XXX: The bundled waf fails with Python 3.7.0.
#:tests? #f)) ; no check target
(inputs
`(("gtk" ,gtk+-2)
diagrams.")
(license license:gpl3+)))
-(define-public ganv-devel
- (let ((commit "12f7d6b0438c94dd87f773a92eee3453d971846e")
- (revision "1"))
- (package
- (inherit ganv)
- (name "ganv")
- (version (string-append "1.5.4-" revision "."
- (string-take commit 9)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.drobilla.net/ganv.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1cr8w02lr6bk9mkxa12j3imq721b2an2yn4bj5wnwmpm91ddn2gi")))))))
-
(define-public gtksourceview-2
(package
(name "gtksourceview")
;; Used for testing and required at runtime.
("shared-mime-info" ,shared-mime-info)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libx11" ,libx11)))
(native-inputs
("libxi" ,libxi)
("libxtst" ,libxtst)))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
+ `(("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("glib" ,glib "bin")
- ("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(synopsis "Assistive Technology Service Provider Interface, core components")
(description
(license license:lgpl2.0+)
(home-page "https://projects.gnome.org/accessibility/")))
+;;; A minimal variant used to prevent a cycle with Inkscape.
+(define at-spi2-core-minimal
+ (package
+ (inherit at-spi2-core)
+ (name "at-spi2-core-minimal")
+ (outputs (delete "doc" (package-outputs at-spi2-core)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments at-spi2-core)
+ ((#:configure-flags configure-flags)
+ `(delete "-Ddocs=true" ,configure-flags))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'set-documentation-path)
+ (delete 'prepare-doc-directory)
+ (delete 'move-documentation)))))
+ (native-inputs
+ (alist-delete "gtk-doc" (package-native-inputs at-spi2-core)))))
+
(define-public at-spi2-atk
(package
(name "at-spi2-atk")
(setenv "DBUS_FATAL_WARNINGS" "0")
(invoke "dbus-launch" "meson" "test"))))))
(propagated-inputs
+ ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or
+ ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle.
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
(inputs
`(("atk" ,atk)))
"gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
"gtk2-theme-paths.patch"))))
(build-system gnu-build-system)
- (outputs '("out" "doc"))
+ (outputs '("out" "bin" "doc"))
(propagated-inputs
`(("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf+svg)
(assoc-ref %outputs "doc")
"/share/gtk-doc/html"))
#:phases
- (alist-cons-before
- 'configure 'disable-tests
- (lambda _
- ;; FIXME: re-enable tests requiring an X server
- (substitute* "gtk/Makefile.in"
- (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
- #t)
- %standard-phases)))
+ (modify-phases %standard-phases
+ (add-before 'configure 'disable-tests
+ (lambda _
+ ;; FIXME: re-enable tests requiring an X server
+ (substitute* "gtk/Makefile.in"
+ (("SUBDIRS = theme-bits . tests") "SUBDIRS = theme-bits ."))
+ #t))
+ (add-after 'install 'remove-cache
+ (lambda* (#:key outputs #:allow-other-keys)
+ (for-each
+ delete-file
+ (find-files (assoc-ref outputs "out") "immodules.cache"))
+ #t)))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK2_PATH")
(define-public gtk+
(package (inherit gtk+-2)
(name "gtk+")
- (version "3.24.14")
+ (version "3.24.20")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"))
+ "1wqxkd3xnqwihcawncp9mkf9bv5a5fg5i4ahm6klpl782vvnkb1d"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
- (outputs '("out" "bin" "doc"))
(propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk)
("atk" ,atk)
(define-public guile-cairo
(package
(name "guile-cairo")
- (version "1.10.0")
+ (version "1.11.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/guile-cairo/guile-cairo-"
version ".tar.gz"))
(sha256
(base32
- "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf"))
+ "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"))
(modules '((guix build utils)))
(snippet
(begin
"#include <libguile.h>\n#include <string.h>\n"))
#t)))))
(build-system gnu-build-system)
+ (arguments
+ ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build
+ ;; because of them.
+ '(#:configure-flags '("--disable-Werror")
+ #:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings
(inputs
`(("guile-lib" ,guile-lib)
("expat" ,expat)
- ("guile" ,guile-2.2)))
+ ("guile" ,guile-3.0)))
(propagated-inputs
;; The .pc file refers to 'cairo'.
`(("cairo" ,cairo)))
exceptions, macros, and a dynamic programming environment.")
(license license:lgpl3+)))
-(define-public guile3.0-cairo
+(define-public guile2.2-cairo
(package
(inherit guile-cairo)
- (name "guile3.0-cairo")
- (arguments
- (substitute-keyword-arguments (package-arguments guile-cairo)
- ((#:configure-flags flags ''())
- ;; Uses of 'scm_t_uint8' & co. are deprecated; don't stop the build
- ;; because of them.
- `(cons "--disable-Werror" ,flags))))
+ (name "guile2.2-cairo")
(inputs
- `(("guile" ,guile-3.0)
- ("guile-lib" ,guile3.0-lib)
+ `(("guile" ,guile-2.2)
+ ("guile-lib" ,guile2.2-lib)
,@(fold alist-delete (package-inputs guile-cairo)
'("guile" "guile-lib"))))))
+(define-public guile3.0-cairo
+ (deprecated-package "guile3.0-cairo" guile-cairo))
+
(define-public guile-rsvg
;; Use a recent snapshot that supports Guile 2.2 and beyond.
(let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678")
(version (string-append "2.18.1-" revision "."
(string-take commit 7)))
(source (origin
- (method url-fetch)
- (uri (string-append "https://gitlab.com/wingo/guile-rsvg/"
- "repository/archive.tar.gz?ref="
- commit))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/wingo/guile-rsvg/")
+ (commit commit)))
(sha256
(base32
- "0vdzjx8l5nc4y2xjqs0g1rqn1zrwfsm30brh5gz00r1x41a2pvv2"))
+ "0cnbl40df2sbhpc32cma6j6w312rfvcgbxxqaixgf0ymim3fb248"))
(patches (search-patches "guile-rsvg-pkgconfig.patch"))
(modules '((guix build utils)))
(snippet
("automake" ,automake)
("libtool" ,libtool)
("texinfo" ,texinfo)))
- (inputs `(("guile" ,guile-2.2)
+ (inputs `(("guile" ,guile-3.0)
("librsvg" ,librsvg)
("guile-lib" ,guile-lib))) ;for (unit-test)
(propagated-inputs `(("guile-cairo" ,guile-cairo)))
(home-page "https://wingolog.org/projects/guile-rsvg/")
(license license:lgpl2.1+))))
-(define-public guile3.0-rsvg
+(define-public guile2.2-rsvg
(package
(inherit guile-rsvg)
- (name "guile3.0-rsvg")
+ (name "guile2.2-rsvg")
(inputs
- `(("guile" ,guile-3.0)
- ("guile-lib" ,guile3.0-lib)
+ `(("guile" ,guile-2.2)
+ ("guile-lib" ,guile2.2-lib)
,@(fold alist-delete (package-inputs guile-rsvg)
'("guile" "guile-lib"))))
- (propagated-inputs `(("guile-cairo" ,guile3.0-cairo)))))
+ (propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
+
+(define-public guile3.0-rsvg
+ (deprecated-package "guile3.0-rsvg" guile-rsvg))
(define-public guile-present
(package
out "/lib/guile/" version "/site-ccache "))))
#t)))))
(native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("guile" ,guile-2.2)))
+ (inputs `(("guile" ,guile-3.0)))
(propagated-inputs
;; These are used by the (present …) modules.
`(("guile-lib" ,guile-lib)
documents.")
(license license:lgpl3+)))
-(define-public guile3.0-present
+(define-public guile2.2-present
(package
(inherit guile-present)
- (name "guile3.0-present")
- (inputs `(("guile" ,guile-3.0)))
+ (name "guile2.2-present")
+ (inputs `(("guile" ,guile-2.2)))
(propagated-inputs
- `(("guile-lib" ,guile3.0-lib)
- ("guile-cairo" ,guile3.0-cairo)
- ("guile-rsvg" ,guile3.0-rsvg)))))
+ `(("guile-lib" ,guile2.2-lib)
+ ("guile-cairo" ,guile2.2-cairo)
+ ("guile-rsvg" ,guile2.2-rsvg)))))
+
+(define-public guile3.0-present
+ (deprecated-package "guile3.0-present" guile-present))
(define-public guile-gnome
(package
("glib" ,glib)))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs
- `(("guile-cairo" ,guile-cairo)
+ `(("guile-cairo" ,guile2.2-cairo)
("g-wrap" ,g-wrap)
- ("guile-lib" ,guile-lib)))
+ ("guile-lib" ,guile2.2-lib)))
(arguments
`(#:tests? #f ;FIXME
#:phases (modify-phases %standard-phases
library.")
(license license:lgpl2.0+)))
+(define-public cairomm-1.13
+ (package
+ (inherit cairomm)
+ (name "cairomm")
+ (version "1.13.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://www.cairographics.org/releases/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1xlfl0fm5mgv53lr8xjv2kqsk3bz67qkk6qzvbrqmbvbvvbqp9wp"))))
+ (propagated-inputs
+ `(("cairo" ,cairo)
+ ("sigc++" ,libsigc++-2)))))
+
(define-public pangomm
(package
(name "pangomm")
library.")
(license license:lgpl2.1+)))
+(define-public pangomm-2.42
+ (package
+ (inherit pangomm)
+ (name "pangomm")
+ (version "2.42.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"))))
+ (propagated-inputs
+ `(("cairomm" ,cairomm-1.13)
+ ("glibmm" ,glibmm-2.64)
+ ("pango" ,pango)))))
+
(define-public atkmm
(package
(name "atkmm")
(define-public python-pycairo
(package
(name "python-pycairo")
- (version "1.17.1")
+ (version "1.19.1")
(source
(origin
(method url-fetch)
version "/pycairo-" version ".tar.gz"))
(sha256
(base32
- "165n0g7gp2a0qi8558snvfans17x83jv2lv7bx4vr1rxjbn3a2hg"))))
+ "111fav9m1iagw3nh2ws2vzkjh34r97yl7rdlpvsngsqg521k251c"))))
(build-system python-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
(license license:lgpl3+)
(properties `((python2-variant . ,(delay python2-pycairo))))))
+;; Pycairo no longer supports Python 2 since version 1.19.0, so we stick
+;; with this older version here.
(define-public python2-pycairo
(let ((pycairo (package-with-python2
(strip-python2-variant python-pycairo))))
(package
(inherit pycairo)
- (propagated-inputs
- `(("python2-funcsigs" ,python2-funcsigs)
- ,@(package-propagated-inputs pycairo)))
+ (version "1.18.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/pygobject/pycairo/releases"
+ "/download/v" version "/pycairo-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0cb5n4r4nl0k1g90b1gz9iyk4lp7hi03db98i1p52a870bym7f6w"))))
;; Dual-licensed under LGPL 2.1 or Mozilla Public License 1.1
(license (list license:lgpl2.1 license:mpl1.1)))))
`(("pkg-config" ,pkg-config)))
(inputs
`(("python" ,python-2)
+
+ ;; XXX: The package fails to build with the latest Pango (propagated
+ ;; from GTK+2), so we provide it with this older version.
+ ("pango" ,pango-1.42)
+
("libglade" ,libglade)
("glib" ,glib)))
(propagated-inputs
(define-public gtkspell3
(package
(name "gtkspell3")
- (version "3.0.9")
+ (version "3.0.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/gtkspell/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32
- "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"))))
+ "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h"))))
(build-system gnu-build-system)
(native-inputs
`(("intltool" ,intltool)
("gtk+" ,gtk+)
("pango" ,pango)))
(propagated-inputs
- `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it
+ `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it
(home-page "http://gtkspell.sourceforge.net")
(synopsis "Spell-checking addon for GTK's TextView widget")
(description
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/CristianHenzel/ClipIt.git")
+ (url "https://github.com/CristianHenzel/ClipIt")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(package
(name "graphene")
(version "1.10.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/ebassi/graphene/releases/"
- "download/" version
- "/graphene-" version ".tar.xz"))
- (sha256
- (base32 "16b4hz73bnrgv5v8n96dczkd6xp9qc06lrl43zln3jnl3psrfva0"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/ebassi/graphene.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14a0j1rvjlc7yhfdmhmckdmkzy4ch61qbzywdlw1xv58h23wx29p"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Dinstalled_tests=false")))
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ "-Dinstalled_tests=false")))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
+ `(("git" ,git-minimal)
+ ("gobject-introspection" ,gobject-introspection)
+ ("mutest" ,mutest)
("pkg-config" ,pkg-config)))
(inputs
- `(("python" ,python)
- ("glib" ,glib)))
- (home-page "https://ebassi.github.io/graphene/")
+ `(("glib" ,glib)
+ ("python" ,python)))
(synopsis "Thin layer of graphic data types")
- (description "This library provides graphic types and their relative API;
-it does not deal with windowing system surfaces, drawing, scene graphs, or
-input.")
+ (description "Graphene provides graphic types and their relative API; it
+does not deal with windowing system surfaces, drawing, scene graphs, or input.")
+ (home-page "https://ebassi.github.io/graphene/")
(license license:expat)))
(define-public spread-sheet-widget
(package
(name "spread-sheet-widget")
- (version "0.3")
+ (version "0.6")
(source
(origin
(method url-fetch)
(uri (string-append "https://alpha.gnu.org/gnu/ssw/"
"spread-sheet-widget-" version ".tar.gz"))
(sha256
- (base32 "1h93yyh2by6yrmkwqg38nd5knids05k5nqzcihc1hdwgzg3c4b8y"))))
+ (base32 "08ck9l697xg8vpya5h07raq837i4pqxjqzx30vhscq4xpps2b8kj"))))
(build-system gnu-build-system)
(native-inputs
`(("glib" ,glib "bin") ; for glib-genmarshal, etc.
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/v1cont/yad.git")
+ (url "https://github.com/v1cont/yad")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
"/lib/girepository-1.0"))
#:phases
(modify-phases %standard-phases
+ (add-before 'configure 'do-not-treat-warnings-as-errors
+ (lambda _
+ ;; Prevent the build from failing due to deprecation warnings
+ ;; from newer GLib and GTK versions.
+ (substitute* (find-files "." "^Makefile.in$")
+ ((" -Werror")
+ ""))
+ #t))
(add-before 'configure 'set-environment
(lambda _
(setenv "HAVE_VALGRIND_TRUE" "")
library for drawing.")
(home-page "https://wiki.gnome.org/GooCanvas")
(license license:lgpl2.0)))
+
+(define-public gtksheet
+ (package
+ (name "gtksheet")
+ (version "4.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fpaquet/gtksheet")
+ (commit (string-append "V" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10qzmdkjkkvkcadxn019cbyhwaahxcfv1apv54lc711bqvh63v8r"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags (list "--enable-glade"
+ "--enable-introspection")
+ #:phases
+ (modify-phases %standard-phases
+ ;; The "configure" script is present, but otherwise the project is
+ ;; not bootstrapped properly. Delete configure so the bootstrap phase
+ ;; will take over.
+ (add-after 'unpack 'delete-configure
+ (lambda _
+ (delete-file "configure")
+ #t))
+ ;; Fix glade install directories.
+ (add-before 'bootstrap 'configure-glade-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "configure.ac"
+ (("`\\$PKG_CONFIG --variable=catalogdir gladeui-2.0`")
+ (string-append (assoc-ref outputs "out") "/share/glade/catalogs"))
+ (("`\\$PKG_CONFIG --variable=moduledir gladeui-2.0`")
+ (string-append (assoc-ref outputs "out") "/lib/glade/modules"))
+ (("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2.0`")
+ (string-append (assoc-ref outputs "out") "/share/pixmaps")))
+ #t))
+ ;; Fix incorrect typelib version. This is a known upstream bug. See
+ ;; https://github.com/fpaquet/gtksheet/issues/23
+ (add-after 'install 'fix-typelib-version
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion (string-append (assoc-ref outputs "out")
+ "/lib/girepository-1.0")
+ (rename-file "GtkSheet-4.0.typelib"
+ (string-append "GtkSheet-" ,version ".typelib")))
+ #t)))))
+ (inputs
+ `(("glade" ,glade3)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("libxml2" ,libxml2)))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gobject-introspection" ,gobject-introspection)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://fpaquet.github.io/gtksheet/")
+ (synopsis "Spreadsheet widget for GTK+")
+ (description "GtkSheet is a matrix widget for GTK+. It consists of an
+scrollable grid of cells where you can allocate text. Cell contents can be
+edited interactively through a specially designed entry, GtkItemEntry. It is
+also a container subclass, allowing you to display buttons, images and any
+other widget in it. You can also set many attributes such as border,
+foreground and background colors, text justification and more.")
+ (native-search-paths
+ (list
+ (search-path-specification
+ (variable "GLADE_CATALOG_SEARCH_PATH")
+ (files '("share/glade/catalogs")))
+ (search-path-specification
+ (variable "GLADE_MODULE_SEARCH_PATH")
+ (files '("lib/glade/modules")))))
+ (license license:lgpl2.0+)))