Changeset 171846 in webkit
- Timestamp:
- Jul 31, 2014 2:16:57 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r171793 r171846 1 2014-07-31 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Bump binary version for 2.6 4 https://bugs.webkit.org/show_bug.cgi?id=133724 5 6 Reviewed by Philippe Normand. 7 8 * Source/cmake/OptionsGTK.cmake: Bump binary version to 4.0 and 9 update library version numbers. 10 1 11 2014-07-30 Zan Dobersek <zdobersek@igalia.com> 2 12 -
trunk/Source/WebKit2/ChangeLog
r171829 r171846 1 2014-07-31 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Bump binary version for 2.6 4 https://bugs.webkit.org/show_bug.cgi?id=133724 5 6 Reviewed by Philippe Normand. 7 8 * PlatformGTK.cmake: Fix JavaScriptCore dependency on 9 instrospection commands and make them depend on GTK+-3.0. 10 1 11 2014-07-30 Enrica Casucci <enrica@apple.com> 2 12 -
trunk/Source/WebKit2/PlatformGTK.cmake
r171792 r171846 741 741 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 742 742 DEPENDS WebKit2 743 DEPENDS JavaScriptCore-3-gir743 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 744 744 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= 745 745 ${INTROSPECTION_SCANNER} … … 751 751 --nsversion=${WEBKITGTK_API_VERSION} 752 752 --include=GObject-2.0 753 --include=Gtk- ${WEBKITGTK_API_VERSION}753 --include=Gtk-3.0 754 754 --include=Soup-2.4 755 755 --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir … … 759 759 --no-libtool 760 760 --pkg=gobject-2.0 761 --pkg=gtk+- ${WEBKITGTK_API_VERSION}761 --pkg=gtk+-3.0 762 762 --pkg=libsoup-2.4 763 763 --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION} … … 778 778 add_custom_command( 779 779 OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir 780 DEPENDS JavaScriptCore-3-gir780 DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir 781 781 DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir 782 782 COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS= … … 789 789 --nsversion=${WEBKITGTK_API_VERSION} 790 790 --include=GObject-2.0 791 --include=Gtk- ${WEBKITGTK_API_VERSION}791 --include=Gtk-3.0 792 792 --include=Soup-2.4 793 793 --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir … … 797 797 --no-libtool 798 798 --pkg=gobject-2.0 799 --pkg=gtk+- ${WEBKITGTK_API_VERSION}799 --pkg=gtk+-3.0 800 800 --pkg=libsoup-2.4 801 801 --pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION} -
trunk/Source/cmake/OptionsGTK.cmake
r171741 r171846 5 5 set(PROJECT_VERSION_PATCH 0) 6 6 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) 7 set(WEBKITGTK_API_VERSION 3.0)7 set(WEBKITGTK_API_VERSION 4.0) 8 8 9 9 # Libtool library version, not to be confused with API version. 10 10 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html 11 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 3 6 0 11)12 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 1 7 0 17)11 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 37 0 0) 12 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 18 0 0) 13 13 14 14 set(ENABLE_CREDENTIAL_STORAGE ON CACHE BOOL "Whether or not to enable support for credential storage using libsecret.")
Note: See TracChangeset
for help on using the changeset viewer.