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

[David Hashe <david.hashe@dhashe.com>]

[-- Attachment #1.1: Type: text/plain, Size: 3689 bytes --]

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 <david.hashe@dhashe.com> wrote:

>
>
> On Sun, Nov 8, 2015 at 6:06 AM, 宋文武 <iyzsong@member.fsf.org> wrote:
>
>> David Hashe <david.hashe@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!
>

[-- Attachment #1.2: Type: text/html, Size: 5773 bytes --]

[-- Attachment #2: 0003-gnu-Add-gedit.patch --]
[-- Type: text/x-patch, Size: 2940 bytes --]

From 4b27203b7ea94d01c598e4f0b6da10ff74915146 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Sun, 8 Nov 2015 13:57:44 -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 29b6549..0c60969 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)
@@ -3659,3 +3660,57 @@ environment that allows users to view, unpack, and create compressed archives
 such as gzip tarballs.")
     (home-page "http://fileroller.sourceforge.net/")
     (license license:gpl2+)))
+
+(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