Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc92a183312f11742e48852f7a9befe85f7f4156)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc92a183312f11742e48852f7a9befe85f7f4156)
  • Date: Fri, 24 Apr 2015 15:47:05 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome3-libs/adwaita-icon-theme/DEPENDS | 11
gnome3-libs/adwaita-icon-theme/HISTORY | 5
gnome3-libs/adwaita-icon-theme/PRE_BUILD | 6
gnome3-libs/adwaita-icon-theme/symbolic-svg.patch | 19
http/webkitgtk/BUILD | 9
http/webkitgtk/CONFIGURE | 25 -
http/webkitgtk/DEPENDS | 102 ++--
http/webkitgtk/DETAILS | 19
http/webkitgtk/HISTORY | 36 -
http/webkitgtk/PREPARE | 1
http/webkitgtk/PRE_BUILD | 7
http/webkitgtk/bison3.patch | 10
http/webkitgtk/gtk-doc.patch | 11
http/webkitgtk/opengl-headers.patch | 29 +
http/webkitgtk/utf8.patch | 10
http/webkitgtk3/BUILD | 14
http/webkitgtk3/CONFIGURE | 10
http/webkitgtk3/DEPENDS | 84 +--
http/webkitgtk3/DETAILS | 10
http/webkitgtk3/HISTORY | 467
+---------------------
http/webkitgtk3/PRE_BUILD | 7
http/webkitgtk3/bison3.patch | 10
http/webkitgtk3/gtk-doc.patch | 11
http/webkitgtk3/opengl-headers.patch | 29 +
http/webkitgtk3/utf8.patch | 10
25 files changed, 342 insertions(+), 610 deletions(-)

New commits:
commit fc92a183312f11742e48852f7a9befe85f7f4156
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk3: fixed build with system icu

commit 9ea9e5867a7bb052b53a771ab1473e86641de7ac
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk: fixed build with system icu

commit dd2449dd110eb343a29f91d7869a602f6c26e75e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk3: fixed build with bison 3.0

commit d57a7d80d06bac71cfd77a1c9055b502c6f227a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

adwaita-icon-theme: added missing dependencies

(cherry picked from commit 35b700fb71765b64cdc04dc65fce087b2dd76f3c)

commit 5730098d393fcef4fab5fde1b9b7e4873f8e07d7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk: fixed build with bison 3.0

commit afa14662b4f74255ae823bef9ee04111e0a01184
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk3: rollback to 1.10.2 sadly because of incompatible compiler

commit fee774e824f2c5649e046cac98a93e1a38ac7d1f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk: rollback to 1.10.2 sadly because of incompatible compiler

diff --git a/gnome3-libs/adwaita-icon-theme/DEPENDS
b/gnome3-libs/adwaita-icon-theme/DEPENDS
index 260cd24..9ccd89b 100755
--- a/gnome3-libs/adwaita-icon-theme/DEPENDS
+++ b/gnome3-libs/adwaita-icon-theme/DEPENDS
@@ -1,4 +1,13 @@
depends gtk+2 &&
depends intltool &&
depends hicolor-icon-theme &&
-depends icon-naming-utils
+depends icon-naming-utils &&
+
+optional_depends librsvg2 \
+ "--enable-symbolic-svg" \
+ "--disable-symbolic-svg" \
+ "to encode symbolic files from SVG (requires
gtk-encode-symbolic-svg tool from ${SPELL_COLOR}gtk+3${DEFAULT_COLOR})" &&
+
+if is_depends_enabled $SPELL librsvg2; then
+ depends gtk+3
+fi
diff --git a/gnome3-libs/adwaita-icon-theme/HISTORY
b/gnome3-libs/adwaita-icon-theme/HISTORY
index c6af5b2..1e22528 100644
--- a/gnome3-libs/adwaita-icon-theme/HISTORY
+++ b/gnome3-libs/adwaita-icon-theme/HISTORY
@@ -1,3 +1,8 @@
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing librsvg2, gtk+3 dependencies
+ * PRE_BUILD: added, to apply patch
+ * symbolic-svg.patch: added, to make librsvg2 dependency configurable
+
2015-03-14 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added, for missing dependencies, imported from
gnome-icon-theme
diff --git a/gnome3-libs/adwaita-icon-theme/PRE_BUILD
b/gnome3-libs/adwaita-icon-theme/PRE_BUILD
new file mode 100755
index 0000000..c3c7c40
--- /dev/null
+++ b/gnome3-libs/adwaita-icon-theme/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/symbolic-svg.patch" &&
+
+autoreconf -fi
diff --git a/gnome3-libs/adwaita-icon-theme/symbolic-svg.patch
b/gnome3-libs/adwaita-icon-theme/symbolic-svg.patch
new file mode 100644
index 0000000..c289eb1
--- /dev/null
+++ b/gnome3-libs/adwaita-icon-theme/symbolic-svg.patch
@@ -0,0 +1,19 @@
+--- configure.ac.orig 2014-09-23 06:22:31.000000000 +0400
++++ configure.ac 2015-04-24 17:14:54.603619466 +0300
+@@ -52,9 +52,15 @@
+ fi
+ AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
+
++AC_ARG_ENABLE(symbolic-svg,
++ AC_HELP_STRING([--disable-symbolic-svg], [disable encoding symbolic files
from SVG]),
++ [symbolic_svg=${enableval}],
++ [symbolic_svg=yes]
++)
++
+ symbolic_encode_sizes="16x16 24x24 32x32 48x48 64x64 96x96"
+ AC_PATH_PROG([GTK_ENCODE_SYMBOLIC_SVG], [gtk-encode-symbolic-svg], [false])
+-if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
++if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse" || test "x$symbolic_svg" =
"xno"; then
+ symbolic_encode_sizes=""
+ fi
+ AC_SUBST(symbolic_encode_sizes)
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index ca900eb..719a5d9 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,3 +1,6 @@
-OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
-sed -i '30i#include <unicode/utf8.h>'
${SOURCE_DIRECTORY}/Source/WebCore/platform/text/TextCodecUTF8.h &&
-default_build
+OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
+OPTS="--with-gtk=2.0 --disable-webkit2 $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/http/webkitgtk/CONFIGURE b/http/webkitgtk/CONFIGURE
index 1c1eb0d..d2cebdd 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,21 +1,6 @@
-config_query_option WEBKIT_OPTS "Enable support for WebGL?" y \
- "--enable-webgl" "--disable-webgl" &&
-
-config_query_option WEBKIT_OPTS "Enable support for GLX?" y \
- "--enable-glx" "--disable-glx" &&
-
-config_query_option WEBKIT_OPTS "Enable support for EGL?" y \
- "--enable-egl" "--disable-egl" &&
-
-config_query_option WEBKIT_OPTS "Enable support for OpenGL ES 2?" n \
- "--enable-gles2" "--disable-gles2" &&
-
-config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
- "--enable-jit" "--disable-jit" &&
-
-config_query_option WEBKIT_OPTS "Enable Opcode statistics?" n \
- "--enable-opcode-stats" "--disable-opcode-stats"
-
-# something like this will be needed for wayland
-#config_query_list WEBKIT_TARGET "Build for which target?" x11 wayland
x11,wayland directfb
+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 d176250..e36a940 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -2,65 +2,69 @@ depends -sub CXX gcc &&
depends autoconf &&
depends automake &&
depends libtool &&
-depends bison &&
-depends gperf &&
-depends flex &&
+depends gtk+2 &&
depends icu &&
-depends libxslt &&
-depends libxml2 &&
-depends zlib &&
-depends libxt &&
-depends libxrender &&
-depends libxcomposite &&
-depends libxdamage &&
-depends MESALIB --enable-accelerated-compositing &&
-depends glib2 &&
-depends fontconfig &&
-depends freetype2 &&
-depends harfbuzz &&
-depends cairo --enable-svg &&
-depends pango &&
-depends gtk+2 --with-gtk=2.0 &&
-depends gdk-pixbuf2 &&
-depends libsoup &&
-depends at-spi2-core &&
+depends gperf &&
depends libpng &&
depends JPEG &&
-depends libwebp &&
+depends bison &&
+depends flex &&
depends sqlite &&
-depends perl &&
-depends PYTHON &&
+depends libsoup &&
+depends enchant &&
+depends libxt &&
depends RUBY &&

-optional_depends enchant \
- "--enable-spellcheck" "--disable-spellcheck" \
- "Enable spellchecking support?" &&
+optional_depends cairo '--enable-svg' \
+ '--disable-svg' \
+ 'Enable SVG support?'

-optional_depends libsecret \
- "--enable-credential-storage"
"--disable-credential-storage" \
- "Enable support for credential storage?" &&
+optional_depends libxslt '--enable-xslt' \
+ '--disable-xslt' \
+ 'for XSLT support' &&

-optional_depends gobject-introspection \
- "--enable-introspection" "--disable-introspection" \
- "Enable GObject introspection?" &&
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '--disable-gtk-doc' \
+ 'for documentation generation' &&

-optional_depends geoclue \
- "--enable-geolocation" "--disable-geolocation" \
- "Enable geolocation support?" &&
+if [[ ! $WEBKIT_FONT_BE == freetype2 ]]; then
+ depends pango "--with-font-backend=pango"
+fi &&
+depends freetype2 &&

-optional_depends gstreamer-1.0 \
- "--enable-web-audio --enable-video" \
- "--disable-web-audio --disable-video" \
- "Enable support for enable HTML5 video and Web Audio?" &&
+optional_depends gst-plugins-base \
+ "--enable-video" \
+ "--disable-video" \
+ "for HTML5 streaming video support" &&

-if is_depends_enabled $SPELL gstreamer-1.0 ; then
- depends gst-plugins-base-1.0
-fi &&
+#optional_depends gobject-introspection \
+# "--enable-introspection" \
+# "--disable-introspection" \
+# "to enable introspection" &&

-optional_depends upower \
- "--enable-battery-status" "--disable-battery-status" \
- "Enable support for Battery Status API?" &&
+optional_depends geoclue \
+ "--enable-geolocation" \
+ "--disable-geolocation" \
+ "to enable geolocation support" &&

-optional_depends gtk-doc \
- "--enable-gtk-doc" "--disable-gtk-doc" \
- "Build documentation with gtk-doc?"
+case $WEBKIT_ACC in
+ opengl)
+ depends OPENGL "--with-acceleration-backend=opengl"
+ ;;
+ clutter)
+ depends clutter "--with-acceleration-backend=clutter"
+ ;;
+ *)
+ OPTS+=" --with-acceleration-backend=none"
+ ;;
+esac
+
+#if is_depends_enabled $SPELL gobject-introspection; \
+# then depends gir-repository; fi
+
+depends atk &&
+depends fontconfig &&
+depends gdk-pixbuf2 &&
+depends glib2 &&
+depends libx11 &&
+depends libxml2
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index c45f803..0b1cf0b 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,11 +1,20 @@
SPELL=webkitgtk
- VERSION=2.4.8
- SOURCE=webkitgtk-$VERSION.tar.xz
+if [[ $WEBKITGTK_NIGHT == "y" ]]; then
+ VERSION=1.10.2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+else
+ VERSION=1.10.2
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=9
+ SECURITY_PATCH=8
+ PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 98fee04..1a8f846 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,35 +1,7 @@
-2015-02-12 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 2.4.8, SECURITY_PATCH++, (CVE-2014-1344),
- (CVE-2014-1384), (CVE-2014-1385), (CVE-2014-1387), (CVE-2014-1388),
- (CVE-2014-1389), (CVE-2014-1390)
-
-2014-10-23 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.7
-
-2014-10-08 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.6
-
-2014-07-12 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.4
-
-2014-06-05 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: 2.4.3
- * BUILD: added missing header fix
- * gtk-doc.patch, opengl-headers.patch: removed unused files
-
-2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.2
-
-2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: mesalib => MESALIB
-
-2014-01-28 Robin Cook <rcook AT wyrms.net>
- * DETAILS: updated to 2.2.4
- * DEPENDS: updated to new dependencies
- * CONFIURE: added new configure options
- * PREPARE: removed
- * PRE_BUILD: removed but may be needed if can get gtk-doc removal
fixed
- * BUILD: removed the make_single
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply patches
+ * bison3.patch: added, to fix build with bison 3.0
+ * utf8.patch: added, to fix build with system icu

2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
diff --git a/http/webkitgtk/PREPARE b/http/webkitgtk/PREPARE
new file mode 100755
index 0000000..678e34c
--- /dev/null
+++ b/http/webkitgtk/PREPARE
@@ -0,0 +1 @@
+config_query WEBKITGTK_NIGHT "Build devel version?" n
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..d391e2c
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/bison3.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/utf8.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk/bison3.patch b/http/webkitgtk/bison3.patch
new file mode 100644
index 0000000..f4f8397
--- /dev/null
+++ b/http/webkitgtk/bison3.patch
@@ -0,0 +1,10 @@
+--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2015-04-24
16:15:42.241649559 +0300
++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y 2015-04-24
16:19:18.999685022 +0300
+@@ -47,6 +47,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
diff --git a/http/webkitgtk/gtk-doc.patch b/http/webkitgtk/gtk-doc.patch
new file mode 100644
index 0000000..c362565
--- /dev/null
+++ b/http/webkitgtk/gtk-doc.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.in.orig 2012-03-27 20:31:16.000000000 +0400
++++ GNUmakefile.in 2012-04-15 10:40:36.226272195 +0400
+@@ -74045,7 +74045,7 @@
+ @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
+ @ENABLE_WEBKIT2_TRUE@ fi; \
+ @ENABLE_WEBKIT2_TRUE@ fi
+- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
++@ENABLE_GTK_DOC_TRUE@ @$(AM_V_GEN)$(PYTHON)
$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
+
+ uninstall-local:
+ @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/http/webkitgtk/opengl-headers.patch
b/http/webkitgtk/opengl-headers.patch
new file mode 100644
index 0000000..0ff8fee
--- /dev/null
+++ b/http/webkitgtk/opengl-headers.patch
@@ -0,0 +1,29 @@
+--- 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)
diff --git a/http/webkitgtk/utf8.patch b/http/webkitgtk/utf8.patch
new file mode 100644
index 0000000..e245868
--- /dev/null
+++ b/http/webkitgtk/utf8.patch
@@ -0,0 +1,10 @@
+--- Source/WebCore/platform/text/TextCodecUTF8.h.orig 2012-11-24
00:12:17.000000000 +0400
++++ Source/WebCore/platform/text/TextCodecUTF8.h 2015-04-24
19:35:22.748881405 +0300
+@@ -27,6 +27,7 @@
+ #define TextCodecUTF8_h
+
+ #include "TextCodec.h"
++#include "../../../JavaScriptCore/icu/unicode/utf8.h"
+
+ namespace WebCore {
+
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index a8369b8..d93409a 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,10 +1,4 @@
-OPTS="$WEBKIT_OPTS $OPTS" &&
-sed -i '30i#include <unicode/utf8.h>' \
- Source/WebCore/platform/text/TextCodecUTF8.h &&
-sed -i '30i#include <unicode/utf16.h>' \
- Source/WTF/wtf/text/StringBuilder.h &&
-sed -i '26i#include <unicode/utf16.h>' \
- Source/WTF/wtf/text/StringImpl.h &&
-sed -i '29i#include <unicode/utf16.h>' \
- Source/WTF/wtf/unicode/UTF8.h &&
-cmake_build
+OPTS="$WEBKIT_SVG $WEBKIT_WEBGL $OPTS" &&
+OPTS="--with-gtk=3.0 $OPTS" &&
+
+default_build
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 87e576f..1fe0ab0 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,8 +1,4 @@
-config_query_option WEBKIT_OPTS "Enable support for WebGL" y \
- -DENABLE_WEBGL={ON,OFF} &&
+config_query_list WEBKIT_FONT_BE "Select font backend to use" freetype2
pango &&

-config_query_option WEBKIT_OPTS "Enable JIT compilation?" y \
- -DENABLE_JIT={ON,OFF} &&
-
-config_query_option WEBKIT_OPTS "Enable Media statistics?" n \
- -DENABLE_MEDIA_STATISTICS={ON,OFF}
+config_query_option WEBKIT_WEBGL "Enable support for WebGL?" y \
+ "--enable-webgl" "--disable-webgl"
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 77dc876..8062770 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -1,64 +1,54 @@
depends -sub CXX gcc &&
-depends cmake &&
+depends autoconf &&
+depends automake &&
depends libtool &&
-depends bison &&
-depends gperf &&
-depends flex &&
+depends gtk+3 &&
depends icu &&
-depends libxslt &&
-depends libxml2 &&
-depends zlib &&
-depends libxt &&
-depends libxrender &&
-depends libxcomposite &&
-depends libxdamage &&
-depends MESALIB &&
-depends glib2 &&
-depends fontconfig &&
-depends freetype2 &&
-depends -sub ICU harfbuzz &&
-depends cairo &&
-depends pango &&
-depends gtk+3 -DPORT=GTK &&
-depends gdk-pixbuf2 &&
-depends libsoup &&
-depends at-spi2-core &&
+depends gperf &&
depends libpng &&
depends JPEG &&
-depends libwebp &&
+depends bison &&
+depends flex &&
depends sqlite &&
+depends libsoup &&
+depends enchant &&
+depends libxt &&
depends perl &&
depends PYTHON &&
depends RUBY &&

-optional_depends enchant \
- -DENABLE_SPELLCHECK={ON,OFF} \
- "Enable spellchecking support?" &&
+optional_depends gtk-doc '--enable-gtk-doc' \
+ '' \
+ 'Build documentation?' &&

-optional_depends libsecret \
- -DENABLE_CREDENTIAL_STORAGE={1,0} \
- "Enable support for credential storage?" &&
+optional_depends cairo '--enable-svg' \
+ '--disable-svg' \
+ 'Enable SVG support?' &&

-optional_depends gobject-introspection "" "" \
- "Enable GObject introspection?" &&
+optional_depends libxslt '--enable-xslt' \
+ '--disable-xslt' \
+ 'for XSLT support' &&

-optional_depends geoclue \
- -DENABLE_GEOLOCATION={ON,OFF} \
- "Enable geolocation support?" &&
+if [[ $WEBKIT_FONT_BE == freetype2 ]]; then
+ depends freetype2
+else
+ depends pango "--with-font-backend=pango"
+fi &&

-optional_depends gstreamer-1.0 \
- "-DENABLE_WEB_AUDIO=ON -DENABLE_VIDEO=ON" \
- "-DENABLE_WEB_AUDIO=OFF -DENABLE_VIDEO=OFF" \
- "Enable support for enable HTML5 video and Web Audio?" &&
+optional_depends gst-plugins-base \
+ "--enable-video" \
+ "--disable-video" \
+ "for HTML5 streaming video support" &&

-if is_depends_enabled $SPELL gstreamer-1.0 ; then
- depends gst-plugins-base-1.0
-fi &&
+optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "to enable introspection" &&

-optional_depends upower \
- -DENABLE_BATTERY_STATUS={ON,OFF} \
- "Enable support for Battery Status API?" &&
+optional_depends geoclue \
+ "--enable-geolocation" \
+ "--disable-geolocation" \
+ "to enable geolocation support"

-optional_depends gtk-doc \
- -DENABLE_GTKDOC={ON,OFF} \
- "Build documentation with gtk-doc?"
+#if is_depends_enabled $SPELL gobject-introspection; \
+# then depends gir-repository; fi
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index d8ff430..27a7654 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,14 +1,14 @@
SPELL=webkitgtk3
- VERSION=2.6.2
+ VERSION=1.10.2
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:54872feea7786634c50e3f771bd9b42ee3360012babc9d3ae25a8db95533c5acf708c9bb9a3145140d7345363b6899588aec3fe8224a562a2fabbb974d3a16dd
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkitgtk-$VERSION"
WEB_SITE=http://webkitgtk.org/
- SECURITY_PATCH=8
+ SECURITY_PATCH=4
GATHER_DOCS=off
LICENSE[0]=GPL
- ENTERED=20071208
+ ENTERED=20101017
SHORT="open source web browser engine"
cat << EOF
WebKit is an open source web browser engine. WebKit is also the name of the
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 67067a4..765ad11 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,95 +1,45 @@
-2014-10-23 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.6.2
+2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply patches
+ * bison3.patch: added, to fix build with bison 3.0
+ * utf8.patch: added, to fix build with system icu

-2014-10-15 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: tarball version 2.5.1a, the non-a vanished
- * DEPENDS: sub on harfbuzz with ICU
-
-2014-10-07 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.6.0
-
-2014-08-02 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.5.1
- * CONFIGURE, DEPENDS, BUILD: converted to cmake build system,
- added more missing header fixes, some cleanup
-
-2014-07-12 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.4
-
-2014-06-05 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: 2.4.3
- * BUILD: added missing header fix, no need to disable webkit2
- * gtk-doc.patch, opengl-headers.patch: removed unused files
-
-2014-05-16 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: version 2.4.2
-
-2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: mesalib => MESALIB
-
-2014-01-28 Robin Cook <rcook AT wyrms.net>
- * DETAILS: updated to 2.2.4
- * DEPENDS: updated to new dependencies
- * CONFIURE: added new configure options
- * PRE_BUILD: removed but may be needed if can get gtk-doc removal
fixed
-
-2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
-
-2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * CONFIGURE, DEPENDS: added configuration options for selecting
- the acceleration backend and the unicode backend
- * DEPENDS: removed dependencies on gstreamer, libffi, libxrender
- and pcre
-
-2012-12-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: fix syntax error in if statement
-
-2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: added dependencies on atk, fontconfig, gdk-pixbuf2,
- glib2, gstreamer, libffi, libx11, libxml2, libxrender, pcre
- * DETAILS: bumped PATCHLEVEL
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependencies on perl, PYTHON and RUBY

2012-12-11 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.10.2, SECURITY_PATCH=8, SOURCE: webkit -> webkitgtk
- * BUILD: --disable-webkit2 added, WebKit2 requires GTK+ 3.x
+ * DETAILS: 1.10.2, SECURITY_PATCH=4, SOURCE: webkit -> webkitgtk
* PRE_BUILD, bison-2.6.patch: patch removed

2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.3, SECURITY_PATCH=7
+ * DETAILS: 1.8.3, SECURITY_PATCH=3

2012-08-04 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.2, SECURITY_PATCH=6
+ * DETAILS: 1.8.2, SECURITY_PATCH=2
* PRE_BUILD, bison-2.6.patch: upstream patch added
http://trac.webkit.org/changeset/124099

-2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.8.1, SECURITY_PATCH=5
- * PRE_BUILD, disable-geo.patch: patch removed
+2012-05-10 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, opengl-headers.patch, gtk-doc.patch: apply
+ webkitgtk patches to webkitgtk3

-2012-04-15 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: added, to apply patches
- * disable-geo.patch: added, to fix compilation with disabled geoclue
- support
- * gtk-doc.patch: added, to fix installation without gtk-doc
- * opengl-headers.patch: added, to fix compilation with opengl support
-
-2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: corrected source urls
+2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.1, SECURITY_PATCH=1

2012-04-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.0
* CONFIGURE, BUILD: option for enable/disable webgl added

+2012-02-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DEPENDS: No longer depends on libsoup devel
+
2012-02-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.3

-2012-01-19 Vlad Glagolev <stealth AT sourcemage.org>
- * DEPENDS: libsoup is up to date enough to be used as stable
+2011-11-12 Tommy Boatman <tboatman AT sourcemage.org>
+ * DEPENDS: changed gtk-doc to optional (bug #317)

2011-09-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.1
- * BUILD: --with-gtk=2.0 added

2011-08-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.3
@@ -104,383 +54,38 @@

2011-06-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.1
+ * PRE_BUILD, perl514.patch: added to fix compilation with new Perl
5.14

-2011-05-29 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: added, to apply the patch
- * perl514.patch: added, to fix compilation with new Perl 5.14
-
-2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: stable is now at 1.4.0, which requires devel libsoup
-
-2011-04-30 Ladislav Hagara <hgr AT vabo.cz>
+2011-04-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

-2011-04-12 Arjan Bouter <abouter AT sourcemage.org>
- * DEPENDS: devel webkit depends on devel libsop
-
2011-04-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.13

2011-02-27 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.12
-
-2011-02-13 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.11
+ * DETAILS: Updated to version 1.3.12

-2011-02-09 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.7, SECURITY_PATCH=4
+2011-02-12 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.11
+ * DEPENDS: Required devel version of libsoup

-2011-01-07 Vlad Glagolev <stealth AT sourcemage.org>
- * BUILD: fixed multijob build
-
-2010-12-31 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.6, SECURITY_PATCH=3, #15926
+2011-01-11 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.10

2010-12-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.9
-
-2010-12-19 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.7
+ * DETAILS: Updated to version 1.3.9

-2010-11-13 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.6
+2010-12-18 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.7
+ * DEPENDS: Added back optional_depends gobject-introspection

2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

2010-10-22 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.3.5
-
-2010-10-10 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.5, SECURITY_PATCH=2, #15882
-
-2010-09-26 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.4
-
-2010-09-06 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.4, SECURITY_PATCH=1
-
-2010-08-13 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: Remove optional_depends gobject-introspection for now.
-
-2010-07-16 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.3
- * PRE_BUILD, webkit-icu44.patch: removed
-
-2010-07-15 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.3.3
-
-2010-07-12 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.2, 1.3.2
-
-2010-06-05 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.3.1
- * PRE_BUILD: Devel version doesn't need icu patch
-
-2010-05-18 Robert Figura <template AT sourcemage.org>
- * DEPENDS: added libxt
-
-2010-05-14 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version 1.2.1
- * webkit-icu44.patch: Updated (Removed ChangeLog) to work with 1.2.1
-
-2010-05-07 Arjan Bouter <abouter AT sourcemage.org>
- * PRE_BUILD: fixed icu-dev version patch
-
-2010-04-24 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: Added depends gir-repository if optional depends
- gobject-introspection
-
-2010-04-18 Arjan Bouter <abouter AT sourcemage.org>
- * PRE_BUILD, webkit-icu44.patch: added patch to fix icu 4.4 issues
-
-2010-04-06 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.2.0
- * DEPENDS: used devel dependencies for both stable and devel now
-
-2010-04-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS: added
- WEBKIT_DEVEL sub dependency
-
-2010-03-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.1.90
-
-2010-03-13 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to version 1.1.23
-
-2010-03-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
- * DEPENDS: added geoclue,
- added gobject-introspection for the devel version
-
-2010-02-28 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.1.22
-
-2010-02-11 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.1.21
-
-2010-02-05 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.1.20
-
-2010-01-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.1.19
-
-2010-01-16 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to 1.1.18
- * DEPENDS: Devel version needs devel version of libsoup
-
-2009-12-20 Arjan Bouter <abouter AT sourcemage.org>
- * DEPENDS: made gtk-doc and libxslt optional,
- moved svg query to an optional dep.
-
-2009-12-06 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.15.4
- Updated devel to version 1.1.17
- Added devel version vice a nightly build. Updated SOURCE &
SOURCE_URL
- Updated devel SOURCE_DIRECTORy
- * PREPARE: Changed query to use devel version
- * PRE_BUILD: Removed. Not needed for upstream devel version
-
-2009-11-16 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r51062
-
-2009-10-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r50006
-
-2009-10-20 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.15.3
-
-2009-10-06 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.15.2
-
-2009-10-02 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r49032. Updated SOURCE_URL[0]
-
-2009-09-26 Ladislav Hagara <hgr AT vabo.cz>
- * DEPENDS: stable libsoup is ok now (removed -sub SOUP_DEVEL)
-
-2009-09-22 Ladislav Hagara <hgr AT vabo.cz>
- * DETAILS: 1.1.15, 1.1.15.1
-
-2009-09-07 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.14
-
-2009-09-04 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r48037
-
-2009-08-24 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.13
-
-2009-08-11 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r47011
-
-2009-08-01 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.12
-
-2009-07-22 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r46193
-
-2009-07-13 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: Added sub_depends for libsoup on devel version
- * DETAILS: Updated stable to 1.1.11
-
-2009-06-29 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r45330
-
-2009-06-15 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.10
-
-2009-06-10 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.9
-
-2009-05-30 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r44282
-
-2009-05-28 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.8
-
-2009-05-22 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r44015
-
-2009-05-13 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.7
-
-2009-05-04 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated devel to r43163
-
-2009-04-30 Vlad Glagolev <stealth AT sourcemage.org>
- * DEPENDS: enchant isn't optional
-
-2009-04-29 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: optional_depends enchant
- devel depends on gtk-doc
- * DETAILS: Updated stable to version 1.1.6
- Updated evel to version r43000
-
-2009-04-16 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to version 1.1.5
-
-2009-04-05 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: optional_depends gst-plugins-base not gstreamer
-
-2009-04-04 George Sherwood <gsherwood AT sourcemage.org>
- * DEPENDS: Added optional_depends gstreamer
-
-2009-04-03 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to version 1.1.4
-
-2009-03-28 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated nightly build to r42075
-
-2009-03-16 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated stable to 1.1.3
-
-2009-03-15 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated stable to 1.1.2 and nightly build to r41707
- Updated SOURCE_URL and WEB_SITE
-
-2009-03-02 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Added webkit released version 1.1.1
- * PREPARE: Added to select release or nightly build
- * CONFIGURE: curl is no longer an option
- * DEPENDS: no longer choice between libsoup and curl. Only libsoup
- * UP_TRIGGERS: Added.
-
-2009-02-15 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r41017
-
-2009-01-22 Vlad Glagolev <stealth AT sourcemage.org>
- * CONFIGURE: curl/libsoup are _http_ backends
-
-2009-01-18 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r40000
-
-2009-01-13 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version r39872
-
-2009-01-11 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version r39790
- * PRE_BUILD: Removed bison patch
- * webkit-bison.patch: Removed. Official fix incorporated upstream
-
-2008-12-09 George Sherwood <gsherwood AT sourcemage.org>
- * CONFIGURE: Added option for libsoup http backend
- * DEPENDS: depends on either curl or libsoup depending on http backend
-
-2008-12-07 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version r39077
- * PRE_BUILD: Added upstream patch
- * webkit-bison.patch: Added patch to fix problems with bison 2.4
-
-2008-11-21 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version r38654
-
-2008-10-08 George Sherwood <gsherwood AT sourcemage.org>
- * DETAILS: updated spell to r37381
-
-2008-09-20 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r36635, for new JavaScript engine (SFX)
-
-2008-09-05 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r36108, for the latest (0.0.21) midori
-
-2008-08-30 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r36004, ~1k rev passed since the last
- non-midori update
-
-2008-08-26 Arjan Bouter <abouter AT sourcemage.org>
- * DETAILS: version bump to r35928
-
-2008-08-23 George sherwood <gsherwood AT sourcemage.org>
- * DETAILS: Updated to version r35895
-
-2008-08-03 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r35417 for midori 0.0.19
-
-2008-07-11 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r35075 (switched back to 8.8 mib tarball)
-
-2008-07-05 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r35005, fixed long desc
-
-2008-06-21 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: don't do useless doc'ing, let's keep good tradition to
update
- this spell on every ~1Kth revision :P
-
-2008-05-31 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r34271
-
-2008-05-15 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r33475
-
-2008-05-03 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version r32828
-
-2008-04-15 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r31872
- * BUILD, CONFIGURE, DEPENDS: added font backend selection
-
-2008-04-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * PRE_BUILD: moved autogen.sh here
- * BUILD: uses default_build
-
-2008-04-09 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r31738
-
-2008-03-30 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version r31436
- * CONFIGURE: Changed to --enable-svg-experimental to fix compile
- problem with SVG.
-
-2008-02-24 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r30549
-
-2008-02-24 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to version r30468
-
-2008-02-14 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r30218
-
-2008-02-07 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r30048
-
-2008-02-06 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r30028
-
-2008-01-30 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29866
-
-2008-01-24 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29801
- * CONFIGURE: made SVG support configurable
- * PRE_BUILD: => BUILD
-
-2008-01-24 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29753
-
-2008-01-22 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29711
-
-2008-01-14 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29438, added SVG support
-
-2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29226
-
-2008-01-06 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29208
-
-2008-01-05 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29180
-
-2008-01-04 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to r29152
-
-2008-01-02 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated to build 29079, cleaned up
- * DEPENDS, BUILD, PRE_BUILD: qmake => autotools
-
-2007-12-14 George Sherwood <george AT beernabeer.com>
- * DETAILS: Updated to build 28711
+ * DETAILS: Updated to version 1.3.5. Updated SOURCE_URL & SOURCE
+ Updated SOURCE_DIRECTORY
+ * PRE_BUILD: Removed. Not needed for released source.

-2007-12-08 George Sherwood <george AT beernabeer.com>
- * DETAILS, DEPENDS, BUILD, INSTALL: spell created
+2010-10-17 George Sherwood <gsherwood AT sourcemage.org>
+ * All: Created spell
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
new file mode 100755
index 0000000..d391e2c
--- /dev/null
+++ b/http/webkitgtk3/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/bison3.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/utf8.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk3/bison3.patch b/http/webkitgtk3/bison3.patch
new file mode 100644
index 0000000..f4f8397
--- /dev/null
+++ b/http/webkitgtk3/bison3.patch
@@ -0,0 +1,10 @@
+--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig 2015-04-24
16:15:42.241649559 +0300
++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y 2015-04-24
16:19:18.999685022 +0300
+@@ -47,6 +47,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
diff --git a/http/webkitgtk3/gtk-doc.patch b/http/webkitgtk3/gtk-doc.patch
new file mode 100644
index 0000000..c362565
--- /dev/null
+++ b/http/webkitgtk3/gtk-doc.patch
@@ -0,0 +1,11 @@
+--- GNUmakefile.in.orig 2012-03-27 20:31:16.000000000 +0400
++++ GNUmakefile.in 2012-04-15 10:40:36.226272195 +0400
+@@ -74045,7 +74045,7 @@
+ @ENABLE_WEBKIT2_TRUE@
$${installdir}/webkit2gtk-$(DOC_MODULE_VERSION).devhelp2; \
+ @ENABLE_WEBKIT2_TRUE@ fi; \
+ @ENABLE_WEBKIT2_TRUE@ fi
+- @$(AM_V_GEN)$(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc --rebase
--virtual-root=$${DESTDIR}
++@ENABLE_GTK_DOC_TRUE@ @$(AM_V_GEN)$(PYTHON)
$(srcdir)/Tools/gtk/generate-gtkdoc --rebase --virtual-root=$${DESTDIR}
+
+ uninstall-local:
+ @DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \
diff --git a/http/webkitgtk3/opengl-headers.patch
b/http/webkitgtk3/opengl-headers.patch
new file mode 100644
index 0000000..0ff8fee
--- /dev/null
+++ b/http/webkitgtk3/opengl-headers.patch
@@ -0,0 +1,29 @@
+--- 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)
diff --git a/http/webkitgtk3/utf8.patch b/http/webkitgtk3/utf8.patch
new file mode 100644
index 0000000..e245868
--- /dev/null
+++ b/http/webkitgtk3/utf8.patch
@@ -0,0 +1,10 @@
+--- Source/WebCore/platform/text/TextCodecUTF8.h.orig 2012-11-24
00:12:17.000000000 +0400
++++ Source/WebCore/platform/text/TextCodecUTF8.h 2015-04-24
19:35:22.748881405 +0300
+@@ -27,6 +27,7 @@
+ #define TextCodecUTF8_h
+
+ #include "TextCodec.h"
++#include "../../../JavaScriptCore/icu/unicode/utf8.h"
+
+ namespace WebCore {
+



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (fc92a183312f11742e48852f7a9befe85f7f4156), Vlad Glagolev, 04/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page