Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6d77f919cbc13e012779d65ac2d2eef681705fc0)

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 master grimoire by Vlad Glagolev (6d77f919cbc13e012779d65ac2d2eef681705fc0)
  • Date: Sun, 15 Apr 2012 02:27:34 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/webkitgtk/HISTORY | 7 ++++
http/webkitgtk/PRE_BUILD | 6 +++
http/webkitgtk/disable-geo.patch | 57
++++++++++++++++++++++++++++++++++++
http/webkitgtk/gtk-doc.patch | 11 ++++++
http/webkitgtk/opengl-headers.patch | 29 ++++++++++++++++++
5 files changed, 110 insertions(+)

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

webkitgtk: post-1.8.0-update fixes

diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 429077a..b1c6262 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,10 @@
+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

diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..1cc9db5
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/disable-geo.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
diff --git a/http/webkitgtk/disable-geo.patch
b/http/webkitgtk/disable-geo.patch
new file mode 100644
index 0000000..dbe474c
--- /dev/null
+++ b/http/webkitgtk/disable-geo.patch
@@ -0,0 +1,57 @@
+--- Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h.orig
++++ Source/WebKit/gtk/webkit/webkitgeolocationpolicydecisionprivate.h
+@@ -26,6 +26,4 @@
+ #include "webkitgeolocationpolicydecision.h"
+
+-#if ENABLE(GEOLOCATION)
+-
+ extern "C" {
+
+@@ -34,5 +32,3 @@
+ }
+
+-#endif // ENABLE(GEOLOCATION)
+-
+ #endif
+--- Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp.orig
++++ Source/WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp
+@@ -54,8 +54,8 @@
+ }
+
+-#if ENABLE(GEOLOCATION)
+ WebKitGeolocationPolicyDecision*
webkit_geolocation_policy_decision_new(WebKitWebFrame* frame,
WebCore::Geolocation* geolocation)
+ {
+- g_return_val_if_fail(frame, NULL);
++#if ENABLE(GEOLOCATION)
++ g_return_val_if_fail(frame, 0);
+ WebKitGeolocationPolicyDecision* decision =
WEBKIT_GEOLOCATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_GEOLOCATION_POLICY_DECISION,
NULL));
+ WebKitGeolocationPolicyDecisionPrivate* priv = decision->priv;
+@@ -64,6 +64,8 @@
+ priv->geolocation = geolocation;
+ return decision;
++#else
++ return 0;
++#endif
+ }
+-#endif
+
+ /**
+--- Source/WebKit/gtk/ChangeLog.orig
++++ Source/WebKit/gtk/ChangeLog
+@@ -1,2 +1,16 @@
++2012-03-31 Martin Robinson <mrobinson AT igalia.com>
++
++ [GTK] [Stable] --disable geolocation broken after recent merges
++ https://bugs.webkit.org/show_bug.cgi?id=82452
++
++ No review, as this is just a build fix.
++
++ Fix the geolocation build.
++
++ * webkit/webkitgeolocationpolicydecision.cpp:
++ (webkit_geolocation_policy_decision_new): When gelocation is off,
just return null.
++ * webkit/webkitgeolocationpolicydecisionprivate.h: Activate
webkit_geolocation_policy_decision_new
++ for non-Geolocation builds.
++
+ 2012-03-27 Martin Robinson <mrobinson AT igalia.com>
+
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)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6d77f919cbc13e012779d65ac2d2eef681705fc0), Vlad Glagolev, 04/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page