Skip to content

Commit 289592c

Browse files
mcatanzarowebkit-commit-queue
mcatanzaro
authored and
webkit-commit-queue
committed
REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
https://bugs.webkit.org/show_bug.cgi?id=229152 Patch by Michael Catanzaro <mcatanzaro@gnome.org> on 2021-08-18 Reviewed by Philippe Normand. Source/JavaScriptCore: * PlatformGTK.cmake: * javascriptcoregtk.pc.in: Source/WebKit: CMake is expanding templates in the pkg-config files that are not supposed to be expanded. Oops! Let's switch back to using @SVN_REVISION@ instead of ${SVN_REVISION} as the template for inserting the SVN revision into the pkg-config file, so we can tell CMake to leave the ${} variables alone. * PlatformGTK.cmake: * PlatformWPE.cmake: * Shared/glib/BuildRevision.h.in: * gtk/webkit2gtk-web-extension.pc.in: * gtk/webkit2gtk.pc.in: Tools: * glib/apply-build-revision-to-files.py: (main): Canonical link: https://commits.webkit.org/240636@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent aaffdf7 commit 289592c

11 files changed

Lines changed: 51 additions & 20 deletions

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2021-08-18 Michael Catanzaro <mcatanzaro@gnome.org>
2+
3+
REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
4+
https://bugs.webkit.org/show_bug.cgi?id=229152
5+
6+
Reviewed by Philippe Normand.
7+
8+
* PlatformGTK.cmake:
9+
* javascriptcoregtk.pc.in:
10+
111
2021-08-17 Saam Barati <sbarati@apple.com>
212

313
Add an option for canonicalizePrePostIncrements

‎Source/JavaScriptCore/PlatformGTK.cmake‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@ include(inspector/remote/GLib.cmake)
33

44
set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
55

6+
configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
7+
68
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
7-
configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE} @ONLY)
89
add_custom_target(JavaScriptCore-build-revision
910
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${JavaScriptCore_PKGCONFIG_FILE}
1011
DEPENDS ${JavaScriptCore_PKGCONFIG_FILE}
1112
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
1213
list(APPEND JavaScriptCore_DEPENDENCIES
1314
JavaScriptCore-build-revision
1415
)
15-
else ()
16-
configure_file(javascriptcoregtk.pc.in ${JavaScriptCore_PKGCONFIG_FILE})
1716
endif ()
1817

1918
install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc"

‎Source/JavaScriptCore/javascriptcoregtk.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=${prefix}
33
libdir=@LIB_INSTALL_DIR@
44
includedir=${prefix}/include
5-
revision=${BUILD_REVISION}
5+
revision=@BUILD_REVISION@
66

77
Name: JavaScriptCoreGTK+
88
Description: GTK+ version of the JavaScriptCore engine

‎Source/WebKit/ChangeLog‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2021-08-18 Michael Catanzaro <mcatanzaro@gnome.org>
2+
3+
REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
4+
https://bugs.webkit.org/show_bug.cgi?id=229152
5+
6+
Reviewed by Philippe Normand.
7+
8+
CMake is expanding templates in the pkg-config files that are not supposed to be expanded.
9+
Oops! Let's switch back to using @SVN_REVISION@ instead of ${SVN_REVISION} as the template
10+
for inserting the SVN revision into the pkg-config file, so we can tell CMake to leave the
11+
${} variables alone.
12+
13+
* PlatformGTK.cmake:
14+
* PlatformWPE.cmake:
15+
* Shared/glib/BuildRevision.h.in:
16+
* gtk/webkit2gtk-web-extension.pc.in:
17+
* gtk/webkit2gtk.pc.in:
18+
119
2021-08-18 Wenson Hsieh <wenson_hsieh@apple.com>
220

321
REGRESSION (iOS 15): DoubleDown Casino app won't load past launch page

‎Source/WebKit/PlatformGTK.cmake‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,19 @@ file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR})
1010
file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
1111
file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
1212

13+
configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
1314
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h)
15+
configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
16+
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
1417

1518
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
16-
configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
17-
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
18-
configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
1919
add_custom_target(WebKit-build-revision
2020
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
2121
DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
2222
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
2323
list(APPEND WebKit_DEPENDENCIES
2424
WebKit-build-revision
2525
)
26-
else ()
27-
configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE})
28-
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE})
29-
configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
3026
endif ()
3127

3228
add_definitions(-DBUILDING_WEBKIT)

‎Source/WebKit/PlatformWPE.cmake‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,21 @@ file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_EXTENSION_DIR})
1212
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
1313
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_JSC_DIR})
1414

15+
configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
1516
configure_file(UIProcess/API/wpe/WebKitVersion.h.in ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h)
1617
configure_file(wpe/wpe-webkit.pc.in ${WPE_PKGCONFIG_FILE} @ONLY)
1718
configure_file(wpe/wpe-web-extension.pc.in ${WPEWebExtension_PKGCONFIG_FILE} @ONLY)
1819
configure_file(wpe/wpe-webkit-uninstalled.pc.in ${CMAKE_BINARY_DIR}/wpe-webkit-${WPE_API_VERSION}-uninstalled.pc @ONLY)
1920
configure_file(wpe/wpe-web-extension-uninstalled.pc.in ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}-uninstalled.pc @ONLY)
2021

2122
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
22-
configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h @ONLY)
2323
add_custom_target(WebKit-build-revision
2424
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
2525
DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
2626
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)
2727
list(APPEND WebKit_DEPENDENCIES
2828
WebKit-build-revision
2929
)
30-
else ()
31-
configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
3230
endif ()
3331

3432
add_definitions(-DWEBKIT2_COMPILATION)

‎Source/WebKit/Shared/glib/BuildRevision.h.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@
2525

2626
#pragma once
2727

28-
#define BUILD_REVISION "${BUILD_REVISION}"
28+
#define BUILD_REVISION "@BUILD_REVISION@"

‎Source/WebKit/gtk/webkit2gtk-web-extension.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=${prefix}
33
libdir=@LIB_INSTALL_DIR@
44
includedir=${prefix}/include
5-
revision=${BUILD_REVISION}
5+
revision=@BUILD_REVISION@
66

77
Name: WebKitGTK web process extensions
88
Description: Web content engine for GTK - web process extensions

‎Source/WebKit/gtk/webkit2gtk.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
22
exec_prefix=${prefix}
33
libdir=@LIB_INSTALL_DIR@
44
includedir=${prefix}/include
5-
revision=${BUILD_REVISION}
5+
revision=@BUILD_REVISION@
66

77
Name: WebKitGTK
88
Description: Web content engine for GTK

‎Tools/ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2021-08-18 Michael Catanzaro <mcatanzaro@gnome.org>
2+
3+
REGRESSION(r280382): [GTK] 2.33.3 does not build with gtk-doc enabled, installs broken pkg-config files
4+
https://bugs.webkit.org/show_bug.cgi?id=229152
5+
6+
Reviewed by Philippe Normand.
7+
8+
* glib/apply-build-revision-to-files.py:
9+
(main):
10+
111
2021-08-18 Jonathan Bedard <jbedard@apple.com>
212

313
[webkitcorepy] Add CallByNeed object

0 commit comments

Comments
 (0)