Title: [231615] releases/WebKitGTK/webkit-2.20/Source
- Revision
- 231615
- Author
- [email protected]
- Date
- 2018-05-09 16:59:12 -0700 (Wed, 09 May 2018)
Log Message
Merge r230585 - [WPE] Move libWPEWebInspectorResources.so to pkglibdir
https://bugs.webkit.org/show_bug.cgi?id=184379
Reviewed by Žan Doberšek.
Source/_javascript_Core:
Load the module from the new location.
* PlatformWPE.cmake:
* inspector/remote/glib/RemoteInspectorUtils.cpp:
(Inspector::backendCommands):
Source/WebKit:
This is important to allow parallel installation.
* PlatformWPE.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (231614 => 231615)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-05-09 23:59:10 UTC (rev 231614)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-05-09 23:59:12 UTC (rev 231615)
@@ -1,5 +1,18 @@
2018-04-12 Michael Catanzaro <[email protected]>
+ [WPE] Move libWPEWebInspectorResources.so to pkglibdir
+ https://bugs.webkit.org/show_bug.cgi?id=184379
+
+ Reviewed by Žan Doberšek.
+
+ Load the module from the new location.
+
+ * PlatformWPE.cmake:
+ * inspector/remote/glib/RemoteInspectorUtils.cpp:
+ (Inspector::backendCommands):
+
+2018-04-12 Michael Catanzaro <[email protected]>
+
[WPE] Improve include hierarchy
https://bugs.webkit.org/show_bug.cgi?id=184376
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake (231614 => 231615)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake 2018-05-09 23:59:10 UTC (rev 231614)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake 2018-05-09 23:59:12 UTC (rev 231615)
@@ -26,3 +26,4 @@
)
add_definitions(-DJSC_COMPILATION)
+add_definitions(-DPKGLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}/wpe-webkit-${WPE_API_VERSION}")
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp (231614 => 231615)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp 2018-05-09 23:59:10 UTC (rev 231614)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp 2018-05-09 23:59:12 UTC (rev 231615)
@@ -45,7 +45,7 @@
#if PLATFORM(WPE)
static std::once_flag flag;
std::call_once(flag, [] {
- GModule* resourcesModule = g_module_open("libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);
+ GModule* resourcesModule = g_module_open(PKGLIBDIR G_DIR_SEPARATOR_S "libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);
if (!resourcesModule) {
WTFLogAlways("Error loading libWPEWebInspectorResources.so: %s", g_module_error());
return;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231614 => 231615)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:10 UTC (rev 231614)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:12 UTC (rev 231615)
@@ -1,5 +1,16 @@
2018-04-12 Michael Catanzaro <[email protected]>
+ [WPE] Move libWPEWebInspectorResources.so to pkglibdir
+ https://bugs.webkit.org/show_bug.cgi?id=184379
+
+ Reviewed by Žan Doberšek.
+
+ This is important to allow parallel installation.
+
+ * PlatformWPE.cmake:
+
+2018-04-12 Michael Catanzaro <[email protected]>
+
[WPE] Improve include hierarchy
https://bugs.webkit.org/show_bug.cgi?id=184376
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake (231614 => 231615)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:59:10 UTC (rev 231614)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:59:12 UTC (rev 231615)
@@ -262,7 +262,7 @@
add_dependencies(WPEWebInspectorResources WebKit)
target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES})
target_include_directories(WPEWebInspectorResources SYSTEM PUBLIC ${WPEWebInspectorResources_SYSTEM_INCLUDE_DIRECTORIES})
-install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}")
+install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}")
add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
ADD_WEBKIT_PREFIX_HEADER(WPEInjectedBundle)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
