Modified: trunk/ChangeLog (277484 => 277485)
--- trunk/ChangeLog 2021-05-14 06:42:35 UTC (rev 277484)
+++ trunk/ChangeLog 2021-05-14 10:22:29 UTC (rev 277485)
@@ -1,3 +1,11 @@
+2021-05-14 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. [GTK] Fix make distcheck
+
+ Use WEBKITGTK_API_DOC_VERSION instead of WEBKITGTK_API_VERSION or the documentation install rules.
+
+ * Source/PlatformGTK.cmake:
+
2021-05-07 Carlos Garcia Campos <[email protected]>
[GTK][WPE] Bump libsoup3 version to 2.99.5
Modified: trunk/Source/PlatformGTK.cmake (277484 => 277485)
--- trunk/Source/PlatformGTK.cmake 2021-05-14 06:42:35 UTC (rev 277484)
+++ trunk/Source/PlatformGTK.cmake 2021-05-14 10:22:29 UTC (rev 277485)
@@ -15,13 +15,13 @@
)
if (ENABLE_GTKDOC)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION}/html/webkit2gtk-${WEBKITGTK_API_VERSION}
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}/html/webkit2gtk-${WEBKITGTK_API_DOC_VERSION}
DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_VERSION}
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_DOC_VERSION}
DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
)
- install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_VERSION}/html/jsc-glib-${WEBKITGTK_API_VERSION}
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/jsc-glib-${WEBKITGTK_API_DOC_VERSION}/html/jsc-glib-${WEBKITGTK_API_DOC_VERSION}
DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
)
endif ()
Modified: trunk/Tools/ChangeLog (277484 => 277485)
--- trunk/Tools/ChangeLog 2021-05-14 06:42:35 UTC (rev 277484)
+++ trunk/Tools/ChangeLog 2021-05-14 10:22:29 UTC (rev 277485)
@@ -1,3 +1,13 @@
+2021-05-14 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. [GTK] Fix make distcheck
+
+ Update library version now that we build with soup3 by default.
+
+ * Scripts/make-dist:
+ (Distcheck.check_symbols):
+ (ensure_version_if_possible):
+
2021-05-13 Aakash Jain <[email protected]>
report-non-inclusive-language should skip symlinks
Modified: trunk/Tools/Scripts/make-dist (277484 => 277485)
--- trunk/Tools/Scripts/make-dist 2021-05-14 06:42:35 UTC (rev 277484)
+++ trunk/Tools/Scripts/make-dist 2021-05-14 10:22:29 UTC (rev 277485)
@@ -258,8 +258,8 @@
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.0.so')
- libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.0.so')
+ libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-4.1.so')
+ libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.1.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')
@@ -295,7 +295,7 @@
if arguments.version is not None:
return
- pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.0.pc")
+ pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.1.pc")
if os.path.isfile(pkgconfig_file):
p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
version = p.communicate()[0]
