http/webkitgtk3: version 2.0.0

6 files changed, 16 insertions, 35 deletions

diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index d93409abef..9207d63161 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,3 @@
 OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=3.0 $OPTS" &&
 
 default_build
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 8062770f1f..15b4b63aa1 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
 depends autoconf &&
 depends automake &&
 depends libtool &&
-depends gtk+3 &&
+depends gtk+3 '--with-gtk=3.0' &&
 depends icu &&
 depends gperf &&
 depends libpng &&
@@ -16,6 +16,8 @@ depends libxt &&
 depends perl &&
 depends PYTHON &&
 depends RUBY &&
+depends libwebp &&
+depends libsecret &&
 
 optional_depends gtk-doc '--enable-gtk-doc' \
                          ''                 \
@@ -35,7 +37,7 @@ else
   depends pango "--with-font-backend=pango"
 fi &&
 
-optional_depends gst-plugins-base  \
+optional_depends gst-plugins-base-1.0  \
                  "--enable-video" \
                  "--disable-video" \
                  "for HTML5 streaming video support" &&
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 27a765469b..4f5be4d5d2 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
            SPELL=webkitgtk3
-         VERSION=1.10.2
+         VERSION=2.0.0
           SOURCE=webkitgtk-$VERSION.tar.xz
    SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-     SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+     SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
         WEB_SITE=http://webkitgtk.org/
   SECURITY_PATCH=4
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 0e905583e1..a0fca17ffa 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,11 @@
+2013-04-10 Pol Vinogradov <vin.public@gmail.com>
+	* DETAilS: version 2.0.0
+	* BUILD: moved --WITHgtk=3.0 flag to DEPENDS
+	* DEPENDS: added dependencies on libwebp and libsecret,
+	  gst-plugins-base -> gst-plugins-base-1.0, added flag for gtk+3
+	* PRE_BUILD, opengl-headers.patch: removed OpenGL patch,
+	  added fix for UTF8 header
+
 2013-02-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS: added dependencies on perl, PYTHON and RUBY
 
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
index cdd362a622..5003c3c630 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
 patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
+sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
+       Source/WebCore/platform/text/TextCodecUTF8.h
diff --git a/http/webkitgtk3/opengl-headers.patch b/http/webkitgtk3/opengl-headers.patch
deleted file mode 100644
index 0ff8fee702..0000000000
--- a/http/webkitgtk3/opengl-headers.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Source/WebCore/platform/graphics/OpenGLShims.h.orig
-+++ Source/WebCore/platform/graphics/OpenGLShims.h
-@@ -56,6 +56,8 @@
- typedef void (*glBufferSubDataType) (GLenum, GLintptr, GLsizeiptr, const GLvoid*);
- typedef GLenum (*glCheckFramebufferStatusType) (GLenum);
- typedef void (*glCompileShaderType) (GLuint);
-+typedef void (*glCompressedTexImage2DType) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-+typedef void (*glCompressedTexSubImage2DType) (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
- typedef GLuint (*glCreateProgramType) ();
- typedef GLuint (*glCreateShaderType) (GLenum);
- typedef void (*glDeleteBuffersType) (GLsizei, const GLuint*);
-@@ -152,6 +154,8 @@
-     FUNCTION_TABLE_ENTRY(glBufferSubData);
-     FUNCTION_TABLE_ENTRY(glCheckFramebufferStatus);
-     FUNCTION_TABLE_ENTRY(glCompileShader);
-+    FUNCTION_TABLE_ENTRY(glCompressedTexImage2D);
-+    FUNCTION_TABLE_ENTRY(glCompressedTexSubImage2D);
-     FUNCTION_TABLE_ENTRY(glCreateProgram);
-     FUNCTION_TABLE_ENTRY(glCreateShader);
-     FUNCTION_TABLE_ENTRY(glDeleteBuffers);
-@@ -253,6 +257,8 @@
- #define glCheckFramebufferStatusEXT            glCheckFramebufferStatus
- #define glCheckFramebufferStatus               LOOKUP_GL_FUNCTION(glCheckFramebufferStatus)
- #define glCompileShader                        LOOKUP_GL_FUNCTION(glCompileShader)
-+#define glCompressedTexImage2D                 LOOKUP_GL_FUNCTION(glCompressedTexImage2D)
-+#define glCompressedTexSubImage2D              LOOKUP_GL_FUNCTION(glCompressedTexSubImage2D)
- #define glCreateProgram                        LOOKUP_GL_FUNCTION(glCreateProgram)
- #define glCreateShader                         LOOKUP_GL_FUNCTION(glCreateShader)
- #define glDeleteBuffers                        LOOKUP_GL_FUNCTION(glDeleteBuffers)