2010-09-11 Xan Lopez <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Make introspection work with g-o-i 0.9.5
        https://bugs.webkit.org/show_bug.cgi?id=45590

        Bump required gobject-introspection version to 0.9.5.

        * configure.ac:

WebKit/gtk:

2010-09-11  Xan Lopez  <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Make introspection work with g-o-i 0.9.5
        https://bugs.webkit.org/show_bug.cgi?id=45590

        Use new type syntax and bump version number of the gir file.

        * JSCore.gir.in:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67300 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d857620..2c93611 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-11  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Make introspection work with g-o-i 0.9.5
+        https://bugs.webkit.org/show_bug.cgi?id=45590
+
+        Bump required gobject-introspection version to 0.9.5.
+
+        * configure.ac:
+
 2010-09-09  Benjamin Poulain  <benjamin.poulain@nokia.com>
 
         Unreviewed buildfix.

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 1f14d42..5afb911 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-11  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Make introspection work with g-o-i 0.9.5
+        https://bugs.webkit.org/show_bug.cgi?id=45590
+
+        Use new type syntax and bump version number of the gir file.
+
+        * JSCore.gir.in:
+
 2010-09-10  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 
         Reviewed by Darin Adler.

diff --git a/WebKit/gtk/JSCore.gir.in b/WebKit/gtk/JSCore.gir.in
index e979c33..e143982 100644 (file)
--- a/WebKit/gtk/JSCore.gir.in
+++ b/WebKit/gtk/JSCore.gir.in
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
-<repository version="1.1"
+<repository version="1.2"
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0">
   <namespace name="JSCore" version="@WEBKITGTK_API_VERSION@" shared-library="webkitgtk-@WEBKITGTK_API_VERSION@">
-    <alias name="GlobalContextRef"
-           target="none"
-           c:type="JSGlobalContextRef"/>
-    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
+    <alias name="GlobalContextRef" target="none">
+      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
+    </alias>
+    <alias name="ObjectRef" target="none">
+      <type name="JSObjectRef" c:type="JSObjectRef"/>
+    </alias>
     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
       <return-value transfer-ownership="none">
         <type name="none" c:type="void"/>

diff --git a/configure.ac b/configure.ac
index 2e93cd3..1b30cea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -730,7 +730,7 @@ GIRDIR=
 GIRTYPELIBDIR=
 
 if test "$enable_introspection" = "yes"; then
-  GOBJECT_INTROSPECTION_REQUIRED=0.6.15
+  GOBJECT_INTROSPECTION_REQUIRED=0.9.5
   PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
   
   G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"