* Add gnome-terminal
@ 2015-04-03 7:24 Andy Wingo
2015-04-03 9:19 ` 宋文武
2015-04-03 21:30 ` Ludovic Courtès
0 siblings, 2 replies; 3+ messages in thread
From: Andy Wingo @ 2015-04-03 7:24 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
Hi,
Two patches. The first wraps programs in libexec/ for
glib-or-gtk-build-system, like those programs spawned by dbus services.
The second upgrades vte and adds gnome-terminal. WDYT?
Andy
[-- Attachment #2: 0001-glib-or-gtk-build-system-wrap-libexec-programs.patch --]
[-- Type: text/plain, Size: 1338 bytes --]
From 8ffadae7fa00cb08bcd277541d6f1b00d9d5eac2 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 3 Apr 2015 09:20:50 +0200
Subject: [PATCH 1/2] glib-or-gtk-build-system: wrap libexec programs
* guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): Also
wrap binaries in libexec/, such as those launched by dbus services.
---
guix/build/glib-or-gtk-build-system.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm
index c57bc3e..40f1bb8 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -140,7 +140,9 @@ add a dependency of that output on GLib and GTK+."
((output . directory)
(unless (member output glib-or-gtk-wrap-excluded-outputs)
(let* ((bindir (string-append directory "/bin"))
- (bin-list (find-files bindir ".*"))
+ (libexecdir (string-append directory "/libexec"))
+ (bin-list (append (find-files bindir ".*")
+ (find-files libexecdir ".*")))
(datadirs (data-directories
(alist-cons output directory inputs)))
(gtk-mod-dirs (gtk-module-directories
--
2.2.1
[-- Attachment #3: 0002-Upgrade-vte-add-gnome-terminal.patch --]
[-- Type: text/plain, Size: 3889 bytes --]
From 8551d837e707c465fa4eaab1a2f838cf132f3452 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 3 Apr 2015 09:21:41 +0200
Subject: [PATCH 2/2] Upgrade vte; add gnome-terminal
* gnu/packages/gnome.scm (vte): Update to 0.40.0. Now requires gnutls.
(gnome-terminal): New package.
---
gnu/packages/gnome.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0e674da..70ac28a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -39,8 +39,10 @@
#:use-module (gnu packages pdf)
#:use-module (gnu packages popt)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gnutls)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages libcanberra)
+ #:use-module (gnu packages linux)
#:use-module (gnu packages image)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -1398,7 +1400,7 @@ libraries written in C.")
(define-public vte
(package
(name "vte")
- (version "0.38.2")
+ (version "0.40.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1406,7 +1408,7 @@ libraries written in C.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1rbxrigff9yszbgdw0gw4c2saz4d1hbbpz21phzxx14w49wvmnmj"))))
+ "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -1414,6 +1416,7 @@ libraries written in C.")
("vala" ,vala)
("gobject-introspection" ,gobject-introspection)
("glib" ,glib "bin") ; for glib-genmarshal, etc.
+ ("gnutls" ,gnutls)
("xmllint" ,libxml2)))
(propagated-inputs
`(("gtk+" ,gtk+))) ; required by libvte-2.91.pc
@@ -1666,3 +1669,51 @@ library.")
"Mines (previously gnomine) is a puzzle game where you locate mines
floating in an ocean using only your brain and a little bit of luck.")
(license license:gpl2+)))
+
+(define-public gnome-terminal
+ (package
+ (name "gnome-terminal")
+ (version "3.16.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1s3zwqxs4crlqmh6l7s7n87pbmh2nnjdvhxlkalh58pbl0bk0qrd"))))
+ (build-system glib-or-gtk-build-system)
+ (arguments
+ '(#:configure-flags
+ (list "--disable-migration" "--disable-search-provider"
+ "--without-nautilus-extension")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before configure patch-/bin/true
+ (lambda _
+ (substitute* "configure"
+ (("/bin/true") (which "true"))))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("desktop-file-utils" ,desktop-file-utils)
+ ("intltool" ,intltool)
+ ("itstool" ,itstool)))
+ (inputs
+ `(("gtk+" ,gtk+)
+ ("vte" ,vte)
+ ("gnutls" ,gnutls)
+ ("dconf" ,dconf)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("util-linux" ,util-linux)
+ ("vala" ,vala)))
+ (home-page "https://wiki.gnome.org/Apps/Terminal")
+ (synopsis "Use the command line")
+ (description
+ "GNOME Terminal is a terminal emulator application for accessing a
+UNIX shell environment which can be used to run programs available on
+your system.
+
+It supports several profiles, multiple tabs and implements several
+keyboard shortcuts.")
+ (license license:gpl3+)))
--
2.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Add gnome-terminal
2015-04-03 7:24 Add gnome-terminal Andy Wingo
@ 2015-04-03 9:19 ` 宋文武
2015-04-03 21:30 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: 宋文武 @ 2015-04-03 9:19 UTC (permalink / raw)
To: Andy Wingo, guix-devel
Andy Wingo <wingo@igalia.com> writes:
> Hi,
>
> Two patches. The first wraps programs in libexec/ for
> glib-or-gtk-build-system, like those programs spawned by dbus services.
> The second upgrades vte and adds gnome-terminal. WDYT?
>
> Andy
>
> From 8ffadae7fa00cb08bcd277541d6f1b00d9d5eac2 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@pobox.com>
> Date: Fri, 3 Apr 2015 09:20:50 +0200
> Subject: [PATCH 1/2] glib-or-gtk-build-system: wrap libexec programs
>
> * guix/build/glib-or-gtk-build-system.scm (wrap-all-programs): Also
> wrap binaries in libexec/, such as those launched by dbus services.
> ---
> guix/build/glib-or-gtk-build-system.scm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm
> index c57bc3e..40f1bb8 100644
> --- a/guix/build/glib-or-gtk-build-system.scm
> +++ b/guix/build/glib-or-gtk-build-system.scm
> @@ -140,7 +140,9 @@ add a dependency of that output on GLib and GTK+."
> ((output . directory)
> (unless (member output glib-or-gtk-wrap-excluded-outputs)
> (let* ((bindir (string-append directory "/bin"))
> - (bin-list (find-files bindir ".*"))
> + (libexecdir (string-append directory "/libexec"))
> + (bin-list (append (find-files bindir ".*")
> + (find-files libexecdir ".*")))
> (datadirs (data-directories
> (alist-cons output directory inputs)))
> (gtk-mod-dirs (gtk-module-directories
> --
> 2.2.1
>
> From 8551d837e707c465fa4eaab1a2f838cf132f3452 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@pobox.com>
> Date: Fri, 3 Apr 2015 09:21:41 +0200
> Subject: [PATCH 2/2] Upgrade vte; add gnome-terminal
>
> * gnu/packages/gnome.scm (vte): Update to 0.40.0. Now requires gnutls.
> (gnome-terminal): New package.
This should be seperated into two patches.
> ---
> gnu/packages/gnome.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 53 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 0e674da..70ac28a 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -39,8 +39,10 @@
> #:use-module (gnu packages pdf)
> #:use-module (gnu packages popt)
> #:use-module (gnu packages ghostscript)
> + #:use-module (gnu packages gnutls)
> #:use-module (gnu packages iso-codes)
> #:use-module (gnu packages libcanberra)
> + #:use-module (gnu packages linux)
> #:use-module (gnu packages image)
> #:use-module (gnu packages perl)
> #:use-module (gnu packages pkg-config)
> @@ -1398,7 +1400,7 @@ libraries written in C.")
> (define-public vte
> (package
> (name "vte")
> - (version "0.38.2")
> + (version "0.40.0")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnome/sources/" name "/"
> @@ -1406,7 +1408,7 @@ libraries written in C.")
> name "-" version ".tar.xz"))
> (sha256
> (base32
> - "1rbxrigff9yszbgdw0gw4c2saz4d1hbbpz21phzxx14w49wvmnmj"))))
> + "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal"))))
> (build-system gnu-build-system)
> (native-inputs
> `(("pkg-config" ,pkg-config)
> @@ -1414,6 +1416,7 @@ libraries written in C.")
> ("vala" ,vala)
> ("gobject-introspection" ,gobject-introspection)
> ("glib" ,glib "bin") ; for glib-genmarshal, etc.
> + ("gnutls" ,gnutls)
I don't think gnutls is a 'native-inputs', which mean some binaries from
gnutls will be executed during the build phase.
It should be a 'propagated-inputs', because vte.pc contains it.
> ("xmllint" ,libxml2)))
> (propagated-inputs
> `(("gtk+" ,gtk+))) ; required by libvte-2.91.pc
So, there is no libvte-2.91.pc now.
Could you update this comment?
Thanks!
> @@ -1666,3 +1669,51 @@ library.")
> "Mines (previously gnomine) is a puzzle game where you locate mines
> floating in an ocean using only your brain and a little bit of luck.")
> (license license:gpl2+)))
> +
> +(define-public gnome-terminal
> + (package
> + (name "gnome-terminal")
> + (version "3.16.0")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append "mirror://gnome/sources/" name "/"
> + (version-major+minor version) "/"
> + name "-" version ".tar.xz"))
> + (sha256
> + (base32
> + "1s3zwqxs4crlqmh6l7s7n87pbmh2nnjdvhxlkalh58pbl0bk0qrd"))))
> + (build-system glib-or-gtk-build-system)
> + (arguments
> + '(#:configure-flags
> + (list "--disable-migration" "--disable-search-provider"
> + "--without-nautilus-extension")
> + #:phases
> + (modify-phases %standard-phases
> + (add-before configure patch-/bin/true
> + (lambda _
> + (substitute* "configure"
> + (("/bin/true") (which "true"))))))))
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("desktop-file-utils" ,desktop-file-utils)
> + ("intltool" ,intltool)
> + ("itstool" ,itstool)))
> + (inputs
> + `(("gtk+" ,gtk+)
> + ("vte" ,vte)
> + ("gnutls" ,gnutls)
> + ("dconf" ,dconf)
> + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
> + ("util-linux" ,util-linux)
> + ("vala" ,vala)))
> + (home-page "https://wiki.gnome.org/Apps/Terminal")
> + (synopsis "Use the command line")
I think it should be a noun, "Terminal emulator".
> + (description
> + "GNOME Terminal is a terminal emulator application for accessing a
> +UNIX shell environment which can be used to run programs available on
> +your system.
> +
> +It supports several profiles, multiple tabs and implements several
> +keyboard shortcuts.")
> + (license license:gpl3+)))
> --
> 2.2.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Add gnome-terminal
2015-04-03 7:24 Add gnome-terminal Andy Wingo
2015-04-03 9:19 ` 宋文武
@ 2015-04-03 21:30 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2015-04-03 21:30 UTC (permalink / raw)
To: Andy Wingo; +Cc: guix-devel
To simplify things, I’ve applied the first two parts of these patches,
taking into account what 宋文武 suggested and adjusting the commit
messages.
What copyright line should be put in gnome.scm for the gnome-terminal
changes? You can send an updated patch or I can take care of it, as you
want–you’ve already had enough pain. ;-)
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-03 21:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-03 7:24 Add gnome-terminal Andy Wingo
2015-04-03 9:19 ` 宋文武
2015-04-03 21:30 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).