summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPol Vinogradov2013-04-10 17:25:52 -0400
committerTreeve Jelbert2013-04-13 10:50:11 +0200
commit60232d52fa6d2778eb17b5eaf30a48ea0e05e305 (patch)
treedaa13a9ea0c7d7a9803be3baea902f071a72be0f
parenta92eb33c5b7bc530fb7f5d953c867be7c8887bf5 (diff)
http/webkitgtk: version 2.0.0
-rwxr-xr-xhttp/webkitgtk/BUILD1
-rwxr-xr-xhttp/webkitgtk/CONFIGURE1
-rwxr-xr-xhttp/webkitgtk/DEPENDS6
-rwxr-xr-xhttp/webkitgtk/DETAILS10
-rw-r--r--http/webkitgtk/HISTORY9
-rwxr-xr-xhttp/webkitgtk/PRE_BUILD3
-rw-r--r--http/webkitgtk/opengl-headers.patch29
7 files changed, 20 insertions, 39 deletions
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 719a5d95ef..4e6911dec5 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,5 +1,4 @@
OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
-OPTS="--with-gtk=2.0 --disable-webkit2 $OPTS" &&
make_single &&
default_build &&
diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index d2cebdd1a4..129adc37da 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,6 +1,5 @@
config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2 pango &&
config_query_list WEBKIT_ACC "Select acceleration backend to use" opengl clutter none &&
-config_query_list WEBKIT_UNICODE "Select unicode backend to use" icu glib2 &&
config_query_option WEBKIT_WEBGL "Enable support for WebGL?" y \
"--enable-webgl" "--disable-webgl"
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index e36a940959..d62dcb7f06 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends gtk+2 &&
+depends gtk+2 '--with-gtk=2.0 --disable-webkit2' &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -14,6 +14,8 @@ depends libsoup &&
depends enchant &&
depends libxt &&
depends RUBY &&
+depends libwebp &&
+depends libsecret &&
optional_depends cairo '--enable-svg' \
'--disable-svg' \
@@ -32,7 +34,7 @@ if [[ ! $WEBKIT_FONT_BE == freetype2 ]]; then
fi &&
depends freetype2 &&
-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/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 0b1cf0b238..8870763c08 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,20 +1,20 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=1.10.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
- SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+ SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=1.10.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
- SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+ SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=1
+ PATCHLEVEL=0
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 44ee84d0c8..1363ea553d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,12 @@
+2013-04-10 Pol Vinogradov <vin.public@gmail.com>
+ * DETAilS: version 2.0.0
+ * BUILD: moved gtk+2 flags to DEPENDS
+ * CONFIGURE: removed unicode backend choice
+ * DEPENDS: added dependencies on libwebp and libsecret,
+ gst-plugins-base -> gst-plugins-base-1.0, added flags to gtk+2
+ * PRE_BUILD, opengl-headers.patch: removed OpenGL patch,
+ added fix for UTF8 header
+
2013-01-08 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
index cdd362a622..5003c3c630 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/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/webkitgtk/opengl-headers.patch b/http/webkitgtk/opengl-headers.patch
deleted file mode 100644
index 0ff8fee702..0000000000
--- a/http/webkitgtk/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)