Title: [184504] releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk
Revision
184504
Author
[email protected]
Date
2015-05-18 11:24:28 -0700 (Mon, 18 May 2015)

Log Message

[W32][GTK] GI fails due to W32-incompatible arguments to the scanner
https://bugs.webkit.org/show_bug.cgi?id=143764

Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.

Use correct .la files as --library arguments for GI scanner

This way it plays well with W32 gobject-introspection library resolution
code.
Without that one would get things like:
ERROR: can't resolve libraries to shared libraries: webkitgtk-3.0, _javascript_coregtk-3.0

* GNUmakefile.am:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog (184503 => 184504)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog	2015-05-18 17:53:48 UTC (rev 184503)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog	2015-05-18 18:24:28 UTC (rev 184504)
@@ -1,3 +1,19 @@
+2015-04-15  Руслан Ижбулатов  <[email protected]>
+
+        [W32][GTK] GI fails due to W32-incompatible arguments to the scanner
+        https://bugs.webkit.org/show_bug.cgi?id=143764
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use correct .la files as --library arguments for GI scanner
+
+        This way it plays well with W32 gobject-introspection library resolution
+        code.
+        Without that one would get things like:
+        ERROR: can't resolve libraries to shared libraries: webkitgtk-3.0, _javascript_coregtk-3.0
+
+        * GNUmakefile.am:
+
 2015-02-16  Milan Crha  <[email protected]>
 
         [GTK] Memory leak from webkit_web_policy_decision_new()

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am (184503 => 184504)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am	2015-05-18 17:53:48 UTC (rev 184503)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/GNUmakefile.am	2015-05-18 18:24:28 UTC (rev 184504)
@@ -311,8 +311,8 @@
 	     --include=Gtk-@GTK_API_VERSION@ \
 	     --include=_javascript_Core-@WEBKITGTK_API_VERSION@ \
 	     --include=Soup-2.4 \
-	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
-	     --library=_javascript_coregtk-@WEBKITGTK_API_VERSION@ \
+	     --library=libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+	     --library=libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
 	     --libtool="$(LIBTOOL)" \
 	     --pkg=gobject-2.0 \
 	     --pkg=gtk+-@GTK_API_VERSION@ \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to