Title: [231614] releases/WebKitGTK/webkit-2.20/Source
- Revision
- 231614
- Author
- [email protected]
- Date
- 2018-05-09 16:59:10 -0700 (Wed, 09 May 2018)
Log Message
Merge r230576 - [WPE] Improve include hierarchy
https://bugs.webkit.org/show_bug.cgi?id=184376
Reviewed by Žan Doberšek.
Source/_javascript_Core:
Install JSC headers under /usr/include/wpe-webkit-0.1/jsc instead of
/usr/include/wpe-0.1/WPE/jsc.
* PlatformWPE.cmake:
Source/WebKit:
Install our headers under /usr/include/wpe-webkit-0.1/wpe instead of
/usr/include/wpe-0.1/WPE/wpe. Too much WPE, not enough WebKit!
* PlatformWPE.cmake:
* wpe/wpe-webkit.pc.in:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (231613 => 231614)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-05-09 23:59:08 UTC (rev 231613)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-05-09 23:59:10 UTC (rev 231614)
@@ -1,3 +1,15 @@
+2018-04-12 Michael Catanzaro <[email protected]>
+
+ [WPE] Improve include hierarchy
+ https://bugs.webkit.org/show_bug.cgi?id=184376
+
+ Reviewed by Žan Doberšek.
+
+ Install JSC headers under /usr/include/wpe-webkit-0.1/jsc instead of
+ /usr/include/wpe-0.1/WPE/jsc.
+
+ * PlatformWPE.cmake:
+
2018-04-09 Michael Catanzaro <[email protected]>
[WPE] Don't install JSC C API headers
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake (231613 => 231614)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake 2018-05-09 23:59:08 UTC (rev 231613)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/PlatformWPE.cmake 2018-05-09 23:59:10 UTC (rev 231614)
@@ -24,3 +24,5 @@
inspector/remote/glib/RemoteInspectorServer.h
inspector/remote/glib/RemoteInspectorUtils.h
)
+
+add_definitions(-DJSC_COMPILATION)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (231613 => 231614)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:08 UTC (rev 231613)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-05-09 23:59:10 UTC (rev 231614)
@@ -1,3 +1,16 @@
+2018-04-12 Michael Catanzaro <[email protected]>
+
+ [WPE] Improve include hierarchy
+ https://bugs.webkit.org/show_bug.cgi?id=184376
+
+ Reviewed by Žan Doberšek.
+
+ Install our headers under /usr/include/wpe-webkit-0.1/wpe instead of
+ /usr/include/wpe-0.1/WPE/wpe. Too much WPE, not enough WebKit!
+
+ * PlatformWPE.cmake:
+ * wpe/wpe-webkit.pc.in:
+
2018-04-11 Zan Dobersek <[email protected]>
[WPE] Make WebKitWebViewBackend object mandatory for webkit_web_view_new*() constructors
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake (231613 => 231614)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:59:08 UTC (rev 231613)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/PlatformWPE.cmake 2018-05-09 23:59:10 UTC (rev 231614)
@@ -277,6 +277,6 @@
)
install(FILES ${WPE_API_INSTALLED_HEADERS}
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-${WPE_API_VERSION}/WPE/wpe"
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/wpe-webkit-${WPE_API_VERSION}/wpe"
COMPONENT "Development"
)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in (231613 => 231614)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in 2018-05-09 23:59:08 UTC (rev 231613)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/wpe/wpe-webkit.pc.in 2018-05-09 23:59:10 UTC (rev 231614)
@@ -9,4 +9,4 @@
Version: @PROJECT_VERSION@
Requires: glib-2.0 libsoup-2.4
Libs: -L${libdir} -lWPEWebKit-@WPE_API_VERSION@
-Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ -I${includedir}/wpe-@WPE_API_VERSION@/WPE
+Cflags: -I${includedir}/wpe-webkit-@WPE_API_VERSION@
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
