Title: [219864] trunk
Revision
219864
Author
carlo...@webkit.org
Date
2017-07-25 03:22:40 -0700 (Tue, 25 Jul 2017)

Log Message

Unreviewed. Fix GTK+ WebKit2 library soname after r219488.

The WebKit2 -> WebKit rename shouldn't affect the GTK+ library that is still called libwebkit2gtk, so keep using
WEBKIT2 as the library name in CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE, since that's also what the WebKit
makefile passes to WEBKIT_POPULATE_LIBRARY_VERSION.

* Source/cmake/OptionsGTK.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (219863 => 219864)


--- trunk/ChangeLog	2017-07-25 06:49:11 UTC (rev 219863)
+++ trunk/ChangeLog	2017-07-25 10:22:40 UTC (rev 219864)
@@ -1,3 +1,13 @@
+2017-07-25  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        Unreviewed. Fix GTK+ WebKit2 library soname after r219488.
+
+        The WebKit2 -> WebKit rename shouldn't affect the GTK+ library that is still called libwebkit2gtk, so keep using
+        WEBKIT2 as the library name in CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE, since that's also what the WebKit
+        makefile passes to WEBKIT_POPULATE_LIBRARY_VERSION.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2017-07-24  Zan Dobersek  <zdober...@igalia.com>
 
         [WPE] Add libepoxy to the Jhbuild moduleset

Modified: trunk/Source/cmake/OptionsGTK.cmake (219863 => 219864)


--- trunk/Source/cmake/OptionsGTK.cmake	2017-07-25 06:49:11 UTC (rev 219863)
+++ trunk/Source/cmake/OptionsGTK.cmake	2017-07-25 10:22:40 UTC (rev 219864)
@@ -14,7 +14,7 @@
     set(${library_name}_VERSION_MICRO ${revision})
     set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision})
 endmacro()
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 60 0 23)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 60 0 23)
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 24 4 6)
 
 # These are shared variables, but we special case their definition so that we can use the
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to