Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (01189af4558a0bd77492b35143f584cc111a4a49)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (01189af4558a0bd77492b35143f584cc111a4a49)
  • Date: Tue, 16 Apr 2013 15:15:46 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

http/webkitgtk/BUILD | 1 +
http/webkitgtk/CONFIGURE | 1 +
http/webkitgtk/DEPENDS | 6 ++----
http/webkitgtk/DETAILS | 10 +++++-----
http/webkitgtk/HISTORY | 9 ---------
http/webkitgtk/PRE_BUILD | 3 +--
http/webkitgtk/opengl-headers.patch | 29 +++++++++++++++++++++++++++++
http/webkitgtk3/BUILD | 1 +
http/webkitgtk3/DEPENDS | 6 ++----
http/webkitgtk3/DETAILS | 4 ++--
http/webkitgtk3/HISTORY | 8 --------
http/webkitgtk3/PRE_BUILD | 3 +--
http/webkitgtk3/opengl-headers.patch | 29 +++++++++++++++++++++++++++++
13 files changed, 74 insertions(+), 36 deletions(-)

New commits:
commit 01189af4558a0bd77492b35143f584cc111a4a49
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

Revert "http/webkitgtk3: version 2.0.0"

This reverts commit 455adc34ada86900550ad7ea835095fb3d534127.

Doesn't compile with gcc 4.6.

commit a9f62e2834200d413da6d89c64f0077e83336192
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

Revert "http/webkitgtk: version 2.0.0"

This reverts commit df674ba4dfde970a8e249635fcbae9c4c1958713.

Doesn't compile with gcc 4.6. Thanks to Vlad and Thomas for noticing.

diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 4e6911d..719a5d9 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,4 +1,5 @@
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 129adc3..d2cebdd 100755
--- a/http/webkitgtk/CONFIGURE
+++ b/http/webkitgtk/CONFIGURE
@@ -1,5 +1,6 @@
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 d62dcb7..e36a940 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 '--with-gtk=2.0 --disable-webkit2' &&
+depends gtk+2 &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -14,8 +14,6 @@ depends libsoup &&
depends enchant &&
depends libxt &&
depends RUBY &&
-depends libwebp &&
-depends libsecret &&

optional_depends cairo '--enable-svg' \
'--disable-svg' \
@@ -34,7 +32,7 @@ if [[ ! $WEBKIT_FONT_BE == freetype2 ]]; then
fi &&
depends freetype2 &&

-optional_depends gst-plugins-base-1.0 \
+optional_depends gst-plugins-base \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 8870763..0b1cf0b 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,20 +1,20 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://webkitgtk.org/
SECURITY_PATCH=8
- PATCHLEVEL=0
+ PATCHLEVEL=1
GATHER_DOCS=off
LICENSE[0]=GPL
ENTERED=20071208
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1363ea5..44ee84d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,12 +1,3 @@
-2013-04-10 Pol Vinogradov <vin.public AT 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 AT 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 5003c3c..cdd362a 100755
--- a/http/webkitgtk/PRE_BUILD
+++ b/http/webkitgtk/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
- Source/WebCore/platform/text/TextCodecUTF8.h
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
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/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 9207d63..d93409a 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,3 +1,4 @@
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 15b4b63..8062770 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 '--with-gtk=3.0' &&
+depends gtk+3 &&
depends icu &&
depends gperf &&
depends libpng &&
@@ -16,8 +16,6 @@ depends libxt &&
depends perl &&
depends PYTHON &&
depends RUBY &&
-depends libwebp &&
-depends libsecret &&

optional_depends gtk-doc '--enable-gtk-doc' \
'' \
@@ -37,7 +35,7 @@ else
depends pango "--with-font-backend=pango"
fi &&

-optional_depends gst-plugins-base-1.0 \
+optional_depends gst-plugins-base \
"--enable-video" \
"--disable-video" \
"for HTML5 streaming video support" &&
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 4f5be4d..27a7654 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk3
- VERSION=2.0.0
+ VERSION=1.10.2
SOURCE=webkitgtk-$VERSION.tar.xz
SOURCE_URL[0]=http://www.webkitgtk.org/releases/$SOURCE
-
SOURCE_HASH=sha512:bd1dbe51b49462c2e138d8d8779ff2b568de9beb6ae5da86da720e3fba668399118d9f47f3440fa7e9ab90beb28852c757b787651c8200de3cbcec5e6e1dbeb5
+
SOURCE_HASH=sha512:0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f
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 a0fca17..0e90558 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,11 +1,3 @@
-2013-04-10 Pol Vinogradov <vin.public AT 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 AT 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 5003c3c..cdd362a 100755
--- a/http/webkitgtk3/PRE_BUILD
+++ b/http/webkitgtk3/PRE_BUILD
@@ -2,5 +2,4 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
-sed -i '29i #include "../../../JavaScriptCore/icu/unicode/utf8.h"' \
- Source/WebCore/platform/text/TextCodecUTF8.h
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
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)



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (01189af4558a0bd77492b35143f584cc111a4a49), Pol Vinogradov, 04/16/2013

Archive powered by MHonArc 2.6.24.

Top of Page