Title: [207998] trunk/Tools
- Revision
- 207998
- Author
- [email protected]
- Date
- 2016-10-27 12:49:49 -0700 (Thu, 27 Oct 2016)
Log Message
Unreviewed, rolling out r207992.
https://bugs.webkit.org/show_bug.cgi?id=164070
triggered aclocal version conflict (Requested by mcatanzaro on
#webkit).
Reverted changeset:
"[GTK] Bump glib to 2.50.1 (or find alternative solution to
Gtk+ CUPS build issue)"
https://bugs.webkit.org/show_bug.cgi?id=163689
http://trac.webkit.org/changeset/207992
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (207997 => 207998)
--- trunk/Tools/ChangeLog 2016-10-27 19:41:43 UTC (rev 207997)
+++ trunk/Tools/ChangeLog 2016-10-27 19:49:49 UTC (rev 207998)
@@ -1,3 +1,18 @@
+2016-10-27 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r207992.
+ https://bugs.webkit.org/show_bug.cgi?id=164070
+
+ triggered aclocal version conflict (Requested by mcatanzaro on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK] Bump glib to 2.50.1 (or find alternative solution to
+ Gtk+ CUPS build issue)"
+ https://bugs.webkit.org/show_bug.cgi?id=163689
+ http://trac.webkit.org/changeset/207992
+
2016-10-27 Joanmarie Diggs <[email protected]>
[GTK] Bump glib to 2.50.1 (or find alternative solution to Gtk+ CUPS build issue)
Modified: trunk/Tools/gtk/jhbuild.modules (207997 => 207998)
--- trunk/Tools/gtk/jhbuild.modules 2016-10-27 19:41:43 UTC (rev 207997)
+++ trunk/Tools/gtk/jhbuild.modules 2016-10-27 19:49:49 UTC (rev 207998)
@@ -208,7 +208,6 @@
hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
<patch file="glib-warning-fix.patch" strip="1"/>
<patch file="gdate-suppress-string-format-literal-warning.patch" strip="1"/>
- <patch file="glib-deprecate-am-glib-gnu-gettext.patch" strip="1"/>
</branch>
</autotools>
Deleted: trunk/Tools/gtk/patches/glib-deprecate-am-glib-gnu-gettext.patch (207997 => 207998)
--- trunk/Tools/gtk/patches/glib-deprecate-am-glib-gnu-gettext.patch 2016-10-27 19:41:43 UTC (rev 207997)
+++ trunk/Tools/gtk/patches/glib-deprecate-am-glib-gnu-gettext.patch 2016-10-27 19:49:49 UTC (rev 207998)
@@ -1,36 +0,0 @@
-From d11545b206f14638c3e3f880a11c4da5477954e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <[email protected]>
-Date: Mon, 12 Jul 2010 19:16:53 +0200
-Subject: [PATCH] Deprecate GLIB_GNU_GETTEXT macro, use upstream instead
-
-https://bugzilla.gnome.org/show_bug.cgi?id=624186
----
- m4macros/glib-gettext.m4 | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
-index 68b08b3..0179cbc 100644
---- a/m4macros/glib-gettext.m4
-+++ b/m4macros/glib-gettext.m4
-@@ -309,7 +309,7 @@ msgstr ""
- # on various variables needed by the Makefile.in.in installed by
- # glib-gettextize.
- dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-+AU_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
-@@ -380,7 +380,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
-+ ],
-+ [[$0: This macro is deprecated. You should use upstream gettext instead.]])
-
- # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
- # -------------------------------
---
-1.7.1
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
