From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Hashe Subject: Re: [PATCH 2/2] gnu: Add gedit. Date: Sun, 8 Nov 2015 14:07:34 -0600 Message-ID: References: <1446959917-25693-1-git-send-email-david.hashe@dhashe.com> <1446959917-25693-2-git-send-email-david.hashe@dhashe.com> <87si4gvgos.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11473b54006d3c05240d070f Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvWFU-0006M0-It for guix-devel@gnu.org; Sun, 08 Nov 2015 15:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvWFS-00059A-S7 for guix-devel@gnu.org; Sun, 08 Nov 2015 15:07:36 -0500 Received: from mail-yk0-x230.google.com ([2607:f8b0:4002:c07::230]:35107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvWFS-000594-M0 for guix-devel@gnu.org; Sun, 08 Nov 2015 15:07:34 -0500 Received: by ykek133 with SMTP id k133so235737660yke.2 for ; Sun, 08 Nov 2015 12:07:34 -0800 (PST) In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?UTF-8?B?5a6L5paH5q2m?= Cc: guix-devel@gnu.org --001a11473b54006d3c05240d070f Content-Type: multipart/alternative; boundary=001a11473b54006d3705240d070d --001a11473b54006d3705240d070d Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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 wrote= : > > > On Sun, Nov 8, 2015 at 6:06 AM, =E5=AE=8B=E6=96=87=E6=AD=A6 wrote: > >> David Hashe 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! > --001a11473b54006d3705240d070d Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
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, =E5=AE=8B=E6=96=87=E6=AD=A6 <i= yzsong@member.fsf.org> wrote:
David Hashe <david.hashe@dhashe.com> writes:

> * gnu/packages/gnome.scm (gedit): New variable.
> ---
>=C2=A0 gnu/packages/gnome.scm | 56 ++++++++++++++++++++++++++++++++++++= ++++++++++++++
>=C2=A0 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.")
>=C2=A0 GTK+ text widget GtkTextView. It improves GtkTextView by impleme= nting syntax
>=C2=A0 highlighting and other features typical of a source code editor.= ")
>=C2=A0 =C2=A0 =C2=A0(license license:lgpl2.1+)))
> +
> +(define-public gedit
> + (package
> +=C2=A0 =C2=A0(name "gedit")
> +=C2=A0 =C2=A0(version "3.16.4")
Same here, I prefer 3.18.x.

Changed to 3.18.1.
=C2=A0
> +=C2=A0 =C2=A0(source (origin
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (method url-fetch)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (uri (string-append "m= irror://gnome/sources/" name "/"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (version-major+minor version) &q= uot;/"
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 name "-" version "= ;.tar.xz"))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (sha256
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(base32
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "1h2czf2v0krqr3= kar4fm2vspim30rwdb2yhab34sdn23j7m3f291"))))
> +=C2=A0 =C2=A0(build-system glib-or-gtk-build-system)
> +=C2=A0 =C2=A0(arguments
> +=C2=A0 =C2=A0 `(#:configure-flags '("--disable-spell") = ; requires enchant
> +=C2=A0 =C2=A0 =C2=A0 #:phases
> +=C2=A0 =C2=A0 =C2=A0 (modify-phases %standard-phases
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-after
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0'install 'wrap-eog
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(lambda* (#:key outputs #:allow-oth= er-keys)
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(let ((out=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(assoc-ref outputs "out"))<= br> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(gi-typ= elib-path=C2=A0 =C2=A0(getenv "GI_TYPELIB_PATH")))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(wrap-program (string= -append out "/bin/gedit")
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0`("GI_TYP= ELIB_PATH" ":" prefix (,gi-typelib-path))))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0#t)))))
> +=C2=A0 =C2=A0(propagated-inputs
> +=C2=A0 =C2=A0 `(("dconf" ,dconf)))
> +=C2=A0 =C2=A0(native-inputs
> +=C2=A0 =C2=A0 `(("intltool" ,intltool)
> +=C2=A0 =C2=A0 =C2=A0 ("itstool", itstool)
> +=C2=A0 =C2=A0 =C2=A0 ("gobject-introspection" ,gobject-intr= ospection)
> +=C2=A0 =C2=A0 =C2=A0 ("pkg-config" ,pkg-config)))
> +=C2=A0 =C2=A0(inputs
> +=C2=A0 =C2=A0 `(("glib" ,glib)
> +=C2=A0 =C2=A0 =C2=A0 ("gtk+" ,gtk+)
> +=C2=A0 =C2=A0 =C2=A0 ("gtksourceview" ,gtksourceview)
> +=C2=A0 =C2=A0 =C2=A0 ("libpeas" ,libpeas)
> +=C2=A0 =C2=A0 =C2=A0 ("libxml2" ,libxml2)
> +=C2=A0 =C2=A0 =C2=A0 ;; TODO: enchant needed for spell plugin
> +=C2=A0 =C2=A0 =C2=A0 ;;("enchant" ,enchant)
enchant is avaliable from enchant.scm, we can add it.

Done.
=C2=A0
> +=C2=A0 =C2=A0 =C2=A0 ("iso-codes" ,iso-codes)
> +=C2=A0 =C2=A0 =C2=A0 ("python-pygobject" ,python-pygobject)=
> +=C2=A0 =C2=A0 =C2=A0 ("python" ,python)
> +=C2=A0 =C2=A0 =C2=A0 ("gvfs" ,gvfs)
> +=C2=A0 =C2=A0 =C2=A0 ("gsettings-desktop-schemas" ,gsetting= s-desktop-schemas)
> +=C2=A0 =C2=A0 =C2=A0 ("libx11" ,libx11)
> +=C2=A0 =C2=A0 =C2=A0 ("vala" ,vala)
> +=C2=A0 =C2=A0 =C2=A0 ("adwaita-icon-theme" ,adwaita-icon-th= eme)
> +=C2=A0 =C2=A0 =C2=A0 ("libsoup" ,libsoup)
> +=C2=A0 =C2=A0 =C2=A0 ("gnome-desktop" ,gnome-desktop)))
> +=C2=A0 =C2=A0(home-page "https://wiki.gnome.org/Apps/Ged= it")
> +=C2=A0 =C2=A0(synopsis "GNOME text editor")
> +=C2=A0 =C2=A0(description "While aiming at simplicity and ease o= f use, gedit is a
> +powerful general purpose text editor. ")
> +=C2=A0 =C2=A0(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 i= n addition to the gedit patch. Thanks!

--001a11473b54006d3705240d070d-- --001a11473b54006d3c05240d070f Content-Type: text/x-patch; charset=US-ASCII; name="0003-gnu-Add-gedit.patch" Content-Disposition: attachment; filename="0003-gnu-Add-gedit.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_igqy9y8w2 RnJvbSA0YjI3MjAzYjdlYTk0ZDAxYzU5OGU0ZjBiNmRhMTBmZjc0OTE1MTQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBIYXNoZSA8ZGF2aWQuaGFzaGVAZGhhc2hlLmNvbT4K RGF0ZTogU3VuLCA4IE5vdiAyMDE1IDEzOjU3OjQ0IC0wNjAwClN1YmplY3Q6IFtQQVRDSCAzLzNd IGdudTogQWRkIGdlZGl0LgoKKiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIChnZWRpdCk6IE5ldyB2 YXJpYWJsZS4KLS0tCiBnbnUvcGFja2FnZXMvZ25vbWUuc2NtIHwgNTUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA1NSBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dub21lLnNjbSBiL2dudS9w YWNrYWdlcy9nbm9tZS5zY20KaW5kZXggMjliNjU0OS4uMGM2MDk2OSAxMDA2NDQKLS0tIGEvZ251 L3BhY2thZ2VzL2dub21lLnNjbQorKysgYi9nbnUvcGFja2FnZXMvZ25vbWUuc2NtCkBAIC00Myw2 ICs0Myw3IEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGN1cmwpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGRhdGFiYXNlcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgZGp2dSkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZW5jaGFudCkKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZmxleCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg ZG9jYm9vaykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2V0dGV4dCkKQEAgLTM2NTks MyArMzY2MCw1NyBAQCBlbnZpcm9ubWVudCB0aGF0IGFsbG93cyB1c2VycyB0byB2aWV3LCB1bnBh Y2ssIGFuZCBjcmVhdGUgY29tcHJlc3NlZCBhcmNoaXZlcwogc3VjaCBhcyBnemlwIHRhcmJhbGxz LiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cDovL2ZpbGVyb2xsZXIuc291cmNlZm9yZ2UubmV0LyIp CiAgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKykpKQorCisoZGVmaW5lLXB1YmxpYyBnZWRpdAor IChwYWNrYWdlCisgICAobmFtZSAiZ2VkaXQiKQorICAgKHZlcnNpb24gIjMuMTguMSIpCisgICAo c291cmNlIChvcmlnaW4KKyAgICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICAg ICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAibWlycm9yOi8vZ25vbWUvc291cmNlcy8iIG5hbWUgIi8i CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICh2ZXJzaW9uLW1ham9yK21pbm9yIHZl cnNpb24pICIvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lICItIiB2ZXJz aW9uICIudGFyLnh6IikpCisgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgKGJhc2Uz MgorICAgICAgICAgICAgICAiMWtiM2hnbGNwcGFwN2ZkeTdpN3cyd2s3NDZrZno3N2p6czJscTZ2 cm5hOGEzZnFheG1hcyIpKSkpCisgICAoYnVpbGQtc3lzdGVtIGdsaWItb3ItZ3RrLWJ1aWxkLXN5 c3RlbSkKKyAgIChhcmd1bWVudHMKKyAgICBgKCM6cGhhc2VzCisgICAgICAobW9kaWZ5LXBoYXNl cyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgIChhZGQtYWZ0ZXIKKyAgICAgICAgICdpbnN0YWxs ICd3cmFwLWVvZworICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhl ci1rZXlzKQorICAgICAgICAgICAobGV0ICgob3V0ICAgICAgICAgICAgICAgKGFzc29jLXJlZiBv dXRwdXRzICJvdXQiKSkKKyAgICAgICAgICAgICAgICAgKGdpLXR5cGVsaWItcGF0aCAgIChnZXRl bnYgIkdJX1RZUEVMSUJfUEFUSCIpKSkKKyAgICAgICAgICAgICAod3JhcC1wcm9ncmFtIChzdHJp bmctYXBwZW5kIG91dCAiL2Jpbi9nZWRpdCIpCisgICAgICAgICAgICAgICBgKCJHSV9UWVBFTElC X1BBVEgiICI6IiBwcmVmaXggKCxnaS10eXBlbGliLXBhdGgpKSkpCisgICAgICAgICAgICN0KSkp KSkKKyAgIChwcm9wYWdhdGVkLWlucHV0cworICAgIGAoKCJkY29uZiIgLGRjb25mKSkpCisgICAo bmF0aXZlLWlucHV0cworICAgIGAoKCJpbnRsdG9vbCIgLGludGx0b29sKQorICAgICAgKCJpdHN0 b29sIiwgaXRzdG9vbCkKKyAgICAgICgiZ29iamVjdC1pbnRyb3NwZWN0aW9uIiAsZ29iamVjdC1p bnRyb3NwZWN0aW9uKQorICAgICAgKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQorICAgKGlu cHV0cworICAgIGAoKCJnbGliIiAsZ2xpYikKKyAgICAgICgiZ3RrKyIgLGd0ayspCisgICAgICAo Imd0a3NvdXJjZXZpZXciICxndGtzb3VyY2V2aWV3KQorICAgICAgKCJsaWJwZWFzIiAsbGlicGVh cykKKyAgICAgICgibGlieG1sMiIgLGxpYnhtbDIpCisgICAgICAoImVuY2hhbnQiICxlbmNoYW50 KQorICAgICAgKCJpc28tY29kZXMiICxpc28tY29kZXMpCisgICAgICAoInB5dGhvbi1weWdvYmpl Y3QiICxweXRob24tcHlnb2JqZWN0KQorICAgICAgKCJweXRob24iICxweXRob24pCisgICAgICAo Imd2ZnMiICxndmZzKQorICAgICAgKCJnc2V0dGluZ3MtZGVza3RvcC1zY2hlbWFzIiAsZ3NldHRp bmdzLWRlc2t0b3Atc2NoZW1hcykKKyAgICAgICgibGlieDExIiAsbGlieDExKQorICAgICAgKCJ2 YWxhIiAsdmFsYSkKKyAgICAgICgiYWR3YWl0YS1pY29uLXRoZW1lIiAsYWR3YWl0YS1pY29uLXRo ZW1lKQorICAgICAgKCJsaWJzb3VwIiAsbGlic291cCkKKyAgICAgICgiZ25vbWUtZGVza3RvcCIg LGdub21lLWRlc2t0b3ApKSkKKyAgIChob21lLXBhZ2UgImh0dHBzOi8vd2lraS5nbm9tZS5vcmcv QXBwcy9HZWRpdCIpCisgICAoc3lub3BzaXMgIkdOT01FIHRleHQgZWRpdG9yIikKKyAgIChkZXNj cmlwdGlvbiAiV2hpbGUgYWltaW5nIGF0IHNpbXBsaWNpdHkgYW5kIGVhc2Ugb2YgdXNlLCBnZWRp dCBpcyBhCitwb3dlcmZ1bCBnZW5lcmFsIHB1cnBvc2UgdGV4dCBlZGl0b3IuICIpCisgICAobGlj ZW5zZSBsaWNlbnNlOmdwbDIrKSkpCi0tIAoxLjkuMQoK --001a11473b54006d3c05240d070f--