Re: [PATCH 2/2] gnu: Add gedit.

[David Hashe]

New gedit patch, since it won't apply cleanly now that gtksourceview is being added to a different file. The libpeas patch should still work.

On Sun, Nov 8, 2015 at 11:20 AM, David Hashe <address@hidden> wrote:

On Sun, Nov 8, 2015 at 6:06 AM, 宋文武 <address@hidden> wrote:

David Hashe <address@hidden> writes:

> * gnu/packages/gnome.scm (gedit): New variable.
> ---
>  gnu/packages/gnome.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 56 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 9bd1c31..b6ca7c7 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3693,3 +3693,59 @@ such as gzip tarballs.")
>  GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
>  highlighting and other features typical of a source code editor.")
>     (license license:lgpl2.1+)))
> +
> +(define-public gedit
> + (package
> +   (name "gedit")
> +   (version "3.16.4")
Same here, I prefer 3.18.x.

Changed to 3.18.1.

 

> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "mirror://gnome/sources/" name "/"
> +                                (version-major+minor version) "/"
> +                                name "-" version ".tar.xz"))
> +            (sha256
> +             (base32
> +              "1h2czf2v0krqr3kar4fm2vspim30rwdb2yhab34sdn23j7m3f291"))))
> +   (build-system glib-or-gtk-build-system)
> +   (arguments
> +    `(#:configure-flags '("--disable-spell") ; requires enchant
> +      #:phases
> +      (modify-phases %standard-phases
> +        (add-after
> +         'install 'wrap-eog
> +         (lambda* (#:key outputs #:allow-other-keys)
> +           (let ((out               (assoc-ref outputs "out"))
> +                 (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
> +             (wrap-program (string-append out "/bin/gedit")
> +               `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
> +           #t)))))
> +   (propagated-inputs
> +    `(("dconf" ,dconf)))
> +   (native-inputs
> +    `(("intltool" ,intltool)
> +      ("itstool", itstool)
> +      ("gobject-introspection" ,gobject-introspection)
> +      ("pkg-config" ,pkg-config)))
> +   (inputs
> +    `(("glib" ,glib)
> +      ("gtk+" ,gtk+)
> +      ("gtksourceview" ,gtksourceview)
> +      ("libpeas" ,libpeas)
> +      ("libxml2" ,libxml2)
> +      ;; TODO: enchant needed for spell plugin
> +      ;;("enchant" ,enchant)

enchant is avaliable from enchant.scm, we can add it.

Done.

 

> +      ("iso-codes" ,iso-codes)
> +      ("python-pygobject" ,python-pygobject)
> +      ("python" ,python)
> +      ("gvfs" ,gvfs)
> +      ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
> +      ("libx11" ,libx11)
> +      ("vala" ,vala)
> +      ("adwaita-icon-theme" ,adwaita-icon-theme)
> +      ("libsoup" ,libsoup)
> +      ("gnome-desktop" ,gnome-desktop)))
> +   (home-page "https://wiki.gnome.org/Apps/Gedit")
> +   (synopsis "GNOME text editor")
> +   (description "While aiming at simplicity and ease of use, gedit is a
> +powerful general purpose text editor. ")
> +   (license license:gpl2+)))
Otherwise, look good to me, thanks!

Updating to 3.18.1 required updating libpeas, so I've attached a patch to do that in addition to the gedit patch. Thanks!

0003-gnu-Add-gedit.patch
Description: Text Data