⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 275044 in webkit


Ignore:
Timestamp:
Mar 25, 2021, 10:06:40 AM (5 years ago)
Author:
Carlos Garcia Campos
Message:

Merge r274641 - [WPE] Bump API version when building with libsoup3
​https://bugs.webkit.org/show_bug.cgi?id=223437

Reviewed by Adrian Perez de Castro.

.:

Use 1.1 as the API version when building with soup3.

  • Source/PlatformWPE.cmake:
  • Source/cmake/OptionsWPE.cmake:

Source/WebKit:

  • PlatformWPE.cmake: Use WPE_API_DOC_VERSION instead of WPE_API_VERSION for gtkdoc config files.
  • wpe/wpe-web-extension-uninstalled.pc.in: Add variable for libsoup version.
  • wpe/wpe-web-extension.pc.in: Ditto.
  • wpe/wpe-webkit-uninstalled.pc.in: Ditto.
  • wpe/wpe-webkit.pc.in: Ditto.

Tools:

Use WPE_API_DOC_VERSION instead of WPE_API_VERSION.

  • wpe/manifest.txt.in:
Location:
releases/WebKitGTK/webkit-2.32
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.32/ChangeLog

    r275024 r275044  
     12021-03-18  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [WPE] Bump API version when building with libsoup3
     4        https://bugs.webkit.org/show_bug.cgi?id=223437
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        Use 1.1 as the API version when building with soup3.
     9
     10        * Source/PlatformWPE.cmake:
     11        * Source/cmake/OptionsWPE.cmake:
     12
    1132021-03-16  Khem Raj  <raj.khem@gmail.com>
    214

  • releases/WebKitGTK/webkit-2.32/Source/PlatformWPE.cmake

    r238853 r275044  
    66    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-docs.sgml"
    77    "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-docs.sgml"
    8     "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_VERSION}-sections.txt"
    9     "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_VERSION}-sections.txt"
     8    "${CMAKE_SOURCE_DIR}/Source/WebKit/UIProcess/API/wpe/docs/wpe-${WPE_API_DOC_VERSION}-sections.txt"
     9    "${CMAKE_SOURCE_DIR}/Source/WebKit/WebProcess/InjectedBundle/API/wpe/docs/wpe-webextensions-${WPE_API_DOC_VERSION}-sections.txt"
    1010)
    1111

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog

    r275042 r275044  
     12021-03-18  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [WPE] Bump API version when building with libsoup3
     4        https://bugs.webkit.org/show_bug.cgi?id=223437
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        * PlatformWPE.cmake: Use WPE_API_DOC_VERSION instead of WPE_API_VERSION for gtkdoc config files.
     9        * wpe/wpe-web-extension-uninstalled.pc.in: Add variable for libsoup version.
     10        * wpe/wpe-web-extension.pc.in: Ditto.
     11        * wpe/wpe-webkit-uninstalled.pc.in: Ditto.
     12        * wpe/wpe-webkit.pc.in: Ditto.
     13
    1142021-03-16  Carlos Garcia Campos  <cgarcia@igalia.com>
    215

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/PlatformWPE.cmake

    r272643 r275044  
    388388
    389389file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-wpe.cfg
    390     "[wpe-${WPE_API_VERSION}]\n"
     390    "[wpe-${WPE_API_DOC_VERSION}]\n"
    391391    "pkgconfig_file=${WPE_PKGCONFIG_FILE}\n"
    392392    "decorator=WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\\(.+\\)\n"
    … …  
    408408
    409409file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webextensions.cfg
    410     "[wpe-webextensions-${WPE_API_VERSION}]\n"
     410    "[wpe-webextensions-${WPE_API_DOC_VERSION}]\n"
    411411    "pkgconfig_file=${WPEWebExtension_PKGCONFIG_FILE}\n"
    412412    "decorator=WEBKIT_API|WEBKIT_DEPRECATED|WEBKIT_DEPRECATED_FOR\\(.+\\)\n"

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension-uninstalled.pc.in

    r272643 r275044  
    88URL: https://wpewebkit.org
    99Version: @PROJECT_VERSION@
    10 Requires: glib-2.0 libsoup-2.4 wpe-1.0
     10Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
    1111Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
    1212Cflags: -I${includedir}/wpe-extension

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-web-extension.pc.in

    r243060 r275044  
    88URL: https://wpewebkit.org
    99Version: @PROJECT_VERSION@
    10 Requires: glib-2.0 libsoup-2.4 wpe-1.0
     10Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
    1111Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
    1212Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit-uninstalled.pc.in

    r272643 r275044  
    88URL: https://wpewebkit.org
    99Version: @PROJECT_VERSION@
    10 Requires: glib-2.0 libsoup-2.4 wpe-1.0
     10Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
    1111Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
    1212Cflags: -I${includedir}/ForwardingHeaders/wpe -I${includedir}/WebKit/ -I${includedir}/ForwardingHeaders/wpe-jsc -I${includedir}/JavaScriptCore/javascriptcorewpe/

  • releases/WebKitGTK/webkit-2.32/Source/WebKit/wpe/wpe-webkit.pc.in

    r243060 r275044  
    88URL: https://wpewebkit.org
    99Version: @PROJECT_VERSION@
    10 Requires: glib-2.0 libsoup-2.4 wpe-1.0
     10Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ wpe-1.0
    1111Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
    1212Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@

  • releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsWPE.cmake

    r274371 r275044  
    33
    44SET_PROJECT_VERSION(2 31 91)
    5 set(WPE_API_VERSION 1.0)
    6 
    7 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 18 0 14)
    8 
    9 # These are shared variables, but we special case their definition so that we can use the
    10 # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
    11 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
    12 set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
    13 set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
    145
    156set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
    16 if (USER_AGENT_BRANDING)
    17     add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
    18 endif ()
    197
    208find_package(Cairo 1.14.0 REQUIRED)
    … …  
    130118if (USE_SOUP2)
    131119    set(SOUP_MINIMUM_VERSION 2.54.0)
     120    set(SOUP_API_VERSION 2.4)
     121    set(WPE_API_VERSION 1.0)
     122    set(WPE_API_DOC_VERSION 1.0)
    132123else ()
    133124    set(SOUP_MINIMUM_VERSION 2.99.2)
     125    set(SOUP_API_VERSION 3.0)
     126    set(WPE_API_VERSION 1.1)
     127    # No API changes in 1.1, so keep using the same API documentation.
     128    set(WPE_API_DOC_VERSION 1.0)
    134129endif ()
    135130find_package(LibSoup ${SOUP_MINIMUM_VERSION} REQUIRED)
     131
     132if (WPE_API_VERSION VERSION_EQUAL "1.0")
     133    CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 18 0 14)
     134else ()
     135    CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 0 0 0)
     136endif ()
     137
     138# These are shared variables, but we special case their definition so that we can use the
     139# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
     140set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
     141set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
     142set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
    136143
    137144if (ENABLE_ACCESSIBILITY)
    … …  
    216223add_definitions(-DGETTEXT_PACKAGE="WPE")
    217224add_definitions(-DJSC_GLIB_API_ENABLED)
     225
     226if (USER_AGENT_BRANDING)
     227    add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
     228endif ()
    218229
    219230if (EXISTS "${TOOLS_DIR}/glib/svn-revision")

  • releases/WebKitGTK/webkit-2.32/Tools/ChangeLog

    r275039 r275044  
     12021-03-18  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [WPE] Bump API version when building with libsoup3
     4        https://bugs.webkit.org/show_bug.cgi?id=223437
     5
     6        Reviewed by Adrian Perez de Castro.
     7
     8        Use WPE_API_DOC_VERSION instead of WPE_API_VERSION.
     9
     10        * wpe/manifest.txt.in:
     11
    1122021-03-25  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • releases/WebKitGTK/webkit-2.32/Tools/wpe/manifest.txt.in

    r246925 r275044  
    9595file Tools/PlatformWPE.cmake
    9696
    97 directory ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_VERSION}/html/wpe-${WPE_API_VERSION} Documentation/wpe-${WPE_API_VERSION}/html
    98 directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_VERSION}/html/wpe-webextensions-${WPE_API_VERSION} Documentation/wpe-webextensions-${WPE_API_VERSION}/html
     97directory ${CMAKE_BINARY_DIR}/Documentation/wpe-${WPE_API_DOC_VERSION}/html/wpe-${WPE_API_DOC_VERSION} Documentation/wpe-${WPE_API_DOC_VERSION}/html
     98directory ${CMAKE_BINARY_DIR}/Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html/wpe-webextensions-${WPE_API_DOC_VERSION} Documentation/wpe-webextensions-${WPE_API_DOC_VERSION}/html
Note: See TracChangeset for help on using the changeset viewer.