gnu: gedit: Update to 3.32.2.
* gnu/packages/gnome.scm (gedit): Update to 3.32.2. [build-system]: Use meson-build-system. [arguments]: Set glib-or-gtk? flag; add 'patch-libgd-fetch' and 'skip-gtk-update-icon-cache' phases; pass configure flag to add $out/lib/gedit to RUNPATH. [native-inputs]: Add desktop-file-utils, libgd and glib:bin. [inputs]: Replace gtksourceview-3 with gtksourceview.master
parent
4c96e5d167
commit
480c92268d
|
@ -5190,7 +5190,7 @@ javascript engine and the GObject introspection framework.")
|
||||||
(define-public gedit
|
(define-public gedit
|
||||||
(package
|
(package
|
||||||
(name "gedit")
|
(name "gedit")
|
||||||
(version "3.30.2")
|
(version "3.32.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
@ -5198,38 +5198,68 @@ javascript engine and the GObject introspection framework.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"))))
|
"1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:glib-or-gtk? #t
|
||||||
|
#:configure-flags
|
||||||
|
;; Otherwise, the RUNPATH will lack the final path component.
|
||||||
|
(list (string-append "-Dc_link_args=-Wl,-rpath="
|
||||||
|
(assoc-ref %outputs "out") "/lib/gedit"))
|
||||||
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after
|
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||||
'install 'wrap-gedit
|
;; Don't create 'icon-theme.cache'.
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda _
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(substitute* "build-aux/meson/post_install.py"
|
||||||
(gtksourceview (assoc-ref inputs "gtksourceview"))
|
(("gtk-update-icon-cache") (which "true")))
|
||||||
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
|
#t))
|
||||||
(python-path (getenv "PYTHONPATH")))
|
(add-after 'unpack 'patch-libgd-fetch
|
||||||
(wrap-program (string-append out "/bin/gedit")
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; For plugins.
|
(let ((libgd (assoc-ref inputs "libgd")))
|
||||||
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
|
;; Calling git is unnecessary because libgd is fetched as a
|
||||||
`("PYTHONPATH" ":" prefix (,python-path))
|
;; native input to this package.
|
||||||
;; For language-specs.
|
(substitute* "meson.build"
|
||||||
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
|
((".*git.*") ""))
|
||||||
"/share")))))
|
(copy-recursively libgd "subprojects/libgd")
|
||||||
#t)))))
|
#t)))
|
||||||
|
(add-after 'install 'wrap-gedit
|
||||||
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
(let ((out (assoc-ref outputs "out"))
|
||||||
|
(gtksourceview (assoc-ref inputs "gtksourceview"))
|
||||||
|
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
|
||||||
|
(python-path (getenv "PYTHONPATH")))
|
||||||
|
(wrap-program (string-append out "/bin/gedit")
|
||||||
|
;; For plugins.
|
||||||
|
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
|
||||||
|
`("PYTHONPATH" ":" prefix (,python-path))
|
||||||
|
;; For language-specs.
|
||||||
|
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
|
||||||
|
"/share")))))
|
||||||
|
#t)))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("dconf" ,dconf)))
|
`(("dconf" ,dconf)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("intltool" ,intltool)
|
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
|
||||||
|
("intltool" ,intltool)
|
||||||
("itstool" ,itstool)
|
("itstool" ,itstool)
|
||||||
|
("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
|
||||||
("gobject-introspection" ,gobject-introspection)
|
("gobject-introspection" ,gobject-introspection)
|
||||||
|
("libgd"
|
||||||
|
,(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://gitlab.gnome.org/GNOME/libgd")
|
||||||
|
(commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
|
||||||
|
(file-name (git-file-name "libgd" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))))
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("glib" ,glib)
|
`(("glib" ,glib)
|
||||||
("gspell" ,gspell)
|
("gspell" ,gspell)
|
||||||
("gtk+" ,gtk+)
|
("gtk+" ,gtk+)
|
||||||
("gtksourceview" ,gtksourceview-3)
|
("gtksourceview" ,gtksourceview)
|
||||||
("libpeas" ,libpeas)
|
("libpeas" ,libpeas)
|
||||||
("libxml2" ,libxml2)
|
("libxml2" ,libxml2)
|
||||||
("iso-codes" ,iso-codes)
|
("iso-codes" ,iso-codes)
|
||||||
|
|
Reference in New Issue