* [PATCH] gnu: gtk+: Update to 3.16.0.
@ 2015-04-05 15:42 Andy Wingo
2015-04-05 20:07 ` Mark H Weaver
2015-04-06 23:10 ` Mark H Weaver
0 siblings, 2 replies; 3+ messages in thread
From: Andy Wingo @ 2015-04-05 15:42 UTC (permalink / raw
To: guix-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0003-gnu-gtk-Update-to-3.16.0.patch --]
[-- Type: text/x-diff, Size: 2424 bytes --]
From 2aa825f107d49b371bb8442cf060995d13cf7892 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Sat, 4 Apr 2015 22:46:47 +0200
Subject: [PATCH 3/3] gnu: gtk+: Update to 3.16.0.
* gnu/packages/gtk.scm (gtk+): Upgrade to 3.16.0, adding a libepoxy
dep and adding gettext.
---
gnu/packages/gtk.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index de728fb..6eab59c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -34,6 +34,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages icu4c)
@@ -433,7 +434,7 @@ application suites.")
(define-public gtk+
(package (inherit gtk+-2)
(name "gtk+")
- (version "3.14.7")
+ (version "3.16.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -441,11 +442,12 @@ application suites.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0vm40n6nf0w3vv54wqy67jcxddka7hplksi093xim3119yq196gv"))))
+ "1si6ihl1wlvag8qq3166skr9fnm9i33dimbfry1j628qzqc76qff"))))
(propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk)
("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf)
+ ("libepoxy" ,libepoxy)
("libxi" ,libxi)
("libxinerama" ,libxinerama)
("libxdamage" ,libxdamage)
@@ -456,6 +458,7 @@ application suites.")
(native-inputs
`(("perl" ,perl)
("glib" ,glib "bin")
+ ("gettext" ,gnu-gettext)
("pkg-config" ,pkg-config)
("gobject-introspection" ,gobject-introspection)
("python-wrapper" ,python-wrapper)
@@ -474,6 +477,10 @@ application suites.")
(substitute* "testsuite/Makefile.in"
(("SUBDIRS = gdk gtk a11y css reftests")
"SUBDIRS = gdk"))
+ (substitute* "demos/widget-factory/Makefile.in"
+ (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
+ (substitute* "demos/gtk-demo/Makefile.in"
+ (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
(apply configure args)))
%standard-phases)))))
--
2.2.1
[-- Attachment #2: Type: text/plain, Size: 26 bytes --]
--
http://wingolog.org/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: gtk+: Update to 3.16.0.
2015-04-05 15:42 [PATCH] gnu: gtk+: Update to 3.16.0 Andy Wingo
@ 2015-04-05 20:07 ` Mark H Weaver
2015-04-06 23:10 ` Mark H Weaver
1 sibling, 0 replies; 3+ messages in thread
From: Mark H Weaver @ 2015-04-05 20:07 UTC (permalink / raw
To: Andy Wingo; +Cc: guix-devel
Andy Wingo <wingo@pobox.com> writes:
> From 2aa825f107d49b371bb8442cf060995d13cf7892 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@pobox.com>
> Date: Sat, 4 Apr 2015 22:46:47 +0200
> Subject: [PATCH 3/3] gnu: gtk+: Update to 3.16.0.
>
> * gnu/packages/gtk.scm (gtk+): Upgrade to 3.16.0, adding a libepoxy
> dep and adding gettext.
Looks good to me! However, based on our conversations on IRC, I gather
that this depends on your patch for 'gettext' that triggers a full
rebuild, the 'glib' and 'cairo' updates, and also on a patch to fix a
circularity problem that you've not yet posted.
Is that right? Any other prerequisites?
Thanks!
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gnu: gtk+: Update to 3.16.0.
2015-04-05 15:42 [PATCH] gnu: gtk+: Update to 3.16.0 Andy Wingo
2015-04-05 20:07 ` Mark H Weaver
@ 2015-04-06 23:10 ` Mark H Weaver
1 sibling, 0 replies; 3+ messages in thread
From: Mark H Weaver @ 2015-04-06 23:10 UTC (permalink / raw
To: Andy Wingo; +Cc: guix-devel
Andy Wingo <wingo@pobox.com> writes:
> From 2aa825f107d49b371bb8442cf060995d13cf7892 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@pobox.com>
> Date: Sat, 4 Apr 2015 22:46:47 +0200
> Subject: [PATCH 3/3] gnu: gtk+: Update to 3.16.0.
>
> * gnu/packages/gtk.scm (gtk+): Upgrade to 3.16.0, adding a libepoxy
> dep and adding gettext.
[...]
> @@ -474,6 +477,10 @@ application suites.")
> (substitute* "testsuite/Makefile.in"
> (("SUBDIRS = gdk gtk a11y css reftests")
> "SUBDIRS = gdk"))
> + (substitute* "demos/widget-factory/Makefile.in"
> + (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
> + (substitute* "demos/gtk-demo/Makefile.in"
> + (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
These two substitute* forms can be combined into one like this:
(substitute* '("demos/widget-factory/Makefile.in"
"demos/gtk-demo/Makefile.in")
(("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
I pushed this to core-updates with this change and a slightly modified
commit log. While I was at it, I moved these actions to a
'pre-configure' phase, whereas before the package replaced the existing
'configure' phase with one that ended by calling the standard configure
phase.
Thanks!
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-06 23:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-05 15:42 [PATCH] gnu: gtk+: Update to 3.16.0 Andy Wingo
2015-04-05 20:07 ` Mark H Weaver
2015-04-06 23:10 ` Mark H Weaver
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.