[PATCH 1/2] gnu: Add gtksourceview.

[PATCH 1/2] gnu: Add gtksourceview.

[David Hashe]

* gnu/packages/gnome.scm (gtksourceview): New variable.
---
 gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5440433..9bd1c31 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3659,3 +3659,37 @@ 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 gtksourceview
+ (package
+   (name "gtksourceview")
+   (version "3.16.1")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "mirror://gnome/sources/" name "/"
+                                (version-major+minor version) "/"
+                                name "-" version ".tar.xz"))
+            (sha256
+             (base32
+              "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6"))))
+   (build-system glib-or-gtk-build-system)
+   (arguments
+    '(#:tests? #f)) ; Tries to open graphical display during testing and fails
+   (native-inputs
+    `(("intltool" ,intltool)
+      ("itstool", itstool)
+      ("gobject-introspection" ,gobject-introspection)
+      ("pkg-config" ,pkg-config)))
+   (inputs
+    `(("glib" ,glib)
+      ("gtk+" ,gtk+)
+      ("libxml2" ,libxml2)
+      ("pango" ,pango)
+      ("gdk-pixbuf" ,gdk-pixbuf)
+      ("vala" ,vala)))
+   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
+   (synopsis "GNOME source code widget")
+   (description "GtkSourceView is a text widget that extends the standard
+GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
+highlighting and other features typical of a source code editor.")
+   (license license:lgpl2.1+)))
-- 
1.9.1

[PATCH 2/2] gnu: Add gedit.

[David Hashe]

* 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")
+   (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)
+      ("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

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

[宋文武]

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.
> +   (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.
> +      ("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!

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

[David Hashe]

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

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: 5183 bytes --]

[-- Attachment #2: 0002-gnu-Update-libpeas.patch --]
[-- Type: text/x-patch, Size: 1112 bytes --]

From ec10a2f76363b2ba7c72a217d3ad00d4a9f16919 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@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


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

From bea717d176cb434c7ee9d5f94fd75db76718af05 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@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

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

[David Hashe]

[-- 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

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

[宋文武]

On 2015-11-09 04:07, David Hashe wrote:
> 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.
Pushed with follow modifications, thanks!

I remove gvfs from inputs, it still report:
   Gvfs metadata enabled:  yes
so I guess there is not function lost.
(the master haven't build gvfs, waiting texlive, etc.)

I also wrap it with XDG_DATA_DIRS set to gtksourceview,
without this, gedit will core dump due to missing language-specs.

Re: [PATCH 1/2] gnu: Add gtksourceview.

[宋文武]

David Hashe <david.hashe@dhashe.com> writes:

> * gnu/packages/gnome.scm (gtksourceview): New variable.
> ---
>  gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 5440433..9bd1c31 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3659,3 +3659,37 @@ 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 gtksourceview
> + (package
> +   (name "gtksourceview")
> +   (version "3.16.1")
Why not use the latest stable 3.18.x?
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "mirror://gnome/sources/" name "/"
> +                                (version-major+minor version) "/"
> +                                name "-" version ".tar.xz"))
> +            (sha256
> +             (base32
> +              "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6"))))
> +   (build-system glib-or-gtk-build-system)
> +   (arguments
> +    '(#:tests? #f)) ; Tries to open graphical display during testing and fails
> +   (native-inputs
> +    `(("intltool" ,intltool)
> +      ("itstool", itstool)
> +      ("gobject-introspection" ,gobject-introspection)
> +      ("pkg-config" ,pkg-config)))
> +   (inputs
> +    `(("glib" ,glib)
> +      ("gtk+" ,gtk+)
> +      ("libxml2" ,libxml2)
> +      ("pango" ,pango)
> +      ("gdk-pixbuf" ,gdk-pixbuf)
> +      ("vala" ,vala)))
> +   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
                                              extra space      ^
> +   (synopsis "GNOME source code widget")
> +   (description "GtkSourceView is a text widget that extends the standard
> +GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
We use two spaces after period  ^
> +highlighting and other features typical of a source code editor.")
> +   (license license:lgpl2.1+)))

Re: [PATCH 1/2] gnu: Add gtksourceview.

[David Hashe]

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

On Sun, Nov 8, 2015 at 6:03 AM, 宋文武 <iyzsong@member.fsf.org> wrote:

> David Hashe <david.hashe@dhashe.com> writes:
>
> > * gnu/packages/gnome.scm (gtksourceview): New variable.
> > ---
> >  gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
> >  1 file changed, 34 insertions(+)
> >
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index 5440433..9bd1c31 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -3659,3 +3659,37 @@ 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 gtksourceview
> > + (package
> > +   (name "gtksourceview")
> > +   (version "3.16.1")
> Why not use the latest stable 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
> > +              "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6"))))
> > +   (build-system glib-or-gtk-build-system)
> > +   (arguments
> > +    '(#:tests? #f)) ; Tries to open graphical display during testing
> and fails
> > +   (native-inputs
> > +    `(("intltool" ,intltool)
> > +      ("itstool", itstool)
> > +      ("gobject-introspection" ,gobject-introspection)
> > +      ("pkg-config" ,pkg-config)))
> > +   (inputs
> > +    `(("glib" ,glib)
> > +      ("gtk+" ,gtk+)
> > +      ("libxml2" ,libxml2)
> > +      ("pango" ,pango)
> > +      ("gdk-pixbuf" ,gdk-pixbuf)
> > +      ("vala" ,vala)))
> > +   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
>                                               extra space      ^
> > +   (synopsis "GNOME source code widget")
> > +   (description "GtkSourceView is a text widget that extends the
> standard
> > +GTK+ text widget GtkTextView. It improves GtkTextView by implementing
> syntax
> We use two spaces after period  ^
>

Fixed.


> > +highlighting and other features typical of a source code editor.")
> > +   (license license:lgpl2.1+)))
>
>
Thanks for the feedback! I've attached an updated patch.

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

[-- Attachment #2: 0001-gnu-Add-gtksourceview.patch --]
[-- Type: text/x-patch, Size: 2023 bytes --]

From 06f8964dc426acd4edb70d31132982e0c1d5dca9 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Sat, 7 Nov 2015 22:38:09 -0600
Subject: [PATCH 1/3] gnu: Add gtksourceview.

* gnu/packages/gnome.scm (gtksourceview): New variable.
---
 gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5440433..9c4b182 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3659,3 +3659,37 @@ 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 gtksourceview
+ (package
+   (name "gtksourceview")
+   (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
+              "1rpdg8rcjlqv8yk13vsh5148mads0zbfih8cak3hm7wb0spmzsbv"))))
+   (build-system glib-or-gtk-build-system)
+   (arguments
+    '(#:tests? #f)) ; Tries to open graphical display during testing and fails
+   (native-inputs
+    `(("intltool" ,intltool)
+      ("itstool", itstool)
+      ("gobject-introspection" ,gobject-introspection)
+      ("pkg-config" ,pkg-config)))
+   (inputs
+    `(("glib" ,glib)
+      ("gtk+" ,gtk+)
+      ("libxml2" ,libxml2)
+      ("pango" ,pango)
+      ("gdk-pixbuf" ,gdk-pixbuf)
+      ("vala" ,vala)))
+   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
+   (synopsis "GNOME source code widget")
+   (description "GtkSourceView is a text widget that extends the standard
+GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax
+highlighting and other features typical of a source code editor.")
+   (license license:lgpl2.1+)))
-- 
1.9.1

Re: [PATCH 1/2] gnu: Add gtksourceview.

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 2562 bytes --]

Doesn't this already exist ?  In gnu/packages/gtk+

The version there seems to be better too, because it doesn't disable the tests.


J'
On Sat, Nov 07, 2015 at 11:18:36PM -0600, David Hashe wrote:

     * gnu/packages/gnome.scm (gtksourceview): New variable.
     ---
      gnu/packages/gnome.scm | 34 ++++++++++++++++++++++++++++++++++
      1 file changed, 34 insertions(+)
     
     diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
     index 5440433..9bd1c31 100644
     --- a/gnu/packages/gnome.scm
     +++ b/gnu/packages/gnome.scm
     @@ -3659,3 +3659,37 @@ 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 gtksourceview
     + (package
     +   (name "gtksourceview")
     +   (version "3.16.1")
     +   (source (origin
     +            (method url-fetch)
     +            (uri (string-append "mirror://gnome/sources/" name "/"
     +                                (version-major+minor version) "/"
     +                                name "-" version ".tar.xz"))
     +            (sha256
     +             (base32
     +              "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6"))))
     +   (build-system glib-or-gtk-build-system)
     +   (arguments
     +    '(#:tests? #f)) ; Tries to open graphical display during testing and fails
     +   (native-inputs
     +    `(("intltool" ,intltool)
     +      ("itstool", itstool)
     +      ("gobject-introspection" ,gobject-introspection)
     +      ("pkg-config" ,pkg-config)))
     +   (inputs
     +    `(("glib" ,glib)
     +      ("gtk+" ,gtk+)
     +      ("libxml2" ,libxml2)
     +      ("pango" ,pango)
     +      ("gdk-pixbuf" ,gdk-pixbuf)
     +      ("vala" ,vala)))
     +   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
     +   (synopsis "GNOME source code widget")
     +   (description "GtkSourceView is a text widget that extends the standard
     +GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
     +highlighting and other features typical of a source code editor.")
     +   (license license:lgpl2.1+)))
     -- 
     1.9.1
     

-- 
Avoid eavesdropping.  Send strong encryted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/2] gnu: Add gtksourceview.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

On Sun, 8 Nov 2015 18:47:26 +0100
John Darrington <john@darrington.wattle.id.au> wrote:

> Doesn't this already exist ?  In gnu/packages/gtk+
> 
> The version there seems to be better too, because it doesn't disable the tests.
> 
That one is 2.10.5, and this one is 3.16.1. Although it would make sense to
put them both in the same file.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/2] gnu: Add gtksourceview.

[David Hashe]

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

On Sun, Nov 8, 2015 at 11:53 AM, Efraim Flashner <efraim@flashner.co.il>
wrote:

> On Sun, 8 Nov 2015 18:47:26 +0100
> John Darrington <john@darrington.wattle.id.au> wrote:
>
> > Doesn't this already exist ?  In gnu/packages/gtk+
> >
> > The version there seems to be better too, because it doesn't disable the
> tests.
> >
> That one is 2.10.5, and this one is 3.16.1. Although it would make sense to
> put them both in the same file.
>

I've moved it to gtk.scm and renamed 2.10.5 to gtksourceview-2.

I got the code to enable an X server working, but it later failed with
"D-Bus library appears to be incorrectly set up". I don't think we've found
a solution to that problem yet, since there are other packages that have
tests disabled for the same reason.


>
> --
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted
>

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

[-- Attachment #2: 0001-gnu-Add-gtksourceview.patch --]
[-- Type: text/x-patch, Size: 4220 bytes --]

From 3f71e4c87f0d621dcf019c7c330b182ecc290f71 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Sun, 8 Nov 2015 13:51:46 -0600
Subject: [PATCH 1/3] gnu: Add gtksourceview.

* gnu/packages/gtk.scm (gtksourceview): Rename to...
  (gtksourceview-2): ... this.
  (gtksourceview): Update to 3.18.1.
* gnu/packages/ocaml.scm (lablgtk)[inputs]: Replace "gtksourceview" with "gtksourceview-2".
---
 gnu/packages/gtk.scm   | 44 +++++++++++++++++++++++++++++++++++++++++++-
 gnu/packages/ocaml.scm |  3 ++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a01e6d0..171e905 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
+;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +29,7 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system waf)
@@ -275,7 +277,7 @@ graph-like environments, e.g. modular synths or finite state machine
 diagrams.")
     (license license:gpl3+)))
 
-(define-public gtksourceview
+(define-public gtksourceview-2
   (package
     (name "gtksourceview")
     (version "2.10.5") ; This is the last version which builds against gtk+2
@@ -329,6 +331,46 @@ printing and other features typical of a source code editor.")
     (license license:lgpl2.0+)
     (home-page "https://developer.gnome.org/gtksourceview/")))
 
+(define-public gtksourceview
+ (package
+   (name "gtksourceview")
+   (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
+              "1rpdg8rcjlqv8yk13vsh5148mads0zbfih8cak3hm7wb0spmzsbv"))))
+   (build-system glib-or-gtk-build-system)
+   (arguments
+     ;; Tries to open graphical display during testing and fails.
+     ;; When using the X server trickery from gtksourceview-2, fails with:
+     ;; D-Bus library appears to be incorrectly set up; failed to read
+     ;; machine uuid: Failed to open "/etc/machine-id": No such file or
+     ;; directory.
+     ;; See the manual page for dbus-uuidgen to correct this issue.
+    '(#:tests? #f))
+   (native-inputs
+    `(("intltool" ,intltool)
+      ("itstool", itstool)
+      ("gobject-introspection" ,gobject-introspection)
+      ("pkg-config" ,pkg-config)))
+   (inputs
+    `(("glib" ,glib)
+      ("gtk+" ,gtk+)
+      ("libxml2" ,libxml2)
+      ("pango" ,pango)
+      ("gdk-pixbuf" ,gdk-pixbuf)
+      ("vala" ,vala)))
+   (home-page "https://wiki.gnome.org/Projects/GtkSourceView ")
+   (synopsis "GNOME source code widget")
+   (description "GtkSourceView is a text widget that extends the standard
+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 gdk-pixbuf
   (package
    (name "gdk-pixbuf")
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index fc45805..b0cc145 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -453,7 +454,7 @@ provers.")
     ;; and gtk+-quartz-2.0 once available.
     (inputs
      `(("gtk+" ,gtk+-2)
-       ("gtksourceview" ,gtksourceview)
+       ("gtksourceview" ,gtksourceview-2)
        ("libgnomecanvas" ,libgnomecanvas)
        ("libgnomeui" ,libgnomeui)
        ("libglade" ,libglade)
-- 
1.9.1

Re: [PATCH 1/2] gnu: Add gtksourceview.

[宋文武]

On 2015-11-09 04:05, David Hashe wrote:
> On Sun, Nov 8, 2015 at 11:53 AM, Efraim Flashner 
> <efraim@flashner.co.il>
> wrote:
> 
>> On Sun, 8 Nov 2015 18:47:26 +0100
>> John Darrington <john@darrington.wattle.id.au> wrote:
>> 
>> > Doesn't this already exist ?  In gnu/packages/gtk+
>> >
>> > The version there seems to be better too, because it doesn't disable the
>> tests.
>> >
>> That one is 2.10.5, and this one is 3.16.1. Although it would make 
>> sense to
>> put them both in the same file.
>> 
> 
> I've moved it to gtk.scm and renamed 2.10.5 to gtksourceview-2.
> 
> I got the code to enable an X server working, but it later failed with
> "D-Bus library appears to be incorrectly set up". I don't think we've 
> found
> a solution to that problem yet, since there are other packages that 
> have
> tests disabled for the same reason.
Set 'DBUS_FATAL_WARNINGS' to '0' can trick D-Bus.
I push the patch with modifications to pass tests and use 
propagated-inputs
for that in the .pc file.

Thanks!