Title: [114297] trunk
- Revision
- 114297
- Author
- k...@webkit.org
- Date
- 2012-04-16 14:19:23 -0700 (Mon, 16 Apr 2012)
Log Message
[GTK] Bump dependency on GTK+ 3.x to match reality
https://bugs.webkit.org/show_bug.cgi?id=84060
Rubber-stamped by Martin Robinson.
.:
* configure.ac: Bump GTK+ 3 requirement to 3.4.0. In practice we
already depend on this version because of our dependency on a recent
glib, which causes linking issues with older GTK+; also bump glib to
its earliest version.
Tools:
* gtk/jhbuild.modules: Bump GTK+ to 3.4.0, plus glib and gdk-pixbuf
to their GNOME 3.4 versions.
* gtk/patches/gtk+-3.0.12-gtkprinter.patch: Removed. This patch
is applied upstream.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (114296 => 114297)
--- trunk/ChangeLog 2012-04-16 21:02:59 UTC (rev 114296)
+++ trunk/ChangeLog 2012-04-16 21:19:23 UTC (rev 114297)
@@ -1,3 +1,15 @@
+2012-04-16 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] Bump dependency on GTK+ 3.x to match reality
+ https://bugs.webkit.org/show_bug.cgi?id=84060
+
+ Rubber-stamped by Martin Robinson.
+
+ * configure.ac: Bump GTK+ 3 requirement to 3.4.0. In practice we
+ already depend on this version because of our dependency on a recent
+ glib, which causes linking issues with older GTK+; also bump glib to
+ its earliest version.
+
2012-04-16 Philippe Normand <pnorm...@igalia.com>
[GTK] GStreamer 1.0 support in configure.ac
Modified: trunk/Tools/ChangeLog (114296 => 114297)
--- trunk/Tools/ChangeLog 2012-04-16 21:02:59 UTC (rev 114296)
+++ trunk/Tools/ChangeLog 2012-04-16 21:19:23 UTC (rev 114297)
@@ -1,3 +1,15 @@
+2012-04-16 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] Bump dependency on GTK+ 3.x to match reality
+ https://bugs.webkit.org/show_bug.cgi?id=84060
+
+ Rubber-stamped by Martin Robinson.
+
+ * gtk/jhbuild.modules: Bump GTK+ to 3.4.0, plus glib and gdk-pixbuf
+ to their GNOME 3.4 versions.
+ * gtk/patches/gtk+-3.0.12-gtkprinter.patch: Removed. This patch
+ is applied upstream.
+
2012-04-16 Vincent Scheib <sch...@chromium.org>
Adding Contributors Brian Salomon and Tom Hudson to committers.py.
Modified: trunk/Tools/gtk/jhbuild.modules (114296 => 114297)
--- trunk/Tools/gtk/jhbuild.modules 2012-04-16 21:02:59 UTC (rev 114296)
+++ trunk/Tools/gtk/jhbuild.modules 2012-04-16 21:19:23 UTC (rev 114297)
@@ -93,10 +93,10 @@
<dependencies>
<dep package="glib"/>
</dependencies>
- <branch module="/pub/GNOME/sources/gdk-pixbuf/2.23/gdk-pixbuf-2.23.5.tar.xz" version="2.23.5"
+ <branch module="/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-2.26.0.tar.xz" version="2.26.0"
repo="ftp.gnome.org"
- hash="sha256:7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500"
- md5sum="066e30277cadc225a7cef4c258da830b"/>
+ hash="sha256:a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d"
+ md5sum="1c186f9903a20e96587b9afb27944b40"/>
</autotools>
<autotools id="gtk+"
@@ -106,12 +106,10 @@
<dep package="cairo"/>
<dep package="gdk-pixbuf"/>
</dependencies>
- <branch module="/pub/GNOME/sources/gtk+/3.0/gtk+-3.0.12.tar.xz" version="3.0.12"
+ <branch module="/pub/GNOME/sources/gtk+/3.4/gtk+-3.4.0.tar.xz" version="3.4.0"
repo="ftp.gnome.org"
- hash="sha256:219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9"
- md5sum="b9869b671b0fe5905dce2fee57c965cf">
- <patch file="gtk+-3.0.12-gtkprinter.patch" strip="1"/>
- </branch>
+ hash="sha256:00af8be8bc60355e08a8f57e3e7503c916cec5cd5c6acb3eaedb01330b81f3e0"
+ md5sum="f9a0bc875cf95c0462910d2d32528464"/>
</autotools>
<autotools id="glib"
@@ -119,10 +117,10 @@
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.31/glib-2.31.8.tar.xz" version="2.31.8"
+ <branch module="/pub/GNOME/sources/glib/2.32/glib-2.32.0.tar.xz" version="2.32.0"
repo="ftp.gnome.org"
- hash="sha256:1ce3d275189000e1c50e92efcdb6447bc260b1e5c41699b7a1959e3e1928fbaa"
- md5sum="6909664f29fae2f00cc3181c8c6a6aa7"/>
+ hash="sha256:cde9d9f25ed648069c547e323897ad9379974e1f936b4477fa51bcf1bb261ae4"
+ md5sum="c5fa76fbf9184d20dfb04af66b598190"/>
</autotools>
<autotools id="glib-networking">
Deleted: trunk/Tools/gtk/patches/gtk+-3.0.12-gtkprinter.patch (114296 => 114297)
--- trunk/Tools/gtk/patches/gtk+-3.0.12-gtkprinter.patch 2012-04-16 21:02:59 UTC (rev 114296)
+++ trunk/Tools/gtk/patches/gtk+-3.0.12-gtkprinter.patch 2012-04-16 21:19:23 UTC (rev 114297)
@@ -1,15 +0,0 @@
---- gtk+-3.0.12-orig/gtk/gtkprinter.c 2011-07-27 18:34:32.000000000 -0700
-+++ gtk+-3.0.12/gtk/gtkprinter.c 2012-03-15 04:43:10.260284244 -0700
-@@ -1260,6 +1260,12 @@ gtk_enumerate_printers (GtkPrinterFunc f
- return;
- }
-
-+ if (printer_list->backends == NULL)
-+ {
-+ free_printer_list (printer_list);
-+ return;
-+ }
-+
- if (wait && printer_list->backends)
- {
- printer_list->loop = g_main_loop_new (NULL, FALSE);
Modified: trunk/configure.ac (114296 => 114297)
--- trunk/configure.ac 2012-04-16 21:02:59 UTC (rev 114296)
+++ trunk/configure.ac 2012-04-16 21:19:23 UTC (rev 114297)
@@ -281,7 +281,7 @@
GTK2_REQUIRED_VERSION=2.10
GAIL2_REQUIRED_VERSION=1.8
-GTK3_REQUIRED_VERSION=3.0
+GTK3_REQUIRED_VERSION=3.4.0
GAIL3_REQUIRED_VERSION=3.0
case "$with_gtk" in
@@ -377,7 +377,7 @@
CAIRO_REQUIRED_VERSION=1.10
FONTCONFIG_REQUIRED_VERSION=2.4
FREETYPE2_REQUIRED_VERSION=9.0
-GLIB_REQUIRED_VERSION=2.31.8
+GLIB_REQUIRED_VERSION=2.32.0
LIBSOUP_REQUIRED_VERSION=2.37.92
LIBXML_REQUIRED_VERSION=2.6
PANGO_REQUIRED_VERSION=1.21.0
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
