File webkitgtk.patch of Package webkitgtk

Overview Repositories Revisions Requests Users Attributes Meta

File webkitgtk.patch of Package webkitgtk

--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
@@ -44,7 +44,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
 %}
 
 %expect 1 /* One shift reduce conflict because of if | else */
-%pure-parser
+%define api.pure
 %parse-param {TParseContext* context}
 %locations
 %lex-param {YYLEX_PARAM}
--- a/Source/WTF/wtf/gobject/GRefPtr.h
+++ b/Source/WTF/wtf/gobject/GRefPtr.h
@@ -25,11 +25,10 @@
 
 #if USE(GLIB)
 
+#include <glib-object.h>
 #include <wtf/RefPtr.h>
 #include <algorithm>
 
-extern "C" void g_object_unref(gpointer);
-extern "C" gpointer g_object_ref_sink(gpointer);
 
 namespace WTF {
 
--- a/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
@@ -390,7 +390,7 @@ static void webkitAccessibleHyperlinkIni
 
 GType webkitAccessibleHyperlinkGetType()
 {
-    static volatile gsize typeVolatile = 0;
+    static gsize typeVolatile = 0;
 
     if (g_once_init_enter(&typeVolatile)) {
         static const GTypeInfo tinfo = {
--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
@@ -1015,7 +1015,7 @@ static void webkitAccessibleClassInit(At
 GType
 webkitAccessibleGetType(void)
 {
-    static volatile gsize typeVolatile = 0;
+    static gsize typeVolatile = 0;
 
     if (g_once_init_enter(&typeVolatile)) {
         static const GTypeInfo tinfo = {
--- a/Source/WebCore/css/CSSGrammar.y.in
+++ b/Source/WebCore/css/CSSGrammar.y.in
@@ -21,7 +21,7 @@
  *
  */
 
-%pure_parser
+%define api.pure
 
 %parse-param { CSSParser* parser }
 %lex-param { CSSParser* parser }
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -3912,12 +3912,12 @@ static bool isValidNameNonASCII(const UC
     unsigned i = 0;
 
     UChar32 c;
-    U16_NEXT(characters, i, length, c)
+    U16_NEXT(characters, i, length, c);
     if (!isValidNameStart(c))
         return false;
 
     while (i < length) {
-        U16_NEXT(characters, i, length, c)
+        U16_NEXT(characters, i, length, c);
         if (!isValidNamePart(c))
             return false;
     }
@@ -3980,7 +3980,7 @@ bool Document::parseQualifiedName(const
     const UChar* s = qualifiedName.deprecatedCharacters();
     for (unsigned i = 0; i < length;) {
         UChar32 c;
-        U16_NEXT(s, i, length, c)
+        U16_NEXT(s, i, length, c);
         if (c == ':') {
             if (sawColon) {
                 ec = NAMESPACE_ERR;
--- a/Source/WebCore/platform/graphics/SegmentedFontData.cpp
+++ b/Source/WebCore/platform/graphics/SegmentedFontData.cpp
@@ -27,6 +27,7 @@
 #include "SegmentedFontData.h"
 
 #include "SimpleFontData.h"
+#include <unicode/utf.h>
 #include <wtf/Assertions.h>
 #include <wtf/text/WTFString.h>
 
@@ -61,7 +62,7 @@ bool SegmentedFontData::containsCharacte
 {
     UChar32 c;
     for (int i = 0; i < length; ) {
-        U16_NEXT(characters, i, length, c)
+        U16_NEXT(characters, i, length, c);
         if (!containsCharacter(c))
             return false;
     }
--- a/Source/WebCore/platform/text/TextBoundaries.cpp
+++ b/Source/WebCore/platform/text/TextBoundaries.cpp
@@ -28,6 +28,7 @@
 #include "TextBoundaries.h"
 
 #include "TextBreakIterator.h"
+#include <unicode/utf.h>
 #include <wtf/text/StringImpl.h>
 #include <wtf/unicode/Unicode.h>
 
--- a/Source/WebCore/platform/text/TextCodecLatin1.cpp
+++ b/Source/WebCore/platform/text/TextCodecLatin1.cpp
@@ -27,6 +27,7 @@
 #include "TextCodecLatin1.h"
 
 #include "TextCodecASCIIFastPath.h"
+#include <unicode/utf.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuffer.h>
--- a/Source/WebCore/platform/text/TextCodecUTF8.cpp
+++ b/Source/WebCore/platform/text/TextCodecUTF8.cpp
@@ -27,6 +27,7 @@
 #include "TextCodecUTF8.h"
 
 #include "TextCodecASCIIFastPath.h"
+#include <unicode/utf.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuffer.h>
 #include <wtf/unicode/CharacterNames.h>
--- a/Source/WebCore/platform/text/TextCodecUserDefined.cpp
+++ b/Source/WebCore/platform/text/TextCodecUserDefined.cpp
@@ -27,6 +27,7 @@
 #include "TextCodecUserDefined.h"
 
 #include <stdio.h>
+#include <unicode/utf.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuffer.h>
--- a/Source/WebCore/svg/SVGFontData.cpp
+++ b/Source/WebCore/svg/SVGFontData.cpp
@@ -33,6 +33,7 @@
 #include "TextRun.h"
 #include "WidthIterator.h"
 #include "XMLNames.h"
+#include <unicode/utf.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/unicode/CharacterNames.h>
 #include <wtf/unicode/Unicode.h>
--- a/Source/WebCore/xml/XPathGrammar.y
+++ b/Source/WebCore/xml/XPathGrammar.y
@@ -47,7 +47,7 @@ using namespace XPath;
 
 %}
 
-%pure_parser
+%define api.pure
 %lex-param { parser }
 %parse-param { Parser& parser }
 
--- a/Source/WebKit/gtk/GNUmakefile.am
+++ b/Source/WebKit/gtk/GNUmakefile.am
@@ -352,8 +352,9 @@ $(GENSOURCES_WEBKIT)/webkitmarshal.h: st
 	@true
 
 stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	$(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	$(AM_V_GEN) echo                  > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
+	sed -i~ '1,10s/#ifdef/extern "C" {\n#ifdef/gm' $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
 	echo timestamp > $(@F)
 
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.h
@@ -98,7 +98,7 @@ static void type_name##_init(TypeName* s
 }\
 GType type_name##_get_type(void) \
 { \
-    static volatile gsize g_define_type_id__volatile = 0; \
+    static gsize g_define_type_id__volatile = 0; \
     if (g_once_init_enter(&g_define_type_id__volatile)) { \
         GType g_define_type_id = \
             g_type_register_static_simple( \
--- a/Source/autotools/FindDependencies.m4
+++ b/Source/autotools/FindDependencies.m4
@@ -592,8 +592,8 @@ if test "$enable_ftl_jit" != "no"; then
     fi
 fi
 
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.10])
+m4_ifdef([YGTK_DOC_CHECK], [
+YGTK_DOC_CHECK([1.10])
 ],[
 AM_CONDITIONAL([ENABLE_GTK_DOC], false)
 ])
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -513,8 +513,8 @@ dnl -*- mode: autoconf -*-
 # serial 2
 
 dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
+dnl   XGTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([XGTK_DOC_CHECK],
 [
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first

Places

File webkitgtk.patch of Package webkitgtk

Places