From: Kei Kebreau <kkebreau@posteo.net>
To: 38029@debbugs.gnu.org
Cc: Kei Kebreau <kkebreau@posteo.net>
Subject: [bug#38029] [PATCH 07/80] gnu: gedit: Update to 3.32.2.
Date: Fri, 1 Nov 2019 21:40:56 -0400 [thread overview]
Message-ID: <20191102014058.3061-7-kkebreau@posteo.net> (raw)
In-Reply-To: <20191102014058.3061-1-kkebreau@posteo.net>
* 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' phase; pass
configure flag to add $out/lib/gedit to RUNPATH.
[native-inputs]: Add desktop-file-utils, libgd, glib:bin and gtk+:bin.
[inputs]: Replace gtksourceview-3 with gtksourceview.
---
gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++++-------------
1 file changed, 46 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5d8add8c55..c1cba7687a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4922,7 +4922,7 @@ javascript engine and the GObject introspection framework.")
(define-public gedit
(package
(name "gedit")
- (version "3.30.2")
+ (version "3.32.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4930,38 +4930,63 @@ javascript engine and the GObject introspection framework.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"))))
- (build-system glib-or-gtk-build-system)
+ "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"))))
+ (build-system meson-build-system)
(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
- (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)))))
+ (add-after 'unpack 'patch-libgd-fetch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libgd (assoc-ref inputs "libgd")))
+ ;; Calling git is unnecessary because libgd is fetched as a
+ ;; native input to this package.
+ (substitute* "meson.build"
+ ((".*git.*") ""))
+ (copy-recursively libgd "subprojects/libgd")
+ #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
`(("dconf" ,dconf)))
(native-inputs
- `(("intltool" ,intltool)
+ `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+ ("intltool" ,intltool)
("itstool" ,itstool)
+ ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection)
+ ("gtk+" ,gtk+ "bin") ; for gtk-update-icon-cache
+ ("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)))
(inputs
`(("glib" ,glib)
("gspell" ,gspell)
("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview-3)
+ ("gtksourceview" ,gtksourceview)
("libpeas" ,libpeas)
("libxml2" ,libxml2)
("iso-codes" ,iso-codes)
--
2.23.0
next prev parent reply other threads:[~2019-11-02 1:44 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-02 1:39 [bug#38029] GNOME 3.32 patches Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 01/80] gnu: adwaita-icon-theme: Update to 3.32.0 Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 02/80] gnu: baobab: " Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 03/80] gnu: eog: Update to 3.32.2 Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 04/80] gnu: epiphany: Update to 3.32.3 Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 05/80] gnu: evince: Update to 3.32.0 Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 06/80] gnu: file-roller: Update to 3.32.1 Kei Kebreau
2019-11-02 1:40 ` Kei Kebreau [this message]
2019-11-02 1:40 ` [bug#38029] [PATCH 08/80] gnu: gnome-backgrounds: Update to 3.32.0 Kei Kebreau
2019-11-02 1:40 ` [bug#38029] [PATCH 09/80] gnu: gnome-bluetooth: Update to 3.32.1 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 11/80] gnu: gnome-icon-theme: Update home page Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 15/80] gnu: Add python-dbusmock Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 17/80] gnu: grilo: Update to 0.3.9 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 18/80] gnu: tracker: Update to 2.2.2 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 19/80] gnu: vala: Update to 0.44.6 Kei Kebreau
2019-11-02 1:56 ` [bug#38029] GNOME 3.32 patches Kei Kebreau
2019-11-02 2:06 ` Leo Famulari
2019-11-02 2:21 ` Kei Kebreau
2019-12-08 18:19 ` bug#38029: " Kei Kebreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191102014058.3061-7-kkebreau@posteo.net \
--to=kkebreau@posteo.net \
--cc=38029@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.