[EFL] gnutls-3.3.0 jhbuild module build fails on Ubuntu 15.10
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 10:26:10 +0000 (10:26 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 10:26:10 +0000 (10:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150622

Reviewed by Gyuyoung Kim.

* efl/install-dependencies:
* efl/jhbuild.modules:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/efl/install-dependencies
Tools/efl/jhbuild.modules

index feb4bd6570f0f3f7cfeac722dc2dcd3ab2e4e8aa..c8078f38f57fdf28c0968fcd1fd4772180f8f5b7 100644 (file)
@@ -1,3 +1,13 @@
+2015-11-02  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] gnutls-3.3.0 jhbuild module build fails on Ubuntu 15.10
+        https://bugs.webkit.org/show_bug.cgi?id=150622
+
+        Reviewed by Gyuyoung Kim.
+
+        * efl/install-dependencies:
+        * efl/jhbuild.modules:
+
 2015-11-02  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Fix EFL jhbuild module build on Ubuntu 15.10
index 9f761730a82dc386bcdc65d1e99beb3975d45126..b6332f2e22c299407078ba0167c1460647a0ce10 100755 (executable)
@@ -69,6 +69,7 @@ function installDependenciesWithApt {
         libgeoclue-dev \
         libgif-dev \
         libgl1-mesa-dev \
+        libgnutls-dev \
         libgpg-error-dev \
         libhyphen-dev \
         libicu-dev \
@@ -97,7 +98,6 @@ function installDependenciesWithApt {
         libxss-dev \
         libxt-dev \
         libxtst-dev \
-        nettle-dev \
         ninja-build \
         ragel \
         ruby \
index a2d27802a97c946758850566e5a0ec3728b0e984..badaca0ceebf6102478670de500d9c3562e58fad 100644 (file)
@@ -12,7 +12,6 @@
       <dep package="freetype6"/>
       <dep package="harfbuzz"/>
       <dep package="glib"/>
-      <dep package="gnutls"/>
       <dep package="glib-networking"/>
       <dep package="libsoup"/>
       <dep package="elementary"/>
@@ -56,8 +55,6 @@
       href="http://llvm.org/svn/llvm-project/"/>
   <repository type="tarball" name="llvm-tar"
       href="http://llvm.org"/>
-  <repository type="tarball" name="gnutls"
-      href="ftp://ftp.gnutls.org"/>
 
   <autotools id="cairo" autogen-sh="configure"
              makeargs="CFLAGS='-fno-lto' CXXFLAGS='-fno-lto' LDFLAGS='-fno-lto'">
             md5sum="9636f60e99b98fd0fdb5239f905ac008"/>
   </autotools>
 
-  <autotools id="gnutls" autogen-sh="configure">
-    <branch module="/gcrypt/gnutls/v3.3/gnutls-3.3.0.tar.xz" version="3.3"
-            repo="gnutls"
-            hash="sha256:7b87a4319f74cae3a5f204b810000f06b8efa1ed0f57c684b9bc454f444fdf13"
-            md5sum="4aeb8014feb4016c73a60f4e1ac73c9f"/>
-  </autotools>
-
   <autotools id="glib-networking">
     <dependencies>
       <dep package="glib"/>