Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (455adc34ada86900550ad7ea835095fb3d534127)

Chronological Thread  
    < 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 (455adc34ada86900550ad7ea835095fb3d534127)
  • Date: Wed, 10 Apr 2013 20:18:51 -0500
GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

dev/null |binary
gnome2-libs/libsoup/DETAILS | 4 +--
gnome2-libs/libsoup/HISTORY | 3 ++
gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig |binary
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
--------------------------
17 files changed, 41 insertions(+), 76 deletions(-)

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

http/webkitgtk3: version 2.0.0

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

http/webkitgtk: version 2.0.0

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

gnome2-libs/libsoup: version 2.42.0

diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index ae86753..0223b49 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,9 +1,9 @@
SPELL=libsoup
if [[ $LIBSOUP_DEVEL == y ]]; then
- VERSION=2.40.1
+ VERSION=2.42.0
SOURCE=$SPELL-$VERSION.tar.xz
else
- VERSION=2.40.1
+ VERSION=2.42.0
SOURCE=$SPELL-$VERSION.tar.xz
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index c0008c3..a1a1875 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2013-04-09 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 2.42.0
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on icu, libffi and pcre, added
optional dependency on gobject-introspection
diff --git a/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig
b/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig
deleted file mode 100644
index d0ea26b..0000000
Binary files a/gnome2-libs/libsoup/libsoup-2.40.1.tar.xz.sig and /dev/null
differ
diff --git a/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
b/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
new file mode 100644
index 0000000..8de5f5e
Binary files /dev/null and b/gnome2-libs/libsoup/libsoup-2.42.0.tar.xz.sig
differ
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index 719a5d9..4e6911d 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 d2cebdd..129adc3 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 e36a940..d62dcb7 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 0b1cf0b..8870763 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 44ee84d..1363ea5 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,12 @@
+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 cdd362a..5003c3c 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 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 d93409a..9207d63 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 8062770..15b4b63 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 27a7654..4f5be4d 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 0e90558..a0fca17 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,11 @@
+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 cdd362a..5003c3c 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 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)


Archive powered by MHonArc 2.6.24.

Top of Page