Skip to content

Commit

Permalink
[GTK] Switch to use GTK4 by default
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=264658

Reviewed by Michael Catanzaro.

Change USE_GTK4 default value to ON.

* Source/cmake/OptionsGTK.cmake:
* Tools/Scripts/make-dist:
(Distcheck.check_symbols):
(ensure_version_if_possible):
* Tools/gtk/manifest.txt.in:

Canonical link: https://commits.webkit.org/270765@main
  • Loading branch information
carlosgcampos committed Nov 15, 2023
1 parent 51b16e1 commit 80028d2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Source/cmake/OptionsGTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Qua
WEBKIT_OPTION_DEFINE(ENABLE_WAYLAND_TARGET "Whether to enable support for the Wayland windowing target." PUBLIC ON)
WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ON)
WEBKIT_OPTION_DEFINE(USE_GBM "Whether to enable usage of GBM." PUBLIC ON)
WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC OFF)
WEBKIT_OPTION_DEFINE(USE_GTK4 "Whether to enable usage of GTK4 instead of GTK3." PUBLIC ON)
WEBKIT_OPTION_DEFINE(USE_LCMS "Whether to enable support for image color management using libcms2." PUBLIC ON)
WEBKIT_OPTION_DEFINE(USE_LIBBACKTRACE "Whether to enable usage of libbacktrace." PUBLIC ON)
WEBKIT_OPTION_DEFINE(USE_LIBDRM "Whether to enable usage of libdrm." PUBLIC ON)
Expand Down
6 changes: 3 additions & 3 deletions Tools/Scripts/make-dist
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ class Distcheck(object):

def check_symbols(self, build_dir):
check_bss = os.path.join(self.source_root, 'Tools', 'Scripts', 'check-for-global-bss-symbols-in-webkitgtk-libs')
libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-4.1.so')
libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.1.so')
libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-6.0.so')
libwk = os.path.join(build_dir, 'lib', 'libwebkitgtk-6.0.so')
subprocess.check_call([check_bss, libjsc, libwk])

check_version_script = os.path.join(self.source_root, 'Tools', 'Scripts', 'check-for-invalid-symbols-in-version-script')
Expand Down Expand Up @@ -295,7 +295,7 @@ if __name__ == "__main__":
if arguments.version is not None:
return

pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.1.pc")
pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkitgtk-6.0.pc")
if os.path.isfile(pkgconfig_file):
p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE, text="ascii")
version = p.communicate()[0]
Expand Down
2 changes: 1 addition & 1 deletion Tools/gtk/manifest.txt.in
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ file Tools/PlatformGTK.cmake

directory ${CMAKE_BINARY_DIR}/Documentation/javascriptcoregtk-${WEBKITGTK_API_VERSION} Documentation/jsc-glib-${WEBKITGTK_API_VERSION}
directory ${CMAKE_BINARY_DIR}/Documentation/webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION} Documentation/webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION}
directory ${CMAKE_BINARY_DIR}/Documentation/webkit${WEBKITGTK_API_INFIX}gtk-web-extension-${WEBKITGTK_API_VERSION} Documentation/webkit${WEBKITGTK_API_INFIX}gtk-web-extension-${WEBKITGTK_API_VERSION}
directory ${CMAKE_BINARY_DIR}/Documentation/webkit${WEBKITGTK_API_INFIX}gtk-web-process-extension-${WEBKITGTK_API_VERSION} Documentation/webkit${WEBKITGTK_API_INFIX}gtk-web-process-extension-${WEBKITGTK_API_VERSION}

0 comments on commit 80028d2

Please sign in to comment.