Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan (95f0b66b9e38fef2c072e9bc802057552f520ca2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan (95f0b66b9e38fef2c072e9bc802057552f520ca2)
  • Date: Thu, 10 May 2012 14:14:59 -0500

GIT changes to master grimoire by Arjan <arjan@ifrit.(none)>:

http/midori/DEPENDS | 10 ++++++++--
http/midori/HISTORY | 3 +++
http/webkitgtk3/HISTORY | 4 ++++
http/webkitgtk3/PRE_BUILD | 5 +++++
http/webkitgtk3/gtk-doc.patch | 11 +++++++++++
http/webkitgtk3/opengl-headers.patch | 29 +++++++++++++++++++++++++++++
6 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit 95f0b66b9e38fef2c072e9bc802057552f520ca2
Author: Arjan <arjan@ifrit.(none)>
Commit: Arjan <arjan@ifrit.(none)>

midori: allow midori to use gtk+3 and webkit3

commit 995c934fb892d87ffcfd45c2d829cbe835650e88
Author: Arjan <arjan@ifrit.(none)>
Commit: Arjan <arjan@ifrit.(none)>

webkitgtk3: needs the same patches as webkitgtk to build as it's the
same source...

diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index 5ee2156..517d293 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -1,5 +1,11 @@
-depends gtk+2 &&
-depends webkitgtk &&
+optional_depends gtk+3 '--enable-gtk3' '--disable-gtk3' \
+ 'use GTK3 instead of GTK2?' &&
+if is_depends_enabled $SPELL gtk+3 ; then
+ depends webkitgtk3
+else
+ depends gtk+2 &&
+ depends webkitgtk
+fi &&
depends libxml2 &&
depends python &&
depends libnotify &&
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 93336d5..5c1ea19 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2012-05-10 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: allow gtk+3/webkitgtk3 build
+
2012-04-14 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.4.5

diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 86f58bd..fb486a7 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,7 @@
+2012-05-10 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD, opengl-headers.patch, gtk-doc.patch: apply
+ webkitgtk patches to webkitgtk3
+
2012-04-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.1, SECURITY_PATCH=1

diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
new file mode 100755
index 0000000..cdd362a
--- /dev/null
+++ b/http/webkitgtk3/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/gtk-doc.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/opengl-headers.patch"
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)



  • [SM-Commit] GIT changes to master grimoire by Arjan (95f0b66b9e38fef2c072e9bc802057552f520ca2), Arjan, 05/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page