Title: [124094] trunk/Tools
Revision
124094
Author
rak...@webkit.org
Date
2012-07-30 14:35:10 -0700 (Mon, 30 Jul 2012)

Log Message

[jhbuild] gnutls 2.12.14 does not build with glibc 2.16.0
https://bugs.webkit.org/show_bug.cgi?id=90643

Reviewed by Gustavo Noronha Silva.

The 2.x series of gnutls has a version of Gnulib that is
incompatible with glibc 2.16.0, which now does not define gets()
by default.

After talking to kov, mrobinson and philn, it looks like it makes
sense to simply remove gnutls from jhbuild.modules and rely on the
version installed on the system being recent enough.

This means at least version 2.12.8 for PKCS11 support, or at the
very least 2.11.0 (these are the minimum versions enforced by
glib-networking's configure.ac).

* efl/jhbuild.modules: Do not build gnutls anymore, make
glib-networking depend on glib instead, and move the libgcrypt
dependency to eet, which is what currently needs it.
* gtk/jhbuild.modules: Do not build gnutls anymore.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (124093 => 124094)


--- trunk/Tools/ChangeLog	2012-07-30 21:33:32 UTC (rev 124093)
+++ trunk/Tools/ChangeLog	2012-07-30 21:35:10 UTC (rev 124094)
@@ -1,3 +1,27 @@
+2012-07-30  Raphael Kubo da Costa  <rak...@webkit.org>
+
+        [jhbuild] gnutls 2.12.14 does not build with glibc 2.16.0
+        https://bugs.webkit.org/show_bug.cgi?id=90643
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The 2.x series of gnutls has a version of Gnulib that is
+        incompatible with glibc 2.16.0, which now does not define gets()
+        by default.
+
+        After talking to kov, mrobinson and philn, it looks like it makes
+        sense to simply remove gnutls from jhbuild.modules and rely on the
+        version installed on the system being recent enough.
+
+        This means at least version 2.12.8 for PKCS11 support, or at the
+        very least 2.11.0 (these are the minimum versions enforced by
+        glib-networking's configure.ac).
+
+        * efl/jhbuild.modules: Do not build gnutls anymore, make
+        glib-networking depend on glib instead, and move the libgcrypt
+        dependency to eet, which is what currently needs it.
+        * gtk/jhbuild.modules: Do not build gnutls anymore.
+
 2012-07-30  Dirk Pranke  <dpra...@chromium.org>
 
         nrwt: --verbose logging does not work right on windows

Modified: trunk/Tools/efl/jhbuild.modules (124093 => 124094)


--- trunk/Tools/efl/jhbuild.modules	2012-07-30 21:33:32 UTC (rev 124093)
+++ trunk/Tools/efl/jhbuild.modules	2012-07-30 21:35:10 UTC (rev 124094)
@@ -32,8 +32,6 @@
       href=""
   <repository type="git" name="git.gnome.org"
       href=""
-  <repository type="tarball" name="gnu.org"
-      href=""
   <repository type="tarball" name="cairographics.org"
       href=""
   <repository type="tarball" name="freedesktop.org"
@@ -62,7 +60,6 @@
     </branch>
   </autotools>
 
-
   <autotools id="fonts"
              skip-autogen="true">
     <branch module="downloads/mrobinson/webkitgtk-test-fonts/webkitgtk-test-fonts-0.0.3.tar.gz" version="0.0.3"
@@ -122,7 +119,7 @@
 
   <autotools id="glib-networking">
     <dependencies>
-      <dep package="gnutls"/>
+      <dep package="glib"/>
     </dependencies>
     <branch module="/pub/GNOME/sources/glib-networking/2.33/glib-networking-2.33.2.tar.xz" version="2.33.2"
             repo="ftp.gnome.org"
@@ -130,18 +127,6 @@
             md5sum="5abb364f2a0babe2ec1e3a6d59f69043"/>
   </autotools>
 
-  <autotools id="gnutls"
-             autogenargs="--enable-ld-version-script --enable-cxx --without-lzo --with-libgcrypt">
-    <dependencies>
-      <dep package="libgcrypt"/>
-      <dep package="p11-kit"/>
-    </dependencies>
-    <branch module="/gnu/gnutls/gnutls-2.12.14.tar.bz2" version="2.12.14"
-            repo="gnu.org"
-            hash="sha256:5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"
-            md5sum="555687a7ffefba0bd9de1e71cb61402c"/>
-  </autotools>
-
   <autotools id="libsoup"
              autogenargs="--without-gnome --disable-introspection">
     <dependencies>
@@ -206,6 +191,7 @@
             repo="enlightenment.org"
             revision="73027"/>
     <dependencies>
+      <dep package="libgcrypt"/>
       <dep package="eina"/>
     </dependencies>
   </autotools>

Modified: trunk/Tools/gtk/jhbuild.modules (124093 => 124094)


--- trunk/Tools/gtk/jhbuild.modules	2012-07-30 21:33:32 UTC (rev 124093)
+++ trunk/Tools/gtk/jhbuild.modules	2012-07-30 21:35:10 UTC (rev 124094)
@@ -32,8 +32,6 @@
       href=""
   <repository type="git" name="git.gnome.org"
       href=""
-  <repository type="tarball" name="gnu.org"
-      href=""
   <repository type="tarball" name="cairographics.org"
       href=""
   <repository type="tarball" name="freedesktop.org"
@@ -153,7 +151,6 @@
   <autotools id="glib-networking">
     <dependencies>
       <dep package="glib"/>
-      <dep package="gnutls"/>
     </dependencies>
     <branch module="/pub/GNOME/sources/glib-networking/2.33/glib-networking-2.33.2.tar.xz" version="2.33.2"
             repo="ftp.gnome.org"
@@ -161,14 +158,6 @@
             md5sum="5abb364f2a0babe2ec1e3a6d59f69043"/>
   </autotools>
 
-  <autotools id="gnutls"
-             autogenargs="--enable-ld-version-script --enable-cxx --without-lzo --with-libgcrypt --without-p11-kit">
-    <branch module="/gnu/gnutls/gnutls-2.12.14.tar.bz2" version="2.12.14"
-            repo="gnu.org"
-            hash="sha256:5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"
-            md5sum="555687a7ffefba0bd9de1e71cb61402c"/>
-  </autotools>
-
   <autotools id="libsoup"
              autogenargs="--without-gnome --disable-introspection">
     <dependencies>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to