Title: [171846] trunk
- Revision
- 171846
- Author
- [email protected]
- Date
- 2014-07-31 02:16:57 -0700 (Thu, 31 Jul 2014)
Log Message
[GTK] Bump binary version for 2.6
https://bugs.webkit.org/show_bug.cgi?id=133724
Reviewed by Philippe Normand.
.:
* Source/cmake/OptionsGTK.cmake: Bump binary version to 4.0 and
update library version numbers.
Source/WebKit2:
* PlatformGTK.cmake: Fix _javascript_Core dependency on
instrospection commands and make them depend on GTK+-3.0.
Modified Paths
Diff
Modified: trunk/ChangeLog (171845 => 171846)
--- trunk/ChangeLog 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/ChangeLog 2014-07-31 09:16:57 UTC (rev 171846)
@@ -1,3 +1,13 @@
+2014-07-31 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Bump binary version for 2.6
+ https://bugs.webkit.org/show_bug.cgi?id=133724
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/OptionsGTK.cmake: Bump binary version to 4.0 and
+ update library version numbers.
+
2014-07-30 Zan Dobersek <[email protected]>
[CMake] Bump the minimum required version
Modified: trunk/Source/WebKit2/ChangeLog (171845 => 171846)
--- trunk/Source/WebKit2/ChangeLog 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-31 09:16:57 UTC (rev 171846)
@@ -1,3 +1,13 @@
+2014-07-31 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Bump binary version for 2.6
+ https://bugs.webkit.org/show_bug.cgi?id=133724
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake: Fix _javascript_Core dependency on
+ instrospection commands and make them depend on GTK+-3.0.
+
2014-07-30 Enrica Casucci <[email protected]>
REGRESSION (WK2 iOS): Inline editing for Chinese and Japanese keyboards does not work in Safari.
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (171845 => 171846)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-07-31 09:16:57 UTC (rev 171846)
@@ -740,7 +740,7 @@
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
DEPENDS WebKit2
- DEPENDS _javascript_Core-3-gir
+ DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
${INTROSPECTION_SCANNER}
--quiet
@@ -750,7 +750,7 @@
--namespace=WebKit2
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
- --include=Gtk-${WEBKITGTK_API_VERSION}
+ --include=Gtk-3.0
--include=Soup-2.4
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
@@ -758,7 +758,7 @@
-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--no-libtool
--pkg=gobject-2.0
- --pkg=gtk+-${WEBKITGTK_API_VERSION}
+ --pkg=gtk+-3.0
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -777,7 +777,7 @@
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
- DEPENDS _javascript_Core-3-gir
+ DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
${INTROSPECTION_SCANNER}
@@ -788,7 +788,7 @@
--namespace=WebKit2WebExtension
--nsversion=${WEBKITGTK_API_VERSION}
--include=GObject-2.0
- --include=Gtk-${WEBKITGTK_API_VERSION}
+ --include=Gtk-3.0
--include=Soup-2.4
--include-uninstalled=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
--library=webkit2gtk-${WEBKITGTK_API_VERSION}
@@ -796,7 +796,7 @@
-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--no-libtool
--pkg=gobject-2.0
- --pkg=gtk+-${WEBKITGTK_API_VERSION}
+ --pkg=gtk+-3.0
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
Modified: trunk/Source/cmake/OptionsGTK.cmake (171845 => 171846)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-07-31 08:41:33 UTC (rev 171845)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-07-31 09:16:57 UTC (rev 171846)
@@ -4,12 +4,12 @@
set(PROJECT_VERSION_MINOR 5)
set(PROJECT_VERSION_PATCH 0)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-set(WEBKITGTK_API_VERSION 3.0)
+set(WEBKITGTK_API_VERSION 4.0)
# Libtool library version, not to be confused with API version.
# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 36 0 11)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 17 0 17)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 37 0 0)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 18 0 0)
set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
