On Sun, Nov 8, 2015 at 6:06 AM, 宋文武 <iyzs...@member.fsf.org> wrote:
> David Hashe <david.ha...@dhashe.com> 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!
From ec10a2f76363b2ba7c72a217d3ad00d4a9f16919 Mon Sep 17 00:00:00 2001
From: David Hashe <david.ha...@dhashe.com>
Date: Sun, 8 Nov 2015 10:57:19 -0600
Subject: [PATCH 2/3] gnu: Update libpeas.
* gnu/packages/gnome.scm (libpeas): Update to 1.16.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9c4b182..6be2183 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -669,7 +669,7 @@ some form of information without getting in the user's way.")
(define-public libpeas
(package
(name "libpeas")
- (version "1.12.1")
+ (version "1.16.0")
(source
(origin
(method url-fetch)
@@ -678,7 +678,7 @@ some form of information without getting in the user's way.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1mjjjjwphc83bjznmbsm7x0jg7ql261nys6qnl7mi0nkr4qvw476"))))
+ "0kj5n5hz93xq7qdb2r7n86nibzwqjr88jxaih1fdbxv5rn7014xh"))))
(build-system gnu-build-system)
(inputs
`(("atk" ,atk)
--
1.9.1
From bea717d176cb434c7ee9d5f94fd75db76718af05 Mon Sep 17 00:00:00 2001
From: David Hashe <david.ha...@dhashe.com>
Date: Sun, 8 Nov 2015 11:10:52 -0600
Subject: [PATCH 3/3] gnu: Add gedit.
* gnu/packages/gnome.scm (gedit): New variable.
---
gnu/packages/gnome.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6be2183..3e4a512 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -43,6 +43,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages databases)
#:use-module (gnu packages djvu)
+ #:use-module (gnu packages enchant)
#:use-module (gnu packages flex)
#:use-module (gnu packages docbook)
#:use-module (gnu packages gettext)
@@ -3693,3 +3694,57 @@ 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.18.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1kb3hglcppap7fdy7i7w2wk746kfz77jzs2lq6vrna8a3fqaxmas"))))
+ (build-system glib-or-gtk-build-system)
+ (arguments
+ `(#: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)
+ ("enchant" ,enchant)
+ ("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+)))
--
1.9.1
