Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (281191 => 281192)
--- trunk/Source/_javascript_Core/ChangeLog 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-08-18 16:46:34 UTC (rev 281192)
@@ -1,3 +1,13 @@
+2021-08-18 Michael Catanzaro <[email protected]>
+
+ 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
+
+ Reviewed by Philippe Normand.
+
+ * PlatformGTK.cmake:
+ * _javascript_coregtk.pc.in:
+
2021-08-17 Saam Barati <[email protected]>
Add an option for canonicalizePrePostIncrements
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (281191 => 281192)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-08-18 16:46:34 UTC (rev 281192)
@@ -3,8 +3,9 @@
set(_javascript_Core_OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
+configure_file(_javascript_coregtk.pc.in ${_javascript_Core_PKGCONFIG_FILE} @ONLY)
+
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
- configure_file(_javascript_coregtk.pc.in ${_javascript_Core_PKGCONFIG_FILE} @ONLY)
add_custom_target(_javascript_Core-build-revision
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${_javascript_Core_PKGCONFIG_FILE}
DEPENDS ${_javascript_Core_PKGCONFIG_FILE}
@@ -12,8 +13,6 @@
list(APPEND _javascript_Core_DEPENDENCIES
_javascript_Core-build-revision
)
-else ()
- configure_file(_javascript_coregtk.pc.in ${_javascript_Core_PKGCONFIG_FILE})
endif ()
install(FILES "${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc"
Modified: trunk/Source/_javascript_Core/_javascript_coregtk.pc.in (281191 => 281192)
--- trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/_javascript_Core/_javascript_coregtk.pc.in 2021-08-18 16:46:34 UTC (rev 281192)
@@ -2,7 +2,7 @@
exec_prefix=${prefix}
libdir=@LIB_INSTALL_DIR@
includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
Name: _javascript_CoreGTK+
Description: GTK+ version of the _javascript_Core engine
Modified: trunk/Source/WebKit/ChangeLog (281191 => 281192)
--- trunk/Source/WebKit/ChangeLog 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/ChangeLog 2021-08-18 16:46:34 UTC (rev 281192)
@@ -1,3 +1,21 @@
+2021-08-18 Michael Catanzaro <[email protected]>
+
+ 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
+
+ Reviewed by Philippe Normand.
+
+ 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:
+
2021-08-18 Wenson Hsieh <[email protected]>
REGRESSION (iOS 15): DoubleDown Casino app won't load past launch page
Modified: trunk/Source/WebKit/PlatformGTK.cmake (281191 => 281192)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-08-18 16:46:34 UTC (rev 281192)
@@ -10,12 +10,12 @@
file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
file(MAKE_DIRECTORY ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
+configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2/WebKitVersion.h)
+configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
- configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
- configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
- configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h @ONLY)
add_custom_target(WebKit-build-revision
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h ${WebKit2_PKGCONFIG_FILE} ${WebKit2WebExtension_PKGCONFIG_FILE}
@@ -23,10 +23,6 @@
list(APPEND WebKit_DEPENDENCIES
WebKit-build-revision
)
-else ()
- configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE})
- configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE})
- configure_file(Shared/glib/BuildRevision.h.in ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
endif ()
add_definitions(-DBUILDING_WEBKIT)
Modified: trunk/Source/WebKit/PlatformWPE.cmake (281191 => 281192)
--- trunk/Source/WebKit/PlatformWPE.cmake 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2021-08-18 16:46:34 UTC (rev 281192)
@@ -12,6 +12,7 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_DOM_DIR})
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WPE_JSC_DIR})
+configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
configure_file(UIProcess/API/wpe/WebKitVersion.h.in ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h)
configure_file(wpe/wpe-webkit.pc.in ${WPE_PKGCONFIG_FILE} @ONLY)
configure_file(wpe/wpe-web-extension.pc.in ${WPEWebExtension_PKGCONFIG_FILE} @ONLY)
@@ -19,7 +20,6 @@
configure_file(wpe/wpe-web-extension-uninstalled.pc.in ${CMAKE_BINARY_DIR}/wpe-web-extension-${WPE_API_VERSION}-uninstalled.pc @ONLY)
if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
- configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h @ONLY)
add_custom_target(WebKit-build-revision
${PYTHON_EXECUTABLE} "${TOOLS_DIR}/glib/apply-build-revision-to-files.py" ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
DEPENDS ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h
@@ -27,8 +27,6 @@
list(APPEND WebKit_DEPENDENCIES
WebKit-build-revision
)
-else ()
- configure_file(Shared/glib/BuildRevision.h.in ${FORWARDING_HEADERS_WPE_DIR}/BuildRevision.h)
endif ()
add_definitions(-DWEBKIT2_COMPILATION)
Modified: trunk/Source/WebKit/Shared/glib/BuildRevision.h.in (281191 => 281192)
--- trunk/Source/WebKit/Shared/glib/BuildRevision.h.in 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/Shared/glib/BuildRevision.h.in 2021-08-18 16:46:34 UTC (rev 281192)
@@ -25,4 +25,4 @@
#pragma once
-#define BUILD_REVISION "${BUILD_REVISION}"
+#define BUILD_REVISION "@BUILD_REVISION@"
Modified: trunk/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in (281191 => 281192)
--- trunk/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/gtk/webkit2gtk-web-extension.pc.in 2021-08-18 16:46:34 UTC (rev 281192)
@@ -2,7 +2,7 @@
exec_prefix=${prefix}
libdir=@LIB_INSTALL_DIR@
includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
Name: WebKitGTK web process extensions
Description: Web content engine for GTK - web process extensions
Modified: trunk/Source/WebKit/gtk/webkit2gtk.pc.in (281191 => 281192)
--- trunk/Source/WebKit/gtk/webkit2gtk.pc.in 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Source/WebKit/gtk/webkit2gtk.pc.in 2021-08-18 16:46:34 UTC (rev 281192)
@@ -2,7 +2,7 @@
exec_prefix=${prefix}
libdir=@LIB_INSTALL_DIR@
includedir=${prefix}/include
-revision=${BUILD_REVISION}
+revision=@BUILD_REVISION@
Name: WebKitGTK
Description: Web content engine for GTK
Modified: trunk/Tools/ChangeLog (281191 => 281192)
--- trunk/Tools/ChangeLog 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Tools/ChangeLog 2021-08-18 16:46:34 UTC (rev 281192)
@@ -1,3 +1,13 @@
+2021-08-18 Michael Catanzaro <[email protected]>
+
+ 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
+
+ Reviewed by Philippe Normand.
+
+ * glib/apply-build-revision-to-files.py:
+ (main):
+
2021-08-18 Jonathan Bedard <[email protected]>
[webkitcorepy] Add CallByNeed object
Modified: trunk/Tools/glib/apply-build-revision-to-files.py (281191 => 281192)
--- trunk/Tools/glib/apply-build-revision-to-files.py 2021-08-18 16:34:05 UTC (rev 281191)
+++ trunk/Tools/glib/apply-build-revision-to-files.py 2021-08-18 16:46:34 UTC (rev 281192)
@@ -70,15 +70,15 @@
with open(in_file) as fd:
for line in fd.readlines():
if line.startswith("revision"):
- line = "revision=${BUILD_REVISION}\n"
+ line = "revision=@BUILD_REVISION@\n"
lines.append(line)
data = ""
else:
- print("Support for expanding $BUILD_REVISION in {} is missing.".format(in_file))
+ print("Support for expanding @BUILD_REVISION@ in {} is missing.".format(in_file))
return 1
with open(in_file, 'w') as fd:
- fd.write(data.replace('${BUILD_REVISION}', build_revision))
+ fd.write(data.replace('@BUILD_REVISION@', build_revision))
return 0
