Title: [205594] trunk/Source/WebKit2
- Revision
- 205594
- Author
- [email protected]
- Date
- 2016-09-08 00:36:27 -0700 (Thu, 08 Sep 2016)
Log Message
Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2/gtk/
https://bugs.webkit.org/show_bug.cgi?id=161703
Reviewed by Carlos Garcia Campos.
Move the pkg-config input files that are specific to the GTK+ port
under the Source/WebKit2/gtk/ directory. Build rules are updated
accordingly.
* PlatformGTK.cmake:
* gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
* gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205593 => 205594)
--- trunk/Source/WebKit2/ChangeLog 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-08 07:36:27 UTC (rev 205594)
@@ -1,3 +1,18 @@
+2016-09-08 Zan Dobersek <[email protected]>
+
+ Move webkit2gtk.pc.in, webkit2gtk-web-extension.pc.in files under Source/WebKit2/gtk/
+ https://bugs.webkit.org/show_bug.cgi?id=161703
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move the pkg-config input files that are specific to the GTK+ port
+ under the Source/WebKit2/gtk/ directory. Build rules are updated
+ accordingly.
+
+ * PlatformGTK.cmake:
+ * gtk/webkit2gtk-web-extension.pc.in: Renamed from Source/WebKit2/webkit2gtk-web-extension.pc.in.
+ * gtk/webkit2gtk.pc.in: Renamed from Source/WebKit2/webkit2gtk.pc.in.
+
2016-09-07 Joseph Pecoraro <[email protected]>
[Mac] Address some clang static analyzer warnings in WebKit
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (205593 => 205594)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-09-08 07:36:27 UTC (rev 205594)
@@ -10,8 +10,8 @@
file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
-configure_file(webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
-configure_file(webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk.pc.in ${WebKit2_PKGCONFIG_FILE} @ONLY)
+configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKit2WebExtension_PKGCONFIG_FILE} @ONLY)
add_definitions(-DBUILDING_WEBKIT)
add_definitions(-DWEBKIT2_COMPILATION)
Added: trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in (0 => 205594)
--- trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in (rev 0)
+++ trunk/Source/WebKit2/gtk/webkit2gtk-web-extension.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: WebKit2WebExtension
+Description: WebKit web process extensions
+Version: @PROJECT_VERSION@
+Requires: glib-2.0 gtk+-3.0 libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Added: trunk/Source/WebKit2/gtk/webkit2gtk.pc.in (0 => 205594)
--- trunk/Source/WebKit2/gtk/webkit2gtk.pc.in (rev 0)
+++ trunk/Source/WebKit2/gtk/webkit2gtk.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=@LIB_INSTALL_DIR@
+includedir=${prefix}/include
+
+Name: WebKit2
+Description: Web content engine for GTK+
+Version: @PROJECT_VERSION@
+Requires: glib-2.0 gtk+-3.0 libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Deleted: trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in (205593 => 205594)
--- trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/webkit2gtk-web-extension.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=${prefix}/include
-
-Name: WebKit2WebExtension
-Description: WebKit web process extensions
-Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-3.0 libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
Deleted: trunk/Source/WebKit2/webkit2gtk.pc.in (205593 => 205594)
--- trunk/Source/WebKit2/webkit2gtk.pc.in 2016-09-08 07:24:44 UTC (rev 205593)
+++ trunk/Source/WebKit2/webkit2gtk.pc.in 2016-09-08 07:36:27 UTC (rev 205594)
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@LIB_INSTALL_DIR@
-includedir=${prefix}/include
-
-Name: WebKit2
-Description: Web content engine for GTK+
-Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-3.0 libsoup-2.4 _javascript_coregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
