Title: [168617] trunk
- Revision
- 168617
- Author
- carlo...@webkit.org
- Date
- 2014-05-12 04:32:08 -0700 (Mon, 12 May 2014)
Log Message
Unreviewed. Bump version numbers.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (168616 => 168617)
--- trunk/ChangeLog 2014-05-12 09:20:13 UTC (rev 168616)
+++ trunk/ChangeLog 2014-05-12 11:32:08 UTC (rev 168617)
@@ -1,3 +1,9 @@
+2014-05-12 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Bump version numbers.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2014-05-10 Martin Robinson <mrobin...@igalia.com>
[GTK][CMake] Unable to do make install
Modified: trunk/Source/cmake/OptionsGTK.cmake (168616 => 168617)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-05-12 09:20:13 UTC (rev 168616)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-05-12 11:32:08 UTC (rev 168617)
@@ -5,16 +5,15 @@
include(GNUInstallDirs)
set(PROJECT_VERSION_MAJOR 2)
-set(PROJECT_VERSION_MINOR 3)
-set(PROJECT_VERSION_PATCH 3)
+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)
# 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(WEBKIT 22 0 22)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 32 0 7)
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 16 2 16)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 36 0 11)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(_javascript_CORE 17 0 17)
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.")
@@ -130,8 +129,8 @@
add_definitions(-DBUILDING_GTK__=1)
add_definitions(-DGETTEXT_PACKAGE="WebKitGTK-${WEBKITGTK_API_VERSION}")
add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=537)
-add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=30)
+add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=538)
+add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=35)
add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
