sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (dc20ef0c4d4e0aaae401828ef3e1cbff18556b1a)
- From: Pol Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (dc20ef0c4d4e0aaae401828ef3e1cbff18556b1a)
- Date: Thu, 5 Jun 2014 00:49:22 -0500
GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:
http/webkitgtk/BUILD | 3 +--
http/webkitgtk/DETAILS | 4 ++--
http/webkitgtk/HISTORY | 5 +++++
http/webkitgtk/gtk-doc.patch | 11 -----------
http/webkitgtk/opengl-headers.patch | 29 -----------------------------
http/webkitgtk3/BUILD | 5 ++---
http/webkitgtk3/DETAILS | 4 ++--
http/webkitgtk3/HISTORY | 5 +++++
http/webkitgtk3/gtk-doc.patch | 11 -----------
http/webkitgtk3/opengl-headers.patch | 29 -----------------------------
10 files changed, 17 insertions(+), 89 deletions(-)
New commits:
commit dc20ef0c4d4e0aaae401828ef3e1cbff18556b1a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
http/webkitgtk3: version 2.4.3
commit 6595e16401033154070133140294129ce8fea8cc
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>
http/webkitgtk: version 2.4.3
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 081340c..ca900eb 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,4 +1,3 @@
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
-
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index c279daf..a068c00 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk
- VERSION=2.4.2
+ VERSION=2.4.3
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:504eafb65228111b9bf12cadac40906ad8b2885cca60b7020fb04c23b6f0e158ca5ca79ee051cfe0994b176e41021400b8faf8367b00efd72fdef5e5cf5c70e1
+
SOURCE_HASH=sha512:fc4b36a3e11075325c79ced9f0d70a4b3daec43c5d3fff63ec843c513f04fd6cbe1b6472ea83e77f250f334f962a636a2423d8dbea4db0c767e823e2bd63f8d4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 5ba99cd..0265caa 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,8 @@
+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
diff --git a/http/webkitgtk/gtk-doc.patch b/http/webkitgtk/gtk-doc.patch
deleted file mode 100644
index c362565..0000000
--- a/http/webkitgtk/gtk-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0ff8fee..0000000
--- 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)
diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 081340c..b6f6c03 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,4 +1,3 @@
-OPTS="--enable-webkit1 --disable-webkit2 $WEBKIT_OPTS $OPTS" &&
-
+OPTS="--enable-webkit1 $WEBKIT_OPTS $OPTS" &&
+sed -i '30i#include <unicode/utf8.h>'
${SOURCE_DIRECTORY}/Source/WebCore/platform/text/TextCodecUTF8.h &&
default_build
-
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 4c300b4..ffd9578 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk3
- VERSION=2.4.2
+ VERSION=2.4.3
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:504eafb65228111b9bf12cadac40906ad8b2885cca60b7020fb04c23b6f0e158ca5ca79ee051cfe0994b176e41021400b8faf8367b00efd72fdef5e5cf5c70e1
+
SOURCE_HASH=sha512:fc4b36a3e11075325c79ced9f0d70a4b3daec43c5d3fff63ec843c513f04fd6cbe1b6472ea83e77f250f334f962a636a2423d8dbea4db0c767e823e2bd63f8d4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/webkitgtk-$VERSION
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 68624da..901e4a9 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,8 @@
+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
diff --git a/http/webkitgtk3/gtk-doc.patch b/http/webkitgtk3/gtk-doc.patch
deleted file mode 100644
index c362565..0000000
--- a/http/webkitgtk3/gtk-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0ff8fee..0000000
--- 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)
- [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (dc20ef0c4d4e0aaae401828ef3e1cbff18556b1a), Pol Vinogradov, 06/05/2014
Archive powered by MHonArc 2.6.24.